summaryrefslogtreecommitdiff
path: root/plugins/common
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/common')
-rw-r--r--plugins/common/BuilderPane.c271
-rw-r--r--plugins/common/OAuth1Support.c1887
-rw-r--r--plugins/common/OAuth1Support.vala233
-rw-r--r--plugins/common/RESTSupport.c7844
-rw-r--r--plugins/common/RESTSupport.vala19
-rw-r--r--plugins/common/Resources.c281
-rw-r--r--plugins/common/WebAuthenticationPane.c272
-rw-r--r--plugins/common/meson.build0
8 files changed, 6815 insertions, 3992 deletions
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 5797f7d..5bfa676 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.36.6, the Vala compiler
+/* BuilderPane.c generated by valac 0.40.4, the Vala compiler
* generated from BuilderPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -25,6 +26,15 @@
typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+enum {
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_0_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -55,13 +65,6 @@ static SpitPublishingDialogPaneIface * shotwell_plugins_common_builder_pane_spit
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_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY
-};
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);
@@ -77,23 +80,37 @@ static void shotwell_plugins_common_builder_pane_real_on_pane_installed (Shotwel
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_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) {
+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"
+#line 108 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
+static void
+shotwell_plugins_common_builder_pane_real_constructed (GObject* base)
+{
ShotwellPluginsCommonBuilderPane * self;
gchar* _tmp0_;
gchar* _tmp1_;
@@ -141,13 +158,13 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp7_ = self->priv->_connect_signals;
#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (_tmp7_) {
-#line 145 "BuilderPane.c"
+#line 162 "BuilderPane.c"
GtkBuilder* _tmp8_;
#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 168 "BuilderPane.c"
}
#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
_tmp9_ = self->priv->builder;
@@ -167,7 +184,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp14_ = _tmp13_;
#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
if (_tmp14_ != NULL) {
-#line 171 "BuilderPane.c"
+#line 188 "BuilderPane.c"
GtkWidget* _tmp15_;
GtkContainer* _tmp16_;
GtkContainer* _tmp17_;
@@ -182,12 +199,14 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
_tmp18_ = self->priv->content;
#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
gtk_container_remove (_tmp17_, _tmp18_);
-#line 186 "BuilderPane.c"
+#line 203 "BuilderPane.c"
}
}
-static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonBuilderPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
@@ -199,11 +218,13 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_p
result = _tmp0_;
#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 203 "BuilderPane.c"
+#line 222 "BuilderPane.c"
}
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonBuilderPane * self;
GtkWidget* result = NULL;
GtkWidget* _tmp0_;
@@ -218,11 +239,13 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPubl
result = _tmp1_;
#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 222 "BuilderPane.c"
+#line 243 "BuilderPane.c"
}
-GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
+GtkBuilder*
+shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self)
+{
GtkBuilder* result = NULL;
GtkBuilder* _tmp0_;
GtkBuilder* _tmp1_;
@@ -236,11 +259,13 @@ GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCom
result = _tmp1_;
#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 240 "BuilderPane.c"
+#line 263 "BuilderPane.c"
}
-static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+static GtkWidget*
+shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self)
+{
GtkWidget* result = NULL;
GtkBuilder* _tmp0_;
GtkBuilder* _tmp1_;
@@ -274,56 +299,70 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (
result = _tmp7_;
#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 278 "BuilderPane.c"
+#line 303 "BuilderPane.c"
}
-GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+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"
+#line 314 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_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_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"
+#line 331 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+static void
+shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self)
+{
}
-void shotwell_plugins_common_builder_pane_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"
+#line 348 "BuilderPane.c"
}
-ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type) {
+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"
+#line 360 "BuilderPane.c"
}
-SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
+SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self)
+{
SpitPublishingDialogPaneGeometryOptions result;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -334,29 +373,30 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get
result = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 338 "BuilderPane.c"
+#line 377 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+static void
+shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self,
+ SpitPublishingDialogPaneGeometryOptions value)
+{
#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"
if (shotwell_plugins_common_builder_pane_get_preferred_geometry (self) != value) {
-#line 347 "BuilderPane.c"
- SpitPublishingDialogPaneGeometryOptions _tmp0_;
-#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_;
+ self->priv->_preferred_geometry = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "preferred-geometry");
-#line 355 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY]);
+#line 393 "BuilderPane.c"
}
}
-gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -370,34 +410,36 @@ gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCo
result = _tmp1_;
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 374 "BuilderPane.c"
+#line 414 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value)
+{
#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"
if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_resource_path (self)) != 0) {
-#line 383 "BuilderPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
+#line 426 "BuilderPane.c"
+ gchar* _tmp0_;
#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_);
+ _tmp0_ = g_strdup (value);
#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_;
+ self->priv->_resource_path = _tmp0_;
#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "resource-path");
-#line 396 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY]);
+#line 436 "BuilderPane.c"
}
}
-gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
+gboolean
+shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self)
+{
gboolean result;
gboolean _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -408,29 +450,30 @@ gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPlugi
result = _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 412 "BuilderPane.c"
+#line 454 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
+static void
+shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self,
+ gboolean value)
+{
#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"
if (shotwell_plugins_common_builder_pane_get_connect_signals (self) != value) {
-#line 421 "BuilderPane.c"
- gboolean _tmp0_;
-#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_;
+ self->priv->_connect_signals = value;
#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "connect-signals");
-#line 429 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY]);
+#line 470 "BuilderPane.c"
}
}
-gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
+gchar*
+shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -444,34 +487,36 @@ gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommo
result = _tmp1_;
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
return result;
-#line 448 "BuilderPane.c"
+#line 491 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self,
+ const gchar* value)
+{
#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"
if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_default_id (self)) != 0) {
-#line 457 "BuilderPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
+#line 503 "BuilderPane.c"
+ gchar* _tmp0_;
#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_);
+ _tmp0_ = g_strdup (value);
#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_;
+ self->priv->_default_id = _tmp0_;
#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
- g_object_notify ((GObject *) self, "default-id");
-#line 470 "BuilderPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY]);
+#line 513 "BuilderPane.c"
}
}
-static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass) {
+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"
@@ -491,18 +536,20 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm
#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_PROPERTY, 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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY] = 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_STRINGS | 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_PROPERTY, 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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY] = g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_STRINGS | 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_PROPERTY, 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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY] = g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_STRINGS | 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_PROPERTY, 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 502 "BuilderPane.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, shotwell_plugins_common_builder_pane_properties[SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY] = g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 547 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+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"
@@ -513,11 +560,13 @@ static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_int
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 517 "BuilderPane.c"
+#line 564 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
+static void
+shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self)
+{
gchar* _tmp0_;
#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
@@ -529,11 +578,13 @@ static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsC
_tmp0_ = g_strdup ("default");
#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
self->priv->_default_id = _tmp0_;
-#line 533 "BuilderPane.c"
+#line 582 "BuilderPane.c"
}
-static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) {
+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);
@@ -547,11 +598,13 @@ static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) {
_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 551 "BuilderPane.c"
+#line 602 "BuilderPane.c"
}
-GType shotwell_plugins_common_builder_pane_get_type (void) {
+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 };
@@ -565,7 +618,12 @@ GType shotwell_plugins_common_builder_pane_get_type (void) {
}
-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_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"
@@ -594,18 +652,23 @@ static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * o
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 598 "BuilderPane.c"
+#line 656 "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 604 "BuilderPane.c"
+#line 662 "BuilderPane.c"
}
}
-static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+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"
@@ -634,13 +697,13 @@ static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * o
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 638 "BuilderPane.c"
+#line 701 "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 644 "BuilderPane.c"
+#line 707 "BuilderPane.c"
}
}
diff --git a/plugins/common/OAuth1Support.c b/plugins/common/OAuth1Support.c
new file mode 100644
index 0000000..70e0dc1
--- /dev/null
+++ b/plugins/common/OAuth1Support.c
@@ -0,0 +1,1887 @@
+/* OAuth1Support.c generated by valac 0.40.4, the Vala compiler
+ * generated from OAuth1Support.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later). See the COPYING file in this distribution.
+ */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libsoup/soup.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gee.h>
+
+
+#define PUBLISHING_REST_SUPPORT_TYPE_SESSION (publishing_rest_support_session_get_type ())
+#define PUBLISHING_REST_SUPPORT_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))
+#define PUBLISHING_REST_SUPPORT_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionClass))
+#define PUBLISHING_REST_SUPPORT_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionClass))
+
+typedef struct _PublishingRESTSupportSession PublishingRESTSupportSession;
+typedef struct _PublishingRESTSupportSessionClass PublishingRESTSupportSessionClass;
+typedef struct _PublishingRESTSupportSessionPrivate PublishingRESTSupportSessionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION (publishing_rest_support_oauth1_session_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Session PublishingRESTSupportOAuth1Session;
+typedef struct _PublishingRESTSupportOAuth1SessionClass PublishingRESTSupportOAuth1SessionClass;
+typedef struct _PublishingRESTSupportOAuth1SessionPrivate PublishingRESTSupportOAuth1SessionPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION (publishing_rest_support_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction))
+#define PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionClass))
+#define PUBLISHING_REST_SUPPORT_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionClass))
+
+typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransaction;
+typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
+
+#define PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT (publishing_rest_support_argument_get_type ())
+#define PUBLISHING_REST_SUPPORT_ARGUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument))
+#define PUBLISHING_REST_SUPPORT_ARGUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgumentClass))
+#define PUBLISHING_REST_SUPPORT_IS_ARGUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT))
+#define PUBLISHING_REST_SUPPORT_IS_ARGUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT))
+#define PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgumentClass))
+
+typedef struct _PublishingRESTSupportArgument PublishingRESTSupportArgument;
+typedef struct _PublishingRESTSupportArgumentClass PublishingRESTSupportArgumentClass;
+
+#define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ())
+#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
+typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION (publishing_rest_support_oauth1_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1Transaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Transaction PublishingRESTSupportOAuth1Transaction;
+typedef struct _PublishingRESTSupportOAuth1TransactionClass PublishingRESTSupportOAuth1TransactionClass;
+typedef struct _PublishingRESTSupportOAuth1TransactionPrivate PublishingRESTSupportOAuth1TransactionPrivate;
+#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
+
+#define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction))
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransactionClass))
+#define PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransactionClass))
+
+typedef struct _PublishingRESTSupportUploadTransaction PublishingRESTSupportUploadTransaction;
+typedef struct _PublishingRESTSupportUploadTransactionClass PublishingRESTSupportUploadTransactionClass;
+typedef struct _PublishingRESTSupportUploadTransactionPrivate PublishingRESTSupportUploadTransactionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_oauth1_upload_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1UploadTransaction PublishingRESTSupportOAuth1UploadTransaction;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionClass PublishingRESTSupportOAuth1UploadTransactionClass;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionPrivate PublishingRESTSupportOAuth1UploadTransactionPrivate;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _PublishingRESTSupportSession {
+ GTypeInstance parent_instance;
+ volatile int ref_count;
+ PublishingRESTSupportSessionPrivate * priv;
+};
+
+struct _PublishingRESTSupportSessionClass {
+ GTypeClass parent_class;
+ void (*finalize) (PublishingRESTSupportSession *self);
+ gboolean (*is_authenticated) (PublishingRESTSupportSession* self);
+};
+
+struct _PublishingRESTSupportOAuth1Session {
+ PublishingRESTSupportSession parent_instance;
+ PublishingRESTSupportOAuth1SessionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1SessionClass {
+ PublishingRESTSupportSessionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1SessionPrivate {
+ gchar* request_phase_token;
+ gchar* request_phase_token_secret;
+ gchar* access_phase_token;
+ gchar* access_phase_token_secret;
+ gchar* username;
+ gchar* consumer_key;
+ gchar* consumer_secret;
+};
+
+typedef enum {
+ PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET,
+ PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST,
+ PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT
+} PublishingRESTSupportHttpMethod;
+
+struct _PublishingRESTSupportTransaction {
+ GTypeInstance parent_instance;
+ volatile int ref_count;
+ PublishingRESTSupportTransactionPrivate * priv;
+};
+
+struct _PublishingRESTSupportTransactionClass {
+ GTypeClass parent_class;
+ void (*finalize) (PublishingRESTSupportTransaction *self);
+ void (*add_header) (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
+ void (*execute) (PublishingRESTSupportTransaction* self, GError** error);
+};
+
+struct _PublishingRESTSupportOAuth1Transaction {
+ PublishingRESTSupportTransaction parent_instance;
+ PublishingRESTSupportOAuth1TransactionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1TransactionClass {
+ PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportUploadTransaction {
+ PublishingRESTSupportTransaction parent_instance;
+ PublishingRESTSupportUploadTransactionPrivate * priv;
+ GHashTable* binary_disposition_table;
+ SpitPublishingPublishable* publishable;
+ gchar* mime_type;
+ GeeHashMap* message_headers;
+};
+
+struct _PublishingRESTSupportUploadTransactionClass {
+ PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransaction {
+ PublishingRESTSupportUploadTransaction parent_instance;
+ PublishingRESTSupportOAuth1UploadTransactionPrivate * priv;
+ PublishingRESTSupportOAuth1Session* session;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransactionClass {
+ PublishingRESTSupportUploadTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransactionPrivate {
+ PublishingRESTSupportArgument** auth_header_fields;
+ gint auth_header_fields_length1;
+ gint _auth_header_fields_size_;
+};
+
+
+static gpointer publishing_rest_support_oauth1_session_parent_class = NULL;
+static gpointer publishing_rest_support_oauth1_transaction_parent_class = NULL;
+static gpointer publishing_rest_support_oauth1_upload_transaction_parent_class = NULL;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
+gpointer publishing_rest_support_session_ref (gpointer instance);
+void publishing_rest_support_session_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object);
+gpointer publishing_rest_support_value_get_session (const GValue* value);
+GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
+GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionPrivate))
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type,
+ const gchar* endpoint_uri);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url);
+static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
+void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* consumer_key,
+ const gchar* consumer_secret);
+gpointer publishing_rest_support_transaction_ref (gpointer instance);
+void publishing_rest_support_transaction_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object);
+gpointer publishing_rest_support_value_get_transaction (const GValue* value);
+GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
+gpointer publishing_rest_support_argument_ref (gpointer instance);
+void publishing_rest_support_argument_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object);
+gpointer publishing_rest_support_value_get_argument (const GValue* value);
+GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+ PublishingRESTSupportTransaction* txn,
+ PublishingRESTSupportArgument** extra_arguments,
+ int extra_arguments_length1);
+GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+static void _vala_array_add2 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator);
+gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username);
+gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gboolean publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self);
+gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
+static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj);
+GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value);
+static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
+GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
+GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionPrivate))
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+ const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value);
+static void _vala_array_add3 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
+gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
+void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+static void publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+
+
+PublishingRESTSupportOAuth1Session*
+publishing_rest_support_oauth1_session_construct (GType object_type,
+ const gchar* endpoint_uri)
+{
+ PublishingRESTSupportOAuth1Session* self = NULL;
+#line 21 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = (PublishingRESTSupportOAuth1Session*) publishing_rest_support_session_construct (object_type, endpoint_uri);
+#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return self;
+#line 382 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Session*
+publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri)
+{
+#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return publishing_rest_support_oauth1_session_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, endpoint_uri);
+#line 391 "OAuth1Support.c"
+}
+
+
+static gboolean
+publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base)
+{
+ PublishingRESTSupportOAuth1Session * self;
+ gboolean result = FALSE;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_ = FALSE;
+ const gchar* _tmp2_;
+#line 24 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = self->priv->access_phase_token;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (_tmp2_ != NULL) {
+#line 409 "OAuth1Support.c"
+ const gchar* _tmp3_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = self->priv->access_phase_token_secret;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = _tmp3_ != NULL;
+#line 415 "OAuth1Support.c"
+ } else {
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = FALSE;
+#line 419 "OAuth1Support.c"
+ }
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (_tmp1_) {
+#line 423 "OAuth1Support.c"
+ const gchar* _tmp4_;
+#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp4_ = self->priv->username;
+#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = _tmp4_ != NULL;
+#line 429 "OAuth1Support.c"
+ } else {
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = FALSE;
+#line 433 "OAuth1Support.c"
+ }
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp0_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 439 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username)
+{
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (token != NULL);
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (secret != NULL);
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (username != NULL);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_strdup (token);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token = _tmp0_;
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = g_strdup (secret);
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token_secret);
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token_secret = _tmp1_;
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (username);
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->username);
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->username = _tmp2_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
+#line 480 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self)
+{
+#line 38 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 39 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token);
+#line 39 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token = NULL;
+#line 40 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token_secret);
+#line 40 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token_secret = NULL;
+#line 41 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->username);
+#line 41 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->username = NULL;
+#line 501 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* consumer_key,
+ const gchar* consumer_secret)
+{
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (consumer_key != NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (consumer_secret != NULL);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_strdup (consumer_key);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->consumer_key);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->consumer_key = _tmp0_;
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = g_strdup (consumer_secret);
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->consumer_secret);
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->consumer_secret = _tmp1_;
+#line 530 "OAuth1Support.c"
+}
+
+
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return self ? publishing_rest_support_argument_ref (self) : NULL;
+#line 539 "OAuth1Support.c"
+}
+
+
+static void
+_vala_array_add2 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if ((*length) == (*size)) {
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ *size = (*size) ? (2 * (*size)) : 4;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
+#line 555 "OAuth1Support.c"
+ }
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ (*array)[(*length)++] = value;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ (*array)[*length] = NULL;
+#line 561 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+ PublishingRESTSupportTransaction* txn,
+ PublishingRESTSupportArgument** extra_arguments,
+ int extra_arguments_length1)
+{
+ gchar* result = NULL;
+ gchar* http_method = NULL;
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRESTSupportArgument** base_string_arguments = NULL;
+ gint _tmp4_;
+ PublishingRESTSupportArgument** _tmp5_;
+ gint base_string_arguments_length1;
+ gint _base_string_arguments_size_;
+ PublishingRESTSupportArgument** sorted_args = NULL;
+ PublishingRESTSupportArgument** _tmp10_;
+ gint _tmp10__length1;
+ gint _tmp11_;
+ PublishingRESTSupportArgument** _tmp12_;
+ gint sorted_args_length1;
+ gint _sorted_args_size_;
+ gchar* arguments_string = NULL;
+ PublishingRESTSupportArgument** _tmp13_;
+ gint _tmp13__length1;
+ gchar* _tmp14_;
+ gchar* signing_key = NULL;
+ const gchar* _tmp15_;
+ gchar* signature_base_string = NULL;
+ const gchar* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
+ gchar* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ const gchar* _tmp40_;
+ gchar* _tmp41_;
+ gchar* _tmp42_;
+ gchar* _tmp43_;
+ gchar* _tmp44_;
+ const gchar* _tmp45_;
+ gchar* signature = NULL;
+ const gchar* _tmp46_;
+ gchar* _tmp47_;
+ const gchar* _tmp48_;
+ gchar* _tmp49_;
+ const gchar* _tmp50_;
+#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = publishing_rest_support_http_method_to_string (publishing_rest_support_transaction_get_method (txn));
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ http_method = _tmp0_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:53: signing transaction with parameters:");
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = http_method;
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strconcat ("HTTP method = ", _tmp1_, NULL);
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = _tmp2_;
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:54: %s", _tmp3_);
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp3_);
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp5_ = publishing_rest_support_transaction_get_arguments (txn, &_tmp4_);
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ base_string_arguments = _tmp5_;
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ base_string_arguments_length1 = _tmp4_;
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _base_string_arguments_size_ = base_string_arguments_length1;
+#line 647 "OAuth1Support.c"
+ {
+ PublishingRESTSupportArgument** arg_collection = NULL;
+ gint arg_collection_length1 = 0;
+ gint _arg_collection_size_ = 0;
+ gint arg_it = 0;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ arg_collection = extra_arguments;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ arg_collection_length1 = extra_arguments_length1;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ for (arg_it = 0; arg_it < extra_arguments_length1; arg_it = arg_it + 1) {
+#line 659 "OAuth1Support.c"
+ PublishingRESTSupportArgument* _tmp6_;
+ PublishingRESTSupportArgument* arg = NULL;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp6_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ arg = _tmp6_;
+#line 666 "OAuth1Support.c"
+ {
+ PublishingRESTSupportArgument** _tmp7_;
+ gint _tmp7__length1;
+ PublishingRESTSupportArgument* _tmp8_;
+ PublishingRESTSupportArgument* _tmp9_;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp7_ = base_string_arguments;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp7__length1 = base_string_arguments_length1;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp8_ = arg;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp9_ = _publishing_rest_support_argument_ref0 (_tmp8_);
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_array_add2 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp9_);
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _publishing_rest_support_argument_unref0 (arg);
+#line 684 "OAuth1Support.c"
+ }
+ }
+ }
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp10_ = base_string_arguments;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp10__length1 = base_string_arguments_length1;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp12_ = publishing_rest_support_argument_sort (_tmp10_, _tmp10__length1, &_tmp11_);
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ sorted_args = _tmp12_;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ sorted_args_length1 = _tmp11_;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _sorted_args_size_ = sorted_args_length1;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp13_ = sorted_args;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp13__length1 = sorted_args_length1;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp14_ = publishing_rest_support_argument_serialize_list (_tmp13_, _tmp13__length1, FALSE, "&");
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ arguments_string = _tmp14_;
+#line 67 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signing_key = NULL;
+#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp15_ = self->priv->access_phase_token_secret;
+#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (_tmp15_ != NULL) {
+#line 714 "OAuth1Support.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:69: access phase token secret available; using it a" \
+"s signing key");
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp16_ = self->priv->consumer_secret;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp17_ = g_strconcat (_tmp16_, "&", NULL);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp18_ = _tmp17_;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp19_ = self->priv->access_phase_token_secret;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signing_key);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signing_key = _tmp20_;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp18_);
+#line 738 "OAuth1Support.c"
+ } else {
+ const gchar* _tmp21_;
+#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp21_ = self->priv->request_phase_token_secret;
+#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (_tmp21_ != NULL) {
+#line 745 "OAuth1Support.c"
+ const gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+#line 73 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:73: request phase token secret available; using it " \
+"as signing key");
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp22_ = self->priv->consumer_secret;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp23_ = g_strconcat (_tmp22_, "&", NULL);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp24_ = _tmp23_;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp25_ = self->priv->request_phase_token_secret;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signing_key);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signing_key = _tmp26_;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp24_);
+#line 769 "OAuth1Support.c"
+ } else {
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
+#line 77 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:77: %s", "neither access phase nor request phase token secrets available; using " \
+"API " "key as signing key");
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp27_ = self->priv->consumer_secret;
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp28_ = g_strconcat (_tmp27_, "&", NULL);
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signing_key);
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signing_key = _tmp28_;
+#line 783 "OAuth1Support.c"
+ }
+ }
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp29_ = http_method;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp30_ = g_strconcat (_tmp29_, "&", NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp31_ = _tmp30_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp32_ = publishing_rest_support_transaction_get_endpoint_url (txn);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp33_ = _tmp32_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp34_ = soup_uri_encode (_tmp33_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp35_ = _tmp34_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp36_ = g_strconcat (_tmp31_, _tmp35_, NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp37_ = _tmp36_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp38_ = g_strconcat (_tmp37_, "&", NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp39_ = _tmp38_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp40_ = arguments_string;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp41_ = soup_uri_encode (_tmp40_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp42_ = _tmp41_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp44_ = _tmp43_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp42_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp39_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp37_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp35_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp33_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp31_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature_base_string = _tmp44_;
+#line 87 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:87: signature base string = '%s'", signature_base_string);
+#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp45_ = signing_key;
+#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:89: signing key = '%s'", _tmp45_);
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp46_ = signing_key;
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp47_ = publishing_rest_support_hmac_sha1 (_tmp46_, signature_base_string);
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature = _tmp47_;
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp48_ = signature;
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp49_ = soup_uri_encode (_tmp48_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature);
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature = _tmp49_;
+#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp50_ = signature;
+#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:95: signature = '%s'", _tmp50_);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = signature;
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature_base_string);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signing_key);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (arguments_string);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (http_method);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 872 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret)
+{
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (token != NULL);
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (secret != NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_strdup (token);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->request_phase_token);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->request_phase_token = _tmp0_;
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = g_strdup (secret);
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->request_phase_token_secret);
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->request_phase_token_secret = _tmp1_;
+#line 901 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+ const gchar* token,
+ const gchar* secret,
+ const gchar* username)
+{
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (token != NULL);
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (secret != NULL);
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (username != NULL);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_strdup (token);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token = _tmp0_;
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = g_strdup (secret);
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token_secret);
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token_secret = _tmp1_;
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (username);
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->username);
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->username = _tmp2_;
+#line 110 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
+#line 942 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ GTimeVal currtime = {0};
+ GTimeVal _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GTimeVal _tmp4_;
+ glong _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+#line 113 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 114 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_get_current_time (&currtime);
+#line 115 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_get_current_time (&currtime);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = currtime;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = _tmp0_.tv_sec;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup_printf ("%li", _tmp1_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = _tmp2_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp4_ = currtime;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp5_ = _tmp4_.tv_usec;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp6_ = g_strdup_printf ("%li", _tmp5_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp7_ = _tmp6_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp9_ = _tmp8_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp11_ = _tmp10_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp9_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp7_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp3_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp11_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1003 "OAuth1Support.c"
+}
+
+
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
+ glong result = 0L;
+ gchar* end = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ return result;
+#line 1027 "OAuth1Support.c"
+ } else {
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ return result;
+#line 1036 "OAuth1Support.c"
+ }
+}
+
+
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
+ gchar* result = NULL;
+ glong string_length = 0L;
+ gboolean _tmp0_ = FALSE;
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (self != NULL, NULL);
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 1057 "OAuth1Support.c"
+ } else {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 1061 "OAuth1Support.c"
+ }
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 1067 "OAuth1Support.c"
+ } else {
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 1077 "OAuth1Support.c"
+ }
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 1081 "OAuth1Support.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 1089 "OAuth1Support.c"
+ } else {
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 1096 "OAuth1Support.c"
+ }
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 1100 "OAuth1Support.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 1106 "OAuth1Support.c"
+ }
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ return result;
+#line 1118 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 121 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_strdup_printf ("%" G_GINT64_FORMAT, g_get_real_time ());
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = _tmp0_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = string_substring (_tmp1_, (glong) 0, (glong) 10);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = _tmp2_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp1_);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp3_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1146 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 125 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 126 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->consumer_key;
+#line 126 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_assert (_tmp0_ != NULL, "consumer_key != null");
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = self->priv->consumer_key;
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (_tmp1_);
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp2_;
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1171 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 131 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->request_phase_token;
+#line 131 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_assert (_tmp0_ != NULL, "request_phase_token != null");
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = self->priv->request_phase_token;
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (_tmp1_);
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp2_;
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1196 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 136 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->access_phase_token;
+#line 136 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_assert (_tmp0_ != NULL, "access_phase_token != null");
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = self->priv->access_phase_token;
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (_tmp1_);
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp2_;
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1221 "OAuth1Support.c"
+}
+
+
+gboolean
+publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self)
+{
+ gboolean result = FALSE;
+ const gchar* _tmp0_;
+#line 140 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), FALSE);
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->access_phase_token;
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp0_ != NULL;
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1238 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+#line 144 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 145 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->access_phase_token_secret;
+#line 145 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = self->priv->access_phase_token_secret;
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = g_strdup (_tmp1_);
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp2_;
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1263 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self)
+{
+ gchar* result = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 149 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 150 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "is_authenticated()");
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->username;
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp1_;
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1285 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_session_class_init (PublishingRESTSupportOAuth1SessionClass * klass)
+{
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_session_parent_class = g_type_class_peek_parent (klass);
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_oauth1_session_finalize;
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1SessionPrivate));
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_oauth1_session_real_is_authenticated;
+#line 1300 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_session_instance_init (PublishingRESTSupportOAuth1Session * self)
+{
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE (self);
+#line 12 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->request_phase_token = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->request_phase_token_secret = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token = NULL;
+#line 15 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->access_phase_token_secret = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->username = NULL;
+#line 17 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->consumer_key = NULL;
+#line 18 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->consumer_secret = NULL;
+#line 1323 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj)
+{
+ PublishingRESTSupportOAuth1Session * self;
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 12 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->request_phase_token);
+#line 13 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->request_phase_token_secret);
+#line 14 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token);
+#line 15 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->access_phase_token_secret);
+#line 16 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->username);
+#line 17 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->consumer_key);
+#line 18 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (self->priv->consumer_secret);
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_oauth1_session_parent_class)->finalize (obj);
+#line 1349 "OAuth1Support.c"
+}
+
+
+GType
+publishing_rest_support_oauth1_session_get_type (void)
+{
+ static volatile gsize publishing_rest_support_oauth1_session_type_id__volatile = 0;
+ if (g_once_init_enter (&publishing_rest_support_oauth1_session_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Session), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_session_instance_init, NULL };
+ GType publishing_rest_support_oauth1_session_type_id;
+ publishing_rest_support_oauth1_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingRESTSupportOAuth1Session", &g_define_type_info, 0);
+ g_once_init_leave (&publishing_rest_support_oauth1_session_type_id__volatile, publishing_rest_support_oauth1_session_type_id);
+ }
+ return publishing_rest_support_oauth1_session_type_id__volatile;
+}
+
+
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method)
+{
+ PublishingRESTSupportOAuth1Transaction* self = NULL;
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), method);
+#line 159 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_transaction_setup_arguments (self);
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return self;
+#line 1381 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return publishing_rest_support_oauth1_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, method);
+#line 1391 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method)
+{
+ PublishingRESTSupportOAuth1Transaction* self = NULL;
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (uri != NULL, NULL);
+#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), uri, method);
+#line 165 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_transaction_setup_arguments (self);
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return self;
+#line 1412 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction*
+publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+ const gchar* uri,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return publishing_rest_support_oauth1_transaction_construct_with_uri (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, uri, method);
+#line 1423 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self)
+{
+ PublishingRESTSupportOAuth1Session* session = NULL;
+ PublishingRESTSupportSession* _tmp0_;
+ PublishingRESTSupportOAuth1Session* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ PublishingRESTSupportOAuth1Session* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ PublishingRESTSupportOAuth1Session* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ PublishingRESTSupportOAuth1Session* _tmp10_;
+#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION (self));
+#line 169 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 169 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ session = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = session;
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = publishing_rest_support_oauth1_session_get_oauth_nonce (_tmp1_);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = _tmp2_;
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp3_);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp3_);
+#line 172 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
+#line 173 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp4_ = session;
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp5_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (_tmp4_);
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp6_ = _tmp5_;
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp6_);
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp6_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp7_ = session;
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp8_ = publishing_rest_support_oauth1_session_get_consumer_key (_tmp7_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp9_ = _tmp8_;
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", _tmp9_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp9_);
+#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp10_ = session;
+#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (publishing_rest_support_oauth1_session_has_access_phase_token (_tmp10_)) {
+#line 1486 "OAuth1Support.c"
+ PublishingRESTSupportOAuth1Session* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp11_ = session;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp12_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp11_);
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp13_ = _tmp12_;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp13_);
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp13_);
+#line 1500 "OAuth1Support.c"
+ }
+#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _publishing_rest_support_session_unref0 (session);
+#line 1504 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
+ PublishingRESTSupportOAuth1Transaction * self;
+ gchar* signature = NULL;
+ PublishingRESTSupportSession* _tmp0_;
+ PublishingRESTSupportOAuth1Session* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ GError * _inner_error_ = NULL;
+#line 182 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1Transaction);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = publishing_rest_support_oauth1_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), NULL, 0);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = _tmp2_;
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _publishing_rest_support_session_unref0 (_tmp1_);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature = _tmp3_;
+#line 184 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature", signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_oauth1_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_propagate_error (error, _inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return;
+#line 1547 "OAuth1Support.c"
+ } else {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_clear_error (&_inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return;
+#line 1557 "OAuth1Support.c"
+ }
+ }
+#line 182 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature);
+#line 1562 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_transaction_class_init (PublishingRESTSupportOAuth1TransactionClass * klass)
+{
+#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_oauth1_transaction_real_execute;
+#line 1573 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_transaction_instance_init (PublishingRESTSupportOAuth1Transaction * self)
+{
+}
+
+
+GType
+publishing_rest_support_oauth1_transaction_get_type (void)
+{
+ static volatile gsize publishing_rest_support_oauth1_transaction_type_id__volatile = 0;
+ if (g_once_init_enter (&publishing_rest_support_oauth1_transaction_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1TransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Transaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_transaction_instance_init, NULL };
+ GType publishing_rest_support_oauth1_transaction_type_id;
+ publishing_rest_support_oauth1_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingRESTSupportOAuth1Transaction", &g_define_type_info, 0);
+ g_once_init_leave (&publishing_rest_support_oauth1_transaction_type_id__volatile, publishing_rest_support_oauth1_transaction_type_id);
+ }
+ return publishing_rest_support_oauth1_transaction_type_id__volatile;
+}
+
+
+PublishingRESTSupportOAuth1UploadTransaction*
+publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri)
+{
+ PublishingRESTSupportOAuth1UploadTransaction* self = NULL;
+ PublishingRESTSupportArgument** _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (endpoint_uri != NULL, NULL);
+#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = (PublishingRESTSupportOAuth1UploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, endpoint_uri);
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->auth_header_fields = _tmp0_;
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->auth_header_fields_length1 = 0;
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
+#line 200 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->session = session;
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = publishing_rest_support_oauth1_session_get_oauth_nonce (session);
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = _tmp1_;
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_);
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp2_);
+#line 203 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
+#line 204 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (session);
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp4_ = _tmp3_;
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp4_);
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp4_);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp5_ = publishing_rest_support_oauth1_session_get_consumer_key (session);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp6_ = _tmp5_;
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp6_);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp6_);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp7_ = publishing_rest_support_oauth1_session_get_access_phase_token (session);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp8_ = _tmp7_;
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp8_);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return self;
+#line 1671 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1UploadTransaction*
+publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_uri)
+{
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return publishing_rest_support_oauth1_upload_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_uri);
+#line 1682 "OAuth1Support.c"
+}
+
+
+static void
+_vala_array_add3 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ if ((*length) == (*size)) {
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ *size = (*size) ? (2 * (*size)) : 4;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
+#line 1698 "OAuth1Support.c"
+ }
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ (*array)[(*length)++] = value;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ (*array)[*length] = NULL;
+#line 1704 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
+ PublishingRESTSupportArgument** _tmp0_;
+ gint _tmp0__length1;
+ PublishingRESTSupportArgument* _tmp1_;
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self));
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (key != NULL);
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (value != NULL);
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->auth_header_fields;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0__length1 = self->priv->auth_header_fields_length1;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = publishing_rest_support_argument_new (key, value);
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _vala_array_add3 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp1_);
+#line 1730 "OAuth1Support.c"
+}
+
+
+gchar*
+publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self)
+{
+ gchar* result = NULL;
+ PublishingRESTSupportArgument** _tmp0_;
+ gint _tmp0__length1;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+#line 214 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->priv->auth_header_fields;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0__length1 = self->priv->auth_header_fields_length1;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = publishing_rest_support_argument_serialize_list (_tmp0_, _tmp0__length1, TRUE, ", ");
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = _tmp1_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = g_strconcat ("OAuth ", _tmp2_, NULL);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp4_ = _tmp3_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (_tmp2_);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ result = _tmp4_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ return result;
+#line 1764 "OAuth1Support.c"
+}
+
+
+void
+publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self)
+{
+ gchar* signature = NULL;
+ PublishingRESTSupportOAuth1Session* _tmp0_;
+ PublishingRESTSupportArgument** _tmp1_;
+ gint _tmp1__length1;
+ gchar* _tmp2_;
+ gchar* authorization_header = NULL;
+ gchar* _tmp3_;
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self));
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp0_ = self->session;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1_ = self->priv->auth_header_fields;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp1__length1 = self->priv->auth_header_fields_length1;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp2_ = publishing_rest_support_oauth1_session_sign_transaction (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp1_, _tmp1__length1);
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ signature = _tmp2_;
+#line 220 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_signature", signature);
+#line 223 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _tmp3_ = publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (self);
+#line 223 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ authorization_header = _tmp3_;
+#line 225 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_debug ("OAuth1Support.vala:225: executing upload transaction: authorization he" \
+"ader string = '%s'", authorization_header);
+#line 227 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", authorization_header);
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (authorization_header);
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ _g_free0 (signature);
+#line 1804 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_upload_transaction_class_init (PublishingRESTSupportOAuth1UploadTransactionClass * klass)
+{
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ publishing_rest_support_oauth1_upload_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_oauth1_upload_transaction_finalize;
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1UploadTransactionPrivate));
+#line 1817 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_upload_transaction_instance_init (PublishingRESTSupportOAuth1UploadTransaction * self)
+{
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE (self);
+#line 1826 "OAuth1Support.c"
+}
+
+
+static void
+publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
+ PublishingRESTSupportOAuth1UploadTransaction * self;
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction);
+#line 192 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+ PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_oauth1_upload_transaction_parent_class)->finalize (obj);
+#line 1840 "OAuth1Support.c"
+}
+
+
+GType
+publishing_rest_support_oauth1_upload_transaction_get_type (void)
+{
+ static volatile gsize publishing_rest_support_oauth1_upload_transaction_type_id__volatile = 0;
+ if (g_once_init_enter (&publishing_rest_support_oauth1_upload_transaction_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1UploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1UploadTransaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_upload_transaction_instance_init, NULL };
+ GType publishing_rest_support_oauth1_upload_transaction_type_id;
+ publishing_rest_support_oauth1_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingRESTSupportOAuth1UploadTransaction", &g_define_type_info, 0);
+ g_once_init_leave (&publishing_rest_support_oauth1_upload_transaction_type_id__volatile, publishing_rest_support_oauth1_upload_transaction_type_id);
+ }
+ return publishing_rest_support_oauth1_upload_transaction_type_id__volatile;
+}
+
+
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
+ if ((array != NULL) && (destroy_func != NULL)) {
+ int i;
+ for (i = 0; i < array_length; i = i + 1) {
+ if (((gpointer*) array)[i] != NULL) {
+ destroy_func (((gpointer*) array)[i]);
+ }
+ }
+ }
+}
+
+
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
+ _vala_array_destroy (array, array_length, destroy_func);
+ g_free (array);
+}
+
+
+
diff --git a/plugins/common/OAuth1Support.vala b/plugins/common/OAuth1Support.vala
new file mode 100644
index 0000000..e5a8545
--- /dev/null
+++ b/plugins/common/OAuth1Support.vala
@@ -0,0 +1,233 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later). See the COPYING file in this distribution.
+ */
+
+namespace Publishing.RESTSupport.OAuth1 {
+ internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
+
+ public class Session : Publishing.RESTSupport.Session {
+ private string? request_phase_token = null;
+ private string? request_phase_token_secret = null;
+ private string? access_phase_token = null;
+ private string? access_phase_token_secret = null;
+ private string? username = null;
+ private string? consumer_key = null;
+ private string? consumer_secret = null;
+
+ public Session(string? endpoint_uri = null) {
+ base(endpoint_uri);
+ }
+
+ public override bool is_authenticated() {
+ return (access_phase_token != null && access_phase_token_secret != null &&
+ username != null);
+ }
+
+ public void authenticate_from_persistent_credentials(string token, string secret,
+ string username) {
+ this.access_phase_token = token;
+ this.access_phase_token_secret = secret;
+ this.username = username;
+
+ this.authenticated();
+ }
+
+ public void deauthenticate() {
+ access_phase_token = null;
+ access_phase_token_secret = null;
+ username = null;
+ }
+
+ public void set_api_credentials(string consumer_key, string consumer_secret) {
+ this.consumer_key = consumer_key;
+ this.consumer_secret = consumer_secret;
+ }
+
+ public string sign_transaction(Publishing.RESTSupport.Transaction txn,
+ Publishing.RESTSupport.Argument[]? extra_arguments = null) {
+ string http_method = txn.get_method().to_string();
+
+ debug("signing transaction with parameters:");
+ debug("HTTP method = " + http_method);
+
+ Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
+
+ foreach (var arg in extra_arguments) {
+ base_string_arguments += arg;
+ }
+
+ Publishing.RESTSupport.Argument[] sorted_args =
+ Publishing.RESTSupport.Argument.sort(base_string_arguments);
+
+ var arguments_string = Argument.serialize_list(sorted_args);
+
+ string? signing_key = null;
+ if (access_phase_token_secret != null) {
+ debug("access phase token secret available; using it as signing key");
+
+ signing_key = consumer_secret + "&" + access_phase_token_secret;
+ } else if (request_phase_token_secret != null) {
+ debug("request phase token secret available; using it as signing key");
+
+ signing_key = consumer_secret + "&" + request_phase_token_secret;
+ } else {
+ debug("neither access phase nor request phase token secrets available; using API " +
+ "key as signing key");
+
+ signing_key = consumer_secret + "&";
+ }
+
+ string signature_base_string = http_method + "&" + Soup.URI.encode(
+ txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
+ Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
+
+ debug("signature base string = '%s'", signature_base_string);
+
+ debug("signing key = '%s'", signing_key);
+
+ // compute the signature
+ string signature = RESTSupport.hmac_sha1(signing_key, signature_base_string);
+ signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
+
+ debug("signature = '%s'", signature);
+
+ return signature;
+ }
+
+ public void set_request_phase_credentials(string token, string secret) {
+ this.request_phase_token = token;
+ this.request_phase_token_secret = secret;
+ }
+
+ public void set_access_phase_credentials(string token, string secret, string username) {
+ this.access_phase_token = token;
+ this.access_phase_token_secret = secret;
+ this.username = username;
+
+ authenticated();
+ }
+
+ public string get_oauth_nonce() {
+ TimeVal currtime = TimeVal();
+ currtime.get_current_time();
+
+ return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
+ currtime.tv_usec.to_string());
+ }
+
+ public string get_oauth_timestamp() {
+ return GLib.get_real_time().to_string().substring(0, 10);
+ }
+
+ public string get_consumer_key() {
+ assert(consumer_key != null);
+ return consumer_key;
+ }
+
+ public string get_request_phase_token() {
+ assert(request_phase_token != null);
+ return request_phase_token;
+ }
+
+ public string get_access_phase_token() {
+ assert(access_phase_token != null);
+ return access_phase_token;
+ }
+
+ public bool has_access_phase_token() {
+ return access_phase_token != null;
+ }
+
+ public string get_access_phase_token_secret() {
+ assert(access_phase_token_secret != null);
+ return access_phase_token_secret;
+ }
+
+ public string get_username() {
+ assert(is_authenticated());
+ return username;
+ }
+ }
+
+ public class Transaction : Publishing.RESTSupport.Transaction {
+ public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
+ Publishing.RESTSupport.HttpMethod.POST) {
+ base(session, method);
+ setup_arguments();
+ }
+
+ public Transaction.with_uri(Session session, string uri,
+ Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
+ base.with_endpoint_url(session, uri, method);
+ setup_arguments();
+ }
+
+ private void setup_arguments() {
+ var session = (Session) get_parent_session();
+
+ add_argument("oauth_nonce", session.get_oauth_nonce());
+ add_argument("oauth_signature_method", "HMAC-SHA1");
+ add_argument("oauth_version", "1.0");
+ add_argument("oauth_timestamp", session.get_oauth_timestamp());
+ add_argument("oauth_consumer_key", session.get_consumer_key());
+ if (session.has_access_phase_token()) {
+ add_argument("oauth_token", session.get_access_phase_token());
+ }
+ }
+
+
+ public override void execute() throws Spit.Publishing.PublishingError {
+ var signature = ((Session) get_parent_session()).sign_transaction(this);
+ add_argument("oauth_signature", signature);
+
+ base.execute();
+ }
+ }
+
+ public class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+ protected unowned Publishing.RESTSupport.OAuth1.Session session;
+ private Publishing.RESTSupport.Argument[] auth_header_fields;
+
+ public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session,
+ Spit.Publishing.Publishable publishable,
+ string endpoint_uri) {
+ base.with_endpoint_url(session, publishable, endpoint_uri);
+
+ this.auth_header_fields = new Publishing.RESTSupport.Argument[0];
+ this.session = session;
+
+ add_authorization_header_field("oauth_nonce", session.get_oauth_nonce());
+ add_authorization_header_field("oauth_signature_method", "HMAC-SHA1");
+ add_authorization_header_field("oauth_version", "1.0");
+ add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
+ add_authorization_header_field("oauth_consumer_key", session.get_consumer_key());
+ add_authorization_header_field("oauth_token", session.get_access_phase_token());
+ }
+
+ public void add_authorization_header_field(string key, string value) {
+ auth_header_fields += new Publishing.RESTSupport.Argument(key, value);
+ }
+
+ public string get_authorization_header_string() {
+ return "OAuth " + Argument.serialize_list(auth_header_fields, true, ", ");
+ }
+
+ public void authorize() {
+ var signature = session.sign_transaction(this, auth_header_fields);
+ add_authorization_header_field("oauth_signature", signature);
+
+
+ string authorization_header = get_authorization_header_string();
+
+ debug("executing upload transaction: authorization header string = '%s'",
+ authorization_header);
+ add_header("Authorization", authorization_header);
+
+ }
+ }
+}
+
+
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index f30430a..c19445f 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -1,4 +1,4 @@
-/* RESTSupport.c generated by valac 0.36.6, the Vala compiler
+/* RESTSupport.c generated by valac 0.40.4, the Vala compiler
* generated from RESTSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -42,9 +43,9 @@ enum {
PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL,
PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL,
PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL,
- PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_SESSION_NUM_SIGNALS
};
-static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ())
@@ -59,6 +60,7 @@ typedef struct _PublishingRESTSupportArgument PublishingRESTSupportArgument;
typedef struct _PublishingRESTSupportArgumentClass PublishingRESTSupportArgumentClass;
typedef struct _PublishingRESTSupportArgumentPrivate PublishingRESTSupportArgumentPrivate;
#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
typedef struct _PublishingRESTSupportParamSpecArgument PublishingRESTSupportParamSpecArgument;
#define PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION (publishing_rest_support_transaction_get_type ())
@@ -72,16 +74,15 @@ typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransactio
typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction;
enum {
PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL,
PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL,
PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL,
- PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_TRANSACTION_NUM_SIGNALS
};
-static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ())
#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction))
@@ -126,9 +127,9 @@ typedef struct _PublishingRESTSupportParamSpecBatchUploader PublishingRESTSuppor
enum {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL,
- PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL
+ PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_NUM_SIGNALS
};
-static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL] = {0};
+static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_NUM_SIGNALS] = {0};
#define PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION (publishing_rest_support_google_session_get_type ())
#define PUBLISHING_REST_SUPPORT_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession))
@@ -161,6 +162,11 @@ typedef struct _PublishingRESTSupportGooglePublisherPrivate PublishingRESTSuppor
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl PublishingRESTSupportGooglePublisherGoogleSessionImpl;
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass PublishingRESTSupportGooglePublisherGoogleSessionImplClass;
+enum {
+ PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_0_PROPERTY,
+ PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_NUM_PROPERTIES
+};
+static GParamSpec* publishing_rest_support_google_publisher_properties[PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_NUM_PROPERTIES];
#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate;
@@ -383,29 +389,39 @@ static gpointer publishing_rest_support_google_publisher_authenticated_transacti
static SpitPublishingPublisherIface * publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL;
#define PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH 20
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message);
gpointer publishing_rest_support_session_ref (gpointer instance);
void publishing_rest_support_session_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_session (const GValue* value);
GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_SESSION_DUMMY_PROPERTY
-};
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url);
+void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+ SoupMessage* message);
void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err);
+void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+ GError* err);
gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
static gboolean publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self);
gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self);
void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
-static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
+void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+ SoupMessage* message);
+static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender,
+ SoupMessage* msg,
+ gpointer self);
void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
@@ -413,130 +429,226 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
gpointer publishing_rest_support_argument_ref (gpointer instance);
void publishing_rest_support_argument_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_argument (const GValue* value);
GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_ARGUMENT_DUMMY_PROPERTY
-};
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+ const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape);
+gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+ PublishingRESTSupportArgument* arg2);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1);
+static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj);
gpointer publishing_rest_support_transaction_ref (gpointer instance);
void publishing_rest_support_transaction_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_transaction (const GValue* value);
GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data);
-static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message);
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self,
+ SoupBuffer* written_data);
+static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self,
+ SoupMessage* message);
+void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+ SoupMessage* message,
+ GError** error);
gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+ GTlsCertificate* * cert);
gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed);
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error);
-static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self,
+ int length);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1);
+void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+ gboolean is_executed);
+void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+ GError** error);
+static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender,
+ SoupMessage* message,
+ gpointer self);
PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length);
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value);
+void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+ const gchar* custom_payload,
+ const gchar* payload_content_type,
+ gulong payload_length);
+void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+ SoupMessage* message);
gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self);
guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
-static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
+static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self,
+ GError** error);
static void _vala_SoupURI_free (SoupURI* self);
SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self);
SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
-static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value);
+static void _vala_array_add1 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value);
PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj);
GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable);
static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type);
static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url);
+static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base,
+ const gchar* key,
+ const gchar* value);
const gchar* spit_publishing_publisher_media_type_to_string (SpitPublishingPublisherMediaType self);
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);
+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 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);
void publishing_rest_support_xml_document_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_xml_document (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_xml_document (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_xml_document (const GValue* value);
GType publishing_rest_support_xml_document_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocumentPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_XML_DOCUMENT_DUMMY_PROPERTY
-};
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc);
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc);
+static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type,
+ xmlDoc* doc);
xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self);
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error);
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error);
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error);
+xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+ xmlNode* parent,
+ const gchar* child_name,
+ GError** error);
+gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+ xmlNode* node,
+ const gchar* property_key,
+ GError** error);
+PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+ PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+ void* check_for_error_response_target,
+ GError** error);
static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj);
gchar* publishing_rest_support_decimal_entity_encode (const gchar* source);
gpointer publishing_rest_support_batch_uploader_ref (gpointer instance);
void publishing_rest_support_batch_uploader_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void publishing_rest_support_value_set_batch_uploader (GValue* value,
+ gpointer v_object);
+void publishing_rest_support_value_take_batch_uploader (GValue* value,
+ gpointer v_object);
gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value);
GType publishing_rest_support_batch_uploader_get_type (void) G_GNUC_CONST;
#define PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploaderPrivate))
-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);
+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 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);
-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);
+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);
+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);
PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self);
SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self);
-static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
+static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable);
+void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target);
static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
gchar* publishing_rest_support_asciify_string (const gchar* s);
GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_DUMMY_PROPERTY
-};
gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self);
static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self);
gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self);
@@ -547,18 +659,19 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisherPrivate))
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_DUMMY_PROPERTY
-};
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID "1073902228337-gm4uf5etk25s0hnnm0g7uv2tm2bm1j0b.apps.googleusercontent." \
"com"
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET "_kA4RZz72xqed4DqfO7xMmMN"
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
+PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host,
+ const gchar* scope);
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void);
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type);
SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self);
-static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self);
static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self);
SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
@@ -573,28 +686,39 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self);
static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self);
static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base);
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GOOGLE_SESSION_IMPL_DUMMY_PROPERTY
-};
static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base);
static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base);
static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj);
GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
-enum {
- PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_DUMMY_PROPERTY
-};
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method);
static void publishing_rest_support_google_publisher_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static guint8* string_get_data (const gchar* self, int* result_length1) {
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+
+
+static guint8*
+string_get_data (const gchar* self,
+ int* result_length1)
+{
guint8* result;
guint8* res = NULL;
gint res_length1;
@@ -606,62 +730,63 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1;
guint8* _tmp4_;
gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 637 "RESTSupport.c"
+#line 761 "RESTSupport.c"
}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 643 "RESTSupport.c"
+#line 767 "RESTSupport.c"
}
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message) {
+gchar*
+publishing_rest_support_hmac_sha1 (const gchar* key,
+ const gchar* message)
+{
gchar* result = NULL;
guint8 buffer[PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH] = {0};
gsize len = 0UL;
GHmac* mac = NULL;
- const gchar* _tmp0_;
+ guint8* _tmp0_;
+ gint _tmp0__length1;
guint8* _tmp1_;
gint _tmp1__length1;
- guint8* _tmp2_;
- gint _tmp2__length1;
- GHmac* _tmp3_;
- const gchar* _tmp4_;
- guint8* _tmp5_;
- gint _tmp5__length1;
- guint8* _tmp6_;
- gint _tmp6__length1;
- gsize _tmp7_;
- gchar* _tmp8_;
+ GHmac* _tmp2_;
+ guint8* _tmp3_;
+ gint _tmp3__length1;
+ guint8* _tmp4_;
+ gint _tmp4__length1;
+ gsize _tmp5_;
+ gchar* _tmp6_;
#line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (key != NULL, NULL);
#line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -669,130 +794,134 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
#line 16 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
len = (gsize) PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = key;
+ _tmp0_ = string_get_data (key, &_tmp0__length1);
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = string_get_data (_tmp0_, &_tmp1__length1);
-#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2__length1 = _tmp1__length1;
+ _tmp1__length1 = _tmp0__length1;
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_hmac_new (G_CHECKSUM_SHA1, _tmp2_, _tmp2__length1);
+ _tmp2_ = g_hmac_new (G_CHECKSUM_SHA1, _tmp1_, _tmp1__length1);
#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- mac = _tmp3_;
-#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = message;
+ mac = _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
+ _tmp3_ = string_get_data (message, &_tmp3__length1);
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6__length1 = _tmp5__length1;
+ _tmp4__length1 = _tmp3__length1;
#line 19 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_hmac_update (mac, _tmp6_, (gssize) _tmp6__length1);
+ g_hmac_update (mac, _tmp4_, (gssize) _tmp4__length1);
#line 20 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hmac_get_digest (mac, buffer, &len);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = len;
+ _tmp5_ = len;
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_base64_encode (buffer + 0, ((gint) _tmp7_) - 0);
+ _tmp6_ = g_base64_encode (buffer + 0, ((gint) _tmp5_) - 0);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp8_;
+ result = _tmp6_;
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hmac_unref0 (mac);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 705 "RESTSupport.c"
+#line 826 "RESTSupport.c"
}
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url) {
+PublishingRESTSupportSession*
+publishing_rest_support_session_construct (GType object_type,
+ const gchar* endpoint_url)
+{
PublishingRESTSupportSession* self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
+ SoupSession* _tmp1_;
SoupSession* _tmp2_;
- SoupSession* _tmp3_;
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportSession*) g_type_create_instance (object_type);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = endpoint_url;
-#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (endpoint_url);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->endpoint_url = _tmp1_;
+ self->priv->endpoint_url = _tmp0_;
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = soup_session_new ();
+ _tmp1_ = soup_session_new ();
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->soup_session = _tmp2_;
+ self->priv->soup_session = _tmp1_;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->soup_session;
+ _tmp2_ = self->priv->soup_session;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
+ g_object_set (_tmp2_, "ssl-use-system-ca-file", TRUE, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 737 "RESTSupport.c"
+#line 858 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message) {
- SoupMessage* _tmp0_;
+void
+publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+ SoupMessage* message)
+{
#line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, _tmp0_);
-#line 751 "RESTSupport.c"
+ g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, message);
+#line 872 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self)
+{
#line 44 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL], 0);
-#line 760 "RESTSupport.c"
+#line 883 "RESTSupport.c"
}
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err) {
- GError* _tmp0_;
+void
+publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+ GError* err)
+{
#line 48 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = err;
-#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, _tmp0_);
-#line 772 "RESTSupport.c"
+ g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, err);
+#line 895 "RESTSupport.c"
}
-static gboolean publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self) {
+static gboolean
+publishing_rest_support_session_real_is_authenticated (PublishingRESTSupportSession* self)
+{
gboolean _tmp0_ = FALSE;
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 _tmp0_;
-#line 782 "RESTSupport.c"
+#line 907 "RESTSupport.c"
}
-gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self) {
+gboolean
+publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self)
+{
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 791 "RESTSupport.c"
+#line 918 "RESTSupport.c"
}
-gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self) {
+gchar*
+publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -806,11 +935,13 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
result = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 809 "RESTSupport.c"
+#line 938 "RESTSupport.c"
}
-void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self)
+{
SoupSession* _tmp0_;
#line 58 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
@@ -820,11 +951,13 @@ 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 823 "RESTSupport.c"
+#line 954 "RESTSupport.c"
}
-gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self) {
+gboolean
+publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 63 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -835,57 +968,60 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
result = _tmp0_;
#line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 838 "RESTSupport.c"
+#line 971 "RESTSupport.c"
}
-static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
+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 845 "RESTSupport.c"
+#line 982 "RESTSupport.c"
}
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message) {
- gboolean _tmp0_;
+void
+publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+ SoupMessage* message)
+{
+ SoupSession* _tmp0_;
SoupSession* _tmp1_;
SoupSession* _tmp2_;
- SoupMessage* _tmp3_;
- SoupSession* _tmp4_;
- guint _tmp5_;
+ guint _tmp3_;
#line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 68 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_session_are_transactions_stopped (self);
-#line 68 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_) {
+ if (publishing_rest_support_session_are_transactions_stopped (self)) {
#line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 866 "RESTSupport.c"
+#line 1002 "RESTSupport.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->soup_session;
+ _tmp0_ = self->priv->soup_session;
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect (_tmp1_, "request-unqueued", (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
+ g_signal_connect (_tmp0_, "request-unqueued", (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = self->priv->soup_session;
-#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = message;
+ _tmp1_ = self->priv->soup_session;
#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_session_send_message (_tmp2_, _tmp3_);
+ soup_session_send_message (_tmp1_, message);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->soup_session;
+ _tmp2_ = self->priv->soup_session;
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp3_, 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 884 "RESTSupport.c"
+ g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
+#line 1018 "RESTSupport.c"
}
-void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) {
+void
+publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self)
+{
SoupSession* _tmp0_;
SoupSession* _tmp1_;
#line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -898,108 +1034,133 @@ 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 901 "RESTSupport.c"
+#line 1037 "RESTSupport.c"
}
-static void publishing_rest_support_value_session_init (GValue* value) {
+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 908 "RESTSupport.c"
+#line 1046 "RESTSupport.c"
}
-static void publishing_rest_support_value_session_free_value (GValue* value) {
+static void
+publishing_rest_support_value_session_free_value (GValue* value)
+{
#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"
publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 917 "RESTSupport.c"
+#line 1057 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_session_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_session_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 927 "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 931 "RESTSupport.c"
+#line 1074 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
+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 939 "RESTSupport.c"
+#line 1084 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 946 "RESTSupport.c"
+#line 1096 "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 953 "RESTSupport.c"
+#line 1103 "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 957 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 961 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 965 "RESTSupport.c"
+#line 1115 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 969 "RESTSupport.c"
+#line 1119 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_session_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportSession ** object_p;
object_p = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 980 "RESTSupport.c"
+#line 1135 "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 986 "RESTSupport.c"
+#line 1141 "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 990 "RESTSupport.c"
+#line 1145 "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 994 "RESTSupport.c"
+#line 1149 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 998 "RESTSupport.c"
+#line 1153 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_session (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecSession* spec;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
@@ -1009,20 +1170,25 @@ 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 1012 "RESTSupport.c"
+#line 1173 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_session (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_session (const GValue* value)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 1021 "RESTSupport.c"
+#line 1184 "RESTSupport.c"
}
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_session (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportSession * old;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
@@ -1038,22 +1204,25 @@ 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 1041 "RESTSupport.c"
+#line 1207 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1045 "RESTSupport.c"
+#line 1211 "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 1051 "RESTSupport.c"
+#line 1217 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_session (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportSession * old;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
@@ -1067,22 +1236,24 @@ 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 1070 "RESTSupport.c"
+#line 1239 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1074 "RESTSupport.c"
+#line 1243 "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 1080 "RESTSupport.c"
+#line 1249 "RESTSupport.c"
}
}
-static void publishing_rest_support_session_class_init (PublishingRESTSupportSessionClass * klass) {
+static void
+publishing_rest_support_session_class_init (PublishingRESTSupportSessionClass * klass)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_parent_class = g_type_class_peek_parent (klass);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1097,11 +1268,13 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL] = 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"
publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL] = 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 1100 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
}
-static void publishing_rest_support_session_instance_init (PublishingRESTSupportSession * self) {
+static void
+publishing_rest_support_session_instance_init (PublishingRESTSupportSession * self)
+{
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_SESSION_GET_PRIVATE (self);
#line 26 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1112,11 +1285,13 @@ 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 1115 "RESTSupport.c"
+#line 1288 "RESTSupport.c"
}
-static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRESTSupportSession * self;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession);
@@ -1126,11 +1301,13 @@ 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 1129 "RESTSupport.c"
+#line 1304 "RESTSupport.c"
}
-GType publishing_rest_support_session_get_type (void) {
+GType
+publishing_rest_support_session_get_type (void)
+{
static volatile gsize publishing_rest_support_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_session_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_session_init, publishing_rest_support_value_session_free_value, publishing_rest_support_value_session_copy_value, publishing_rest_support_value_session_peek_pointer, "p", publishing_rest_support_value_session_collect_value, "p", publishing_rest_support_value_session_lcopy_value };
@@ -1144,18 +1321,22 @@ GType publishing_rest_support_session_get_type (void) {
}
-gpointer publishing_rest_support_session_ref (gpointer instance) {
+gpointer
+publishing_rest_support_session_ref (gpointer instance)
+{
PublishingRESTSupportSession * self;
self = instance;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1154 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
}
-void publishing_rest_support_session_unref (gpointer instance) {
+void
+publishing_rest_support_session_unref (gpointer instance)
+{
PublishingRESTSupportSession * self;
self = instance;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1164,18 +1345,20 @@ 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 1167 "RESTSupport.c"
+#line 1348 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self) {
+gchar*
+publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self)
+{
gchar* result = NULL;
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
switch (self) {
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1178 "RESTSupport.c"
+#line 1361 "RESTSupport.c"
{
gchar* _tmp0_;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1184,11 +1367,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 1187 "RESTSupport.c"
+#line 1370 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1191 "RESTSupport.c"
+#line 1374 "RESTSupport.c"
{
gchar* _tmp1_;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1197,11 +1380,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 1200 "RESTSupport.c"
+#line 1383 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1204 "RESTSupport.c"
+#line 1387 "RESTSupport.c"
{
gchar* _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1210,68 +1393,60 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1213 "RESTSupport.c"
+#line 1396 "RESTSupport.c"
}
default:
{
#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1219 "RESTSupport.c"
+#line 1402 "RESTSupport.c"
}
}
}
-PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) {
+PublishingRESTSupportHttpMethod
+publishing_rest_support_http_method_from_string (const gchar* str)
+{
PublishingRESTSupportHttpMethod result = 0;
- const gchar* _tmp0_;
#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (str != NULL, 0);
#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = str;
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp0_, "GET") == 0) {
+ if (g_strcmp0 (str, "GET") == 0) {
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1238 "RESTSupport.c"
+#line 1420 "RESTSupport.c"
} else {
- const gchar* _tmp1_;
#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = str;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp1_, "PUT") == 0) {
+ if (g_strcmp0 (str, "PUT") == 0) {
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1249 "RESTSupport.c"
+#line 1428 "RESTSupport.c"
} else {
- const gchar* _tmp2_;
#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = str;
-#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp2_, "POST") == 0) {
+ if (g_strcmp0 (str, "POST") == 0) {
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1260 "RESTSupport.c"
+#line 1436 "RESTSupport.c"
} else {
- const gchar* _tmp3_;
-#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 1267 "RESTSupport.c"
+ g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", str);
+#line 1440 "RESTSupport.c"
}
}
}
}
-GType publishing_rest_support_http_method_get_type (void) {
+GType
+publishing_rest_support_http_method_get_type (void)
+{
static volatile gsize publishing_rest_support_http_method_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_http_method_type_id__volatile)) {
static const GEnumValue values[] = {{PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET", "get"}, {PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST", "post"}, {PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT, "PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT", "put"}, {0, NULL, NULL}};
@@ -1283,12 +1458,14 @@ GType publishing_rest_support_http_method_get_type (void) {
}
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value) {
+PublishingRESTSupportArgument*
+publishing_rest_support_argument_construct (GType object_type,
+ const gchar* key,
+ const gchar* value)
+{
PublishingRESTSupportArgument* self = NULL;
- const gchar* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- const gchar* _tmp2_;
- gchar* _tmp3_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (key != NULL, NULL);
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1296,279 +1473,434 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportArgument*) g_type_create_instance (object_type);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (key);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->key);
#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->key = _tmp1_;
+ self->key = _tmp0_;
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
-#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (value);
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->value = _tmp3_;
+ self->value = _tmp1_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1316 "RESTSupport.c"
+#line 1489 "RESTSupport.c"
}
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
+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 1323 "RESTSupport.c"
+#line 1499 "RESTSupport.c"
+}
+
+
+static gpointer
+_publishing_rest_support_argument_ref0 (gpointer self)
+{
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return self ? publishing_rest_support_argument_ref (self) : NULL;
+#line 1508 "RESTSupport.c"
}
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2) {
+gchar*
+publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+ int args_length1,
+ gboolean escape,
+ const gchar* separator)
+{
+ gchar* result = NULL;
+ GString* builder = NULL;
+ GString* _tmp0_;
+ GString* _tmp7_;
+ gssize _tmp8_;
+ GString* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = g_string_new ("");
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ builder = _tmp0_;
+#line 1530 "RESTSupport.c"
+ {
+ PublishingRESTSupportArgument** arg_collection = NULL;
+ gint arg_collection_length1 = 0;
+ gint _arg_collection_size_ = 0;
+ gint arg_it = 0;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg_collection = args;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg_collection_length1 = args_length1;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ for (arg_it = 0; arg_it < args_length1; arg_it = arg_it + 1) {
+#line 1542 "RESTSupport.c"
+ PublishingRESTSupportArgument* _tmp1_;
+ PublishingRESTSupportArgument* arg = NULL;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg = _tmp1_;
+#line 1549 "RESTSupport.c"
+ {
+ GString* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ GString* _tmp6_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = builder;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = arg;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = publishing_rest_support_argument_to_string (_tmp3_, escape);
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp4_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append (_tmp2_, _tmp5_);
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp5_);
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = builder;
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append (_tmp6_, separator);
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _publishing_rest_support_argument_unref0 (arg);
+#line 1574 "RESTSupport.c"
+ }
+ }
+ }
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = builder;
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = _tmp7_->len;
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp8_ > ((gssize) 0)) {
+#line 1584 "RESTSupport.c"
+ GString* _tmp9_;
+ GString* _tmp10_;
+ gssize _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = builder;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = builder;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = _tmp10_->len;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = strlen (separator);
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = _tmp12_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_truncate (_tmp9_, (gsize) (_tmp11_ - _tmp13_));
+#line 1602 "RESTSupport.c"
+ }
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp14_ = builder;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15_ = _tmp14_->str;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp16_ = g_strdup (_tmp15_);
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp16_;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_string_free0 (builder);
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return result;
+#line 1616 "RESTSupport.c"
+}
+
+
+gint
+publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+ PublishingRESTSupportArgument* arg2)
+{
gint result = 0;
GCompareFunc _tmp0_;
- PublishingRESTSupportArgument* _tmp1_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
- PublishingRESTSupportArgument* _tmp3_;
- const gchar* _tmp4_;
- gint _tmp5_;
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg2), 0);
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = arg1;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->key;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = arg2;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->key;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = arg1->key;
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = arg2->key;
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp0_ (_tmp1_, _tmp2_);
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1355 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
}
-static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self)
+{
gint result;
result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1364 "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 1371 "RESTSupport.c"
+#line 1655 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+ int inputArray_length1,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
GeeTreeSet* sorted_args = NULL;
GeeTreeSet* _tmp0_;
- PublishingRESTSupportArgument** _tmp1_;
- gint _tmp1__length1;
- GeeTreeSet* _tmp5_;
- gint _tmp6_;
- gpointer* _tmp7_;
- PublishingRESTSupportArgument** _tmp8_;
- gint _tmp8__length1;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ GeeTreeSet* _tmp4_;
+ gint _tmp5_;
+ gpointer* _tmp6_;
+ PublishingRESTSupportArgument** _tmp7_;
+ gint _tmp7__length1;
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
sorted_args = _tmp0_;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = inputArray;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = inputArray_length1;
-#line 1394 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection = _tmp1_;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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 1406 "RESTSupport.c"
- PublishingRESTSupportArgument* _tmp2_;
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg_collection = inputArray;
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg_collection_length1 = inputArray_length1;
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ for (arg_it = 0; arg_it < inputArray_length1; arg_it = arg_it + 1) {
+#line 1688 "RESTSupport.c"
+ PublishingRESTSupportArgument* _tmp1_;
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 1413 "RESTSupport.c"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ arg = _tmp1_;
+#line 1695 "RESTSupport.c"
{
- GeeTreeSet* _tmp3_;
- PublishingRESTSupportArgument* _tmp4_;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = sorted_args;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = arg;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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"
+ GeeTreeSet* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = sorted_args;
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = arg;
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1425 "RESTSupport.c"
+#line 1707 "RESTSupport.c"
}
}
}
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = sorted_args;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _tmp7_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__length1 = _tmp6_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = sorted_args;
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp5_);
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = _tmp6_;
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7__length1 = _tmp5_;
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- *result_length1 = _tmp8__length1;
-#line 1441 "RESTSupport.c"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ *result_length1 = _tmp7__length1;
+#line 1723 "RESTSupport.c"
}
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp8_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp7_;
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (sorted_args);
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1449 "RESTSupport.c"
+#line 1731 "RESTSupport.c"
}
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self) {
+gchar*
+publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ const gchar* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = self->key;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->value;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup_printf ("%s=%s", _tmp0_, _tmp1_);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (escape) {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = "\"";
+#line 1751 "RESTSupport.c"
+ } else {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = "";
+#line 1755 "RESTSupport.c"
+ }
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (escape) {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = "\"";
+#line 1761 "RESTSupport.c"
+ } else {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = "";
+#line 1765 "RESTSupport.c"
+ }
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = self->key;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = self->value;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = g_strdup_printf ("%s=%s%s%s", _tmp2_, _tmp0_, _tmp3_, _tmp1_);
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp4_;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1470 "RESTSupport.c"
+#line 1777 "RESTSupport.c"
}
-static void publishing_rest_support_value_argument_init (GValue* value) {
+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 1477 "RESTSupport.c"
+#line 1786 "RESTSupport.c"
}
-static void publishing_rest_support_value_argument_free_value (GValue* value) {
+static void
+publishing_rest_support_value_argument_free_value (GValue* value)
+{
#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"
publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1486 "RESTSupport.c"
+#line 1797 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_argument_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+publishing_rest_support_value_argument_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 1496 "RESTSupport.c"
+#line 1810 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1500 "RESTSupport.c"
+#line 1814 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
+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 1508 "RESTSupport.c"
+#line 1824 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 1515 "RESTSupport.c"
+#line 1836 "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 1522 "RESTSupport.c"
+#line 1843 "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 1526 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1530 "RESTSupport.c"
+#line 1851 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1534 "RESTSupport.c"
+#line 1855 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1538 "RESTSupport.c"
+#line 1859 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_argument_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportArgument ** object_p;
object_p = collect_values[0].v_pointer;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 1549 "RESTSupport.c"
+#line 1875 "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 1555 "RESTSupport.c"
+#line 1881 "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 1559 "RESTSupport.c"
+#line 1885 "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 1563 "RESTSupport.c"
+#line 1889 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1567 "RESTSupport.c"
+#line 1893 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_argument (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecArgument* spec;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
@@ -1578,20 +1910,25 @@ 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 1581 "RESTSupport.c"
+#line 1913 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_argument (const GValue* value) {
+gpointer
+publishing_rest_support_value_get_argument (const GValue* value)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 1590 "RESTSupport.c"
+#line 1924 "RESTSupport.c"
}
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_argument (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportArgument * old;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
@@ -1607,22 +1944,25 @@ 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 1610 "RESTSupport.c"
+#line 1947 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1614 "RESTSupport.c"
+#line 1951 "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 1620 "RESTSupport.c"
+#line 1957 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_argument (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportArgument * old;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
@@ -1636,38 +1976,44 @@ 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 1639 "RESTSupport.c"
+#line 1979 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1643 "RESTSupport.c"
+#line 1983 "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 1649 "RESTSupport.c"
+#line 1989 "RESTSupport.c"
}
}
-static void publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass) {
+static void
+publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass)
+{
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 1659 "RESTSupport.c"
+#line 2001 "RESTSupport.c"
}
-static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
+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 1666 "RESTSupport.c"
+#line 2010 "RESTSupport.c"
}
-static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj) {
+static void
+publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj)
+{
PublishingRESTSupportArgument * self;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument);
@@ -1677,11 +2023,13 @@ 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 1680 "RESTSupport.c"
+#line 2026 "RESTSupport.c"
}
-GType publishing_rest_support_argument_get_type (void) {
+GType
+publishing_rest_support_argument_get_type (void)
+{
static volatile gsize publishing_rest_support_argument_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_argument_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_argument_init, publishing_rest_support_value_argument_free_value, publishing_rest_support_value_argument_copy_value, publishing_rest_support_value_argument_peek_pointer, "p", publishing_rest_support_value_argument_collect_value, "p", publishing_rest_support_value_argument_lcopy_value };
@@ -1695,18 +2043,22 @@ GType publishing_rest_support_argument_get_type (void) {
}
-gpointer publishing_rest_support_argument_ref (gpointer instance) {
+gpointer
+publishing_rest_support_argument_ref (gpointer instance)
+{
PublishingRESTSupportArgument * self;
self = instance;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1705 "RESTSupport.c"
+#line 2055 "RESTSupport.c"
}
-void publishing_rest_support_argument_unref (gpointer instance) {
+void
+publishing_rest_support_argument_unref (gpointer instance)
+{
PublishingRESTSupportArgument * self;
self = instance;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1715,289 +2067,289 @@ 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 1718 "RESTSupport.c"
+#line 2070 "RESTSupport.c"
}
}
-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"
+static void
+_publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender,
+ SoupBuffer* chunk,
+ gpointer self)
+{
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1726 "RESTSupport.c"
+#line 2082 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
- PublishingRESTSupportSession* _tmp3_;
- PublishingRESTSupportHttpMethod _tmp4_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- PublishingRESTSupportSession* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- SoupMessage* _tmp10_;
- SoupMessage* _tmp11_;
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp6_;
+ SoupMessage* _tmp7_;
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp2_);
-#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = parent_session;
-#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp3_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = method;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = parent_session;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = soup_message_new (_tmp6_, _tmp9_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = publishing_rest_support_session_get_endpoint_url (parent_session);
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_;
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (_tmp1_ != NULL, "parent_session.get_endpoint_url() != null");
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp1_);
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->parent_session = parent_session;
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = publishing_rest_support_http_method_to_string (method);
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = _tmp2_;
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = publishing_rest_support_session_get_endpoint_url (parent_session);
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp4_;
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = soup_message_new (_tmp3_, _tmp5_);
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp10_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = self->priv->message;
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->message = _tmp6_;
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp5_);
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp3_);
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = self->priv->message;
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_signal_connect (_tmp7_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1790 "RESTSupport.c"
+#line 2138 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1797 "RESTSupport.c"
+#line 2148 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- const gchar* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- PublishingRESTSupportHttpMethod _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- SoupMessage* _tmp7_;
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp3_;
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp0_;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->parent_session = parent_session;
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = g_strdup (endpoint_url);
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->endpoint_url = _tmp2_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = method;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = endpoint_url;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = soup_message_new (_tmp5_, _tmp6_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->endpoint_url = _tmp0_;
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = publishing_rest_support_http_method_to_string (method);
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = _tmp1_;
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = soup_message_new (_tmp2_, endpoint_url);
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp7_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->message = _tmp3_;
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp2_);
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1847 "RESTSupport.c"
+#line 2191 "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"
+PublishingRESTSupportTransaction*
+publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 184 "/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 1854 "RESTSupport.c"
+#line 2202 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data) {
+static void
+publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self,
+ SoupBuffer* written_data)
+{
gint _tmp0_;
- SoupBuffer* _tmp1_;
- gsize _tmp2_;
- gint _tmp3_;
- SoupMessage* _tmp4_;
- SoupMessageBody* _tmp5_;
- gint64 _tmp6_;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gsize _tmp1_;
+ gint _tmp2_;
+ SoupMessage* _tmp3_;
+ SoupMessageBody* _tmp4_;
+ gint64 _tmp5_;
+#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (written_data != NULL);
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->bytes_written;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = written_data;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->length;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->bytes_written;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->message;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_->request_body;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->length;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
-#line 1888 "RESTSupport.c"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = written_data->length;
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->bytes_written = _tmp0_ + ((gint) _tmp1_);
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = self->priv->bytes_written;
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = self->priv->message;
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = _tmp3_->request_body;
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp4_->length;
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp2_, (gint) _tmp5_);
+#line 2236 "RESTSupport.c"
}
-static gpointer _g_error_copy0 (gpointer self) {
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+_g_error_copy0 (gpointer self)
+{
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 1895 "RESTSupport.c"
+#line 2245 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message) {
+static void
+publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self,
+ SoupMessage* message)
+{
SoupMessage* _tmp0_;
- SoupMessage* _tmp1_;
GError * _inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = message;
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ != _tmp1_) {
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp0_ != message) {
+#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1915 "RESTSupport.c"
+#line 2265 "RESTSupport.c"
}
{
- SoupMessage* _tmp2_;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = message;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ publishing_rest_support_transaction_check_response (self, message, &_inner_error_);
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1927 "RESTSupport.c"
+#line 2274 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1936 "RESTSupport.c"
+#line 2283 "RESTSupport.c"
}
}
goto __finally0;
__catch0_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
- GError* _tmp7_;
- GError* _tmp8_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ GError* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GError* _tmp5_;
+ GError* _tmp6_;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = err;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->message;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:188: Publishing error: %s", _tmp4_);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (self);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:189: response validation failed. bad response = '%s'.", _tmp6_);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = err;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _g_error_copy0 (_tmp7_);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = err;
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = _tmp1_->message;
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp2_);
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = publishing_rest_support_transaction_get_response (self);
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = _tmp3_;
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp4_);
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp4_);
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = err;
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = _g_error_copy0 (_tmp5_);
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->err = _tmp8_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->err = _tmp6_;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 1977 "RESTSupport.c"
+#line 2324 "RESTSupport.c"
}
__finally0:
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/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);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1988 "RESTSupport.c"
+#line 2335 "RESTSupport.c"
}
}
-static gpointer _g_object_ref0 (gpointer self) {
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+_g_object_ref0 (gpointer self)
+{
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_object_ref (self) : NULL;
-#line 1996 "RESTSupport.c"
+#line 2345 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert) {
+gchar*
+publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+ GTlsCertificate* * cert)
+{
GTlsCertificate* _vala_cert = NULL;
gchar* result = NULL;
GTlsCertificateFlags tls_errors = 0;
@@ -2022,145 +2374,145 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
GString* _tmp40_;
const gchar* _tmp41_;
gchar* _tmp42_;
-#line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_get_https_status (_tmp0_, &_tmp1_, &_tmp2_);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_cert = _tmp3_;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
tls_errors = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
list = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = tls_errors;
-#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2047 "RESTSupport.c"
+#line 2399 "RESTSupport.c"
GeeArrayList* _tmp6_;
-#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = list;
-#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("âš« This website presented identification that belongs to a different we" \
"bsite."));
-#line 2053 "RESTSupport.c"
+#line 2405 "RESTSupport.c"
}
-#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = tls_errors;
-#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2059 "RESTSupport.c"
+#line 2411 "RESTSupport.c"
GeeArrayList* _tmp8_;
-#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = list;
-#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is too old to trust. Check the date on" \
" your computer’s calendar."));
-#line 2065 "RESTSupport.c"
+#line 2417 "RESTSupport.c"
}
-#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = tls_errors;
-#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2071 "RESTSupport.c"
+#line 2423 "RESTSupport.c"
GeeArrayList* _tmp10_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = list;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification was not issued by a trusted organizati" \
"on."));
-#line 2077 "RESTSupport.c"
+#line 2429 "RESTSupport.c"
}
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = tls_errors;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2083 "RESTSupport.c"
+#line 2435 "RESTSupport.c"
GeeArrayList* _tmp12_;
-#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = list;
-#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification could not be processed. It may be corr" \
"upted."));
-#line 2089 "RESTSupport.c"
+#line 2441 "RESTSupport.c"
}
-#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = tls_errors;
-#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2095 "RESTSupport.c"
+#line 2447 "RESTSupport.c"
GeeArrayList* _tmp14_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = list;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification has been revoked by the trusted organi" \
"zation that issued it."));
-#line 2101 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
}
-#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = tls_errors;
-#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2107 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
GeeArrayList* _tmp16_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = list;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification cannot be trusted because it uses very" \
" weak encryption."));
-#line 2113 "RESTSupport.c"
+#line 2465 "RESTSupport.c"
}
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = tls_errors;
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2119 "RESTSupport.c"
+#line 2471 "RESTSupport.c"
GeeArrayList* _tmp18_;
-#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = list;
-#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is only valid for future dates. Check " \
"the date on your computer’s calendar."));
-#line 2125 "RESTSupport.c"
+#line 2477 "RESTSupport.c"
}
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_string_new ("");
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
builder = _tmp19_;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = list;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = _tmp21_;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp22_ == 1) {
-#line 2139 "RESTSupport.c"
+#line 2491 "RESTSupport.c"
GString* _tmp23_;
GeeArrayList* _tmp24_;
gpointer _tmp25_;
gchar* _tmp26_;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = builder;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = list;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = (gchar*) _tmp25_;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append (_tmp23_, _tmp26_);
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
-#line 2156 "RESTSupport.c"
+#line 2508 "RESTSupport.c"
} else {
{
GeeArrayList* _entry_list = NULL;
@@ -2171,25 +2523,25 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
gint _tmp30_;
gint _tmp31_;
gint _entry_index = 0;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_entry_list = _tmp28_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = _entry_list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = _tmp30_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_entry_size = _tmp31_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_entry_index = -1;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2185 "RESTSupport.c"
+#line 2537 "RESTSupport.c"
gint _tmp32_;
gint _tmp33_;
gint _tmp34_;
@@ -2199,441 +2551,424 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
gpointer _tmp37_;
GString* _tmp38_;
const gchar* _tmp39_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_entry_index = _tmp32_ + 1;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = _entry_size;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!(_tmp33_ < _tmp34_)) {
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2207 "RESTSupport.c"
+#line 2559 "RESTSupport.c"
}
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = _entry_list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp36_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
entry = (gchar*) _tmp37_;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp38_ = builder;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp39_ = entry;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_printf (_tmp38_, "%s\n", _tmp39_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (entry);
-#line 2225 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
}
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_entry_list);
-#line 2229 "RESTSupport.c"
+#line 2581 "RESTSupport.c"
}
}
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp40_ = builder;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp41_ = _tmp40_->str;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = g_strdup (_tmp41_);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp42_;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (builder);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (list);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (cert) {
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*cert = _vala_cert;
-#line 2248 "RESTSupport.c"
+#line 2600 "RESTSupport.c"
} else {
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 2252 "RESTSupport.c"
+#line 2604 "RESTSupport.c"
}
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2256 "RESTSupport.c"
+#line 2608 "RESTSupport.c"
}
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) {
- SoupMessage* _tmp0_;
+void
+publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+ SoupMessage* message,
+ GError** error)
+{
+ guint _tmp0_;
guint _tmp1_;
- guint _tmp2_;
- gboolean _tmp42_ = FALSE;
- SoupMessage* _tmp43_;
- SoupMessageBody* _tmp44_;
- guint8* _tmp45_;
- gint _tmp45__length1;
+ gboolean _tmp35_ = FALSE;
+ SoupMessageBody* _tmp36_;
+ guint8* _tmp37_;
+ gint _tmp37__length1;
GError * _inner_error_ = NULL;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- switch (_tmp2_) {
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp0_, NULL);
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_;
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ switch (_tmp1_) {
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_OK:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2286 "RESTSupport.c"
+#line 2638 "RESTSupport.c"
{
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2290 "RESTSupport.c"
+#line 2642 "RESTSupport.c"
}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2296 "RESTSupport.c"
+#line 2648 "RESTSupport.c"
{
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- SoupMessage* _tmp5_;
- guint _tmp6_;
- guint _tmp7_;
- GError* _tmp8_;
- GError* _tmp9_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = message;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ guint _tmp4_;
+ guint _tmp5_;
+ GError* _tmp6_;
+ GError* _tmp7_;
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = _tmp2_;
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp4_, NULL);
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp4_;
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp3_, _tmp5_);
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp4_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp9_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp3_);
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp7_;
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2329 "RESTSupport.c"
+#line 2678 "RESTSupport.c"
} else {
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/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);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2337 "RESTSupport.c"
+#line 2686 "RESTSupport.c"
}
}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2344 "RESTSupport.c"
+#line 2693 "RESTSupport.c"
{
- gchar* _tmp10_;
- gchar* _tmp11_;
- SoupMessage* _tmp12_;
- guint _tmp13_;
- guint _tmp14_;
- GError* _tmp15_;
- GError* _tmp16_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ guint _tmp10_;
+ guint _tmp11_;
+ GError* _tmp12_;
+ GError* _tmp13_;
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = _tmp8_;
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp10_, NULL);
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = _tmp10_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = message;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = _tmp13_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp11_, _tmp14_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = _tmp15_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp16_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp9_, _tmp11_);
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = _tmp12_;
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp9_);
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp13_;
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2377 "RESTSupport.c"
+#line 2723 "RESTSupport.c"
} else {
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/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);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2385 "RESTSupport.c"
+#line 2731 "RESTSupport.c"
}
}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2390 "RESTSupport.c"
+#line 2736 "RESTSupport.c"
{
- gchar* _tmp17_;
- gchar* _tmp18_;
- GError* _tmp19_;
- GError* _tmp20_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp18_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = _tmp19_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp20_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GError* _tmp16_;
+ GError* _tmp17_;
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp14_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15_ = _tmp14_;
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp16_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp15_);
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp17_ = _tmp16_;
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp15_);
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp17_;
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2414 "RESTSupport.c"
+#line 2760 "RESTSupport.c"
} else {
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/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);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2422 "RESTSupport.c"
+#line 2768 "RESTSupport.c"
}
}
default:
{
- SoupMessage* _tmp21_;
- guint _tmp22_;
- guint _tmp23_;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = message;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp23_ >= ((guint) 100)) {
-#line 2438 "RESTSupport.c"
+ guint _tmp18_;
+ guint _tmp19_;
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp18_, NULL);
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19_ = _tmp18_;
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp19_ >= ((guint) 100)) {
+#line 2781 "RESTSupport.c"
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ guint _tmp22_;
+ guint _tmp23_;
gchar* _tmp24_;
gchar* _tmp25_;
- SoupMessage* _tmp26_;
- guint _tmp27_;
- guint _tmp28_;
- SoupMessage* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- gchar* _tmp32_;
- GError* _tmp33_;
- GError* _tmp34_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp26_;
+ GError* _tmp27_;
+ GError* _tmp28_;
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp20_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp21_ = _tmp20_;
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp22_, NULL);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp23_ = _tmp22_;
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "reason-phrase", &_tmp24_, NULL);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = _tmp24_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp26_ = _tmp25_;
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp27_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp21_, _tmp23_, _tmp26_);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = _tmp27_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = message;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = _tmp31_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp25_, _tmp28_, _tmp32_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = _tmp33_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp32_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp25_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp34_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp26_);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp21_);
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp28_;
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2484 "RESTSupport.c"
+#line 2821 "RESTSupport.c"
} else {
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/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);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2492 "RESTSupport.c"
+#line 2829 "RESTSupport.c"
}
} else {
- gchar* _tmp35_;
- gchar* _tmp36_;
- SoupMessage* _tmp37_;
- guint _tmp38_;
- guint _tmp39_;
- GError* _tmp40_;
- GError* _tmp41_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _tmp35_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = message;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = _tmp38_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp36_, _tmp39_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = _tmp40_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp36_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp41_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ guint _tmp31_;
+ guint _tmp32_;
+ GError* _tmp33_;
+ GError* _tmp34_;
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp29_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp30_ = _tmp29_;
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (message, "status-code", &_tmp31_, NULL);
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp32_ = _tmp31_;
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp30_, _tmp32_);
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp34_ = _tmp33_;
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp30_);
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp34_;
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2526 "RESTSupport.c"
+#line 2860 "RESTSupport.c"
} else {
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/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);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2534 "RESTSupport.c"
+#line 2868 "RESTSupport.c"
}
}
}
}
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = message;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_->response_body;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = _tmp44_->data;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45__length1 = (gint) _tmp44_->length;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp45_ == NULL) {
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = TRUE;
-#line 2551 "RESTSupport.c"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp36_ = message->response_body;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp37_ = _tmp36_->data;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp37__length1 = (gint) _tmp36_->length;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp37_ == NULL) {
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp35_ = TRUE;
+#line 2883 "RESTSupport.c"
} else {
- SoupMessage* _tmp46_;
- SoupMessageBody* _tmp47_;
- guint8* _tmp48_;
- gint _tmp48__length1;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = message;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_->response_body;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = _tmp47_->data;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48__length1 = (gint) _tmp47_->length;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp48__length1 == 0;
-#line 2567 "RESTSupport.c"
+ SoupMessageBody* _tmp38_;
+ guint8* _tmp39_;
+ gint _tmp39__length1;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp38_ = message->response_body;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp39_ = _tmp38_->data;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp39__length1 = (gint) _tmp38_->length;
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp35_ = _tmp39__length1 == 0;
+#line 2896 "RESTSupport.c"
}
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp42_) {
-#line 2571 "RESTSupport.c"
- gchar* _tmp49_;
- gchar* _tmp50_;
- GError* _tmp51_;
- GError* _tmp52_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = _tmp49_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp51_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp50_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp52_ = _tmp51_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp50_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp52_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp35_) {
+#line 2900 "RESTSupport.c"
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ GError* _tmp42_;
+ GError* _tmp43_;
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp41_ = _tmp40_;
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp42_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp41_);
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp43_ = _tmp42_;
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp41_);
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp43_;
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2594 "RESTSupport.c"
+#line 2923 "RESTSupport.c"
} else {
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/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);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2602 "RESTSupport.c"
+#line 2931 "RESTSupport.c"
}
}
}
-static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length) {
+static PublishingRESTSupportArgument**
+_vala_array_dup1 (PublishingRESTSupportArgument** self,
+ int length)
+{
PublishingRESTSupportArgument** result;
int i;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2615 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/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"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2621 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
}
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2625 "RESTSupport.c"
+#line 2957 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
@@ -2641,35 +2976,38 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
gint _tmp1__length1;
PublishingRESTSupportArgument** _tmp2_;
gint _tmp2__length1;
-#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->arguments;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = _tmp0__length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = _tmp1__length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2655 "RESTSupport.c"
+#line 2990 "RESTSupport.c"
}
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2661 "RESTSupport.c"
+#line 2996 "RESTSupport.c"
}
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
+PublishingRESTSupportArgument**
+publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+ int* result_length1)
+{
PublishingRESTSupportArgument** result = NULL;
gint _tmp0_;
PublishingRESTSupportArgument** _tmp1_;
@@ -2681,60 +3019,67 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
gint _tmp5__length1;
PublishingRESTSupportArgument** _tmp6_;
gint _tmp6__length1;
-#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_arguments (self, &_tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = _tmp0_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_argument_sort (_tmp2_, _tmp0_, &_tmp3_);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5__length1 = _tmp3_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6__length1 = _tmp5__length1;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2701 "RESTSupport.c"
+#line 3039 "RESTSupport.c"
}
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2707 "RESTSupport.c"
+#line 3045 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
- gboolean _tmp0_;
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+ gboolean is_executed)
+{
+#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = is_executed;
-#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->is_executed = _tmp0_;
-#line 2719 "RESTSupport.c"
+#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->is_executed = is_executed;
+#line 3057 "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"
+static void
+_publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender,
+ SoupMessage* message,
+ gpointer self)
+{
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2726 "RESTSupport.c"
+#line 3068 "RESTSupport.c"
}
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error) {
+void
+publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
PublishingRESTSupportSession* _tmp0_;
SoupMessage* _tmp1_;
PublishingRESTSupportSession* _tmp2_;
@@ -2746,1123 +3091,1164 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
GError* _tmp8_;
GError* _tmp10_;
GError * _inner_error_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->parent_session;
-#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp0_, "wire-message-unqueued", (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp1_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->parent_session;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->message;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_send_wire_message (_tmp2_, _tmp3_);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->parent_session;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp5_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/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_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->message;
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp7_, NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->err;
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2774 "RESTSupport.c"
+#line 3119 "RESTSupport.c"
GError* _tmp9_;
-#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
-#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL], 0, _tmp9_);
-#line 2780 "RESTSupport.c"
+#line 3125 "RESTSupport.c"
} else {
-#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL], 0);
-#line 2784 "RESTSupport.c"
+#line 3129 "RESTSupport.c"
}
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2790 "RESTSupport.c"
+#line 3135 "RESTSupport.c"
GError* _tmp11_;
GError* _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = self->priv->err;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = _g_error_copy0 (_tmp11_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2805 "RESTSupport.c"
+#line 3150 "RESTSupport.c"
} else {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/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);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2813 "RESTSupport.c"
+#line 3158 "RESTSupport.c"
}
}
}
-PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self) {
+PublishingRESTSupportHttpMethod
+publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self)
+{
PublishingRESTSupportHttpMethod result = 0;
SoupMessage* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
PublishingRESTSupportHttpMethod _tmp4_;
- PublishingRESTSupportHttpMethod _tmp5_;
-#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp0_, "method", &_tmp1_, NULL);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp4_;
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2847 "RESTSupport.c"
+#line 3191 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
+static void
+publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
SoupMessage* _tmp0_;
SoupMessageHeaders* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_->request_headers;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = key;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 2870 "RESTSupport.c"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_headers_append (_tmp1_, key, value);
+#line 3212 "RESTSupport.c"
}
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+ const gchar* key,
+ const gchar* value)
+{
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 2879 "RESTSupport.c"
+#line 3225 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length) {
- PublishingRESTSupportHttpMethod _tmp0_;
- const gchar* _tmp1_;
- gulong _tmp2_ = 0UL;
- gulong _tmp3_;
+void
+publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+ const gchar* custom_payload,
+ const gchar* payload_content_type,
+ gulong payload_length)
+{
+ gulong _tmp0_ = 0UL;
gulong length = 0UL;
- SoupMessage* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- guint8* _tmp11_;
- gint _tmp11__length1;
- guint8* _tmp12_;
- gint _tmp12__length1;
- gulong _tmp13_;
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp3_;
+ guint8* _tmp4_;
+ gint _tmp4__length1;
+ guint8* _tmp5_;
+ gint _tmp5__length1;
+ gulong _tmp6_;
+#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (payload_content_type != NULL);
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = custom_payload;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == NULL) {
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_transaction_get_method (self) != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
+#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (custom_payload == NULL) {
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = FALSE;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2913 "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 2919 "RESTSupport.c"
- gulong _tmp4_;
-#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 2925 "RESTSupport.c"
+#line 3255 "RESTSupport.c"
+ }
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (payload_length > ((gulong) 0)) {
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = payload_length;
+#line 3261 "RESTSupport.c"
} else {
- const gchar* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = custom_payload;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = strlen (_tmp5_);
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gulong) _tmp7_;
-#line 2938 "RESTSupport.c"
- }
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- length = _tmp2_;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->message;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = payload_content_type;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = custom_payload;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = _tmp11_;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12__length1 = _tmp11__length1;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = length;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = strlen (custom_payload);
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = _tmp1_;
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = (gulong) _tmp2_;
+#line 3271 "RESTSupport.c"
+ }
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ length = _tmp0_;
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = self->priv->message;
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = string_get_data (custom_payload, &_tmp4__length1);
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp4_;
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5__length1 = _tmp4__length1;
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = length;
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_set_request (_tmp3_, payload_content_type, SOUP_MEMORY_COPY, _tmp5_ + 0, (gsize) (((gint) _tmp6_) - 0));
+#line 356 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = TRUE;
-#line 2960 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
+void
+publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+ SoupMessage* message)
+{
SoupMessage* _tmp0_;
- SoupMessage* _tmp1_;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = _g_object_ref0 (message);
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp1_;
-#line 2979 "RESTSupport.c"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->message = _tmp0_;
+#line 3308 "RESTSupport.c"
}
-gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
+gboolean
+publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->is_executed;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2994 "RESTSupport.c"
+#line 3325 "RESTSupport.c"
}
-guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self) {
+guint
+publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self)
+{
guint result = 0U;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
+ SoupMessage* _tmp0_;
+ guint _tmp1_;
guint _tmp2_;
- guint _tmp3_;
-#line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->message;
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = _tmp1_;
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp2_;
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3020 "RESTSupport.c"
+#line 3350 "RESTSupport.c"
}
-static void _vala_SoupURI_free (SoupURI* self) {
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_vala_SoupURI_free (SoupURI* self)
+{
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3027 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error) {
+static void
+publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
gboolean _tmp0_;
- PublishingRESTSupportHttpMethod _tmp1_;
gchar* formdata_string = NULL;
- gchar* _tmp3_;
+ gchar* _tmp2_;
gchar* old_url = NULL;
gchar* url_with_query = NULL;
- gboolean _tmp19_ = FALSE;
- PublishingRESTSupportHttpMethod _tmp20_;
+ gboolean _tmp18_ = FALSE;
GError * _inner_error_ = NULL;
-#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->use_custom_payload;
-#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 367 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3057 "RESTSupport.c"
+#line 3390 "RESTSupport.c"
} else {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/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);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3065 "RESTSupport.c"
+#line 3398 "RESTSupport.c"
}
}
-#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3070 "RESTSupport.c"
+#line 3403 "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 3076 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp2_;
- gint _tmp2__length1;
-#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = self->priv->arguments;
-#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 3085 "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 3091 "RESTSupport.c"
+#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (publishing_rest_support_transaction_get_method (self) == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
+#line 3407 "RESTSupport.c"
+ PublishingRESTSupportArgument** _tmp1_;
+ gint _tmp1__length1;
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = self->priv->arguments;
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1__length1 = self->priv->arguments_length1;
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (_tmp1__length1 > 0, "arguments.length > 0");
+#line 3416 "RESTSupport.c"
+ }
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = g_strdup ("");
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ formdata_string = _tmp2_;
+#line 3422 "RESTSupport.c"
{
gint i = 0;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 3096 "RESTSupport.c"
+#line 3427 "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"
+ gboolean _tmp3_ = FALSE;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = TRUE;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 3103 "RESTSupport.c"
- gint _tmp6_;
- PublishingRESTSupportArgument** _tmp7_;
- gint _tmp7__length1;
- const gchar* _tmp8_;
- PublishingRESTSupportArgument** _tmp9_;
- gint _tmp9__length1;
- gint _tmp10_;
- PublishingRESTSupportArgument* _tmp11_;
+#line 3434 "RESTSupport.c"
+ gint _tmp5_;
+ PublishingRESTSupportArgument** _tmp6_;
+ gint _tmp6__length1;
+ const gchar* _tmp7_;
+ PublishingRESTSupportArgument** _tmp8_;
+ gint _tmp8__length1;
+ gint _tmp9_;
+ PublishingRESTSupportArgument* _tmp10_;
+ gchar* _tmp11_;
gchar* _tmp12_;
gchar* _tmp13_;
- gchar* _tmp14_;
- gint _tmp15_;
- PublishingRESTSupportArgument** _tmp16_;
- gint _tmp16__length1;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 3120 "RESTSupport.c"
- gint _tmp5_;
-#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 3126 "RESTSupport.c"
+ gint _tmp14_;
+ PublishingRESTSupportArgument** _tmp15_;
+ gint _tmp15__length1;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!_tmp3_) {
+#line 3451 "RESTSupport.c"
+ gint _tmp4_;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = i;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ i = _tmp4_ + 1;
+#line 3457 "RESTSupport.c"
}
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = i;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->arguments;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__length1 = self->priv->arguments_length1;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp6_ < _tmp7__length1)) {
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = FALSE;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = i;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = self->priv->arguments;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6__length1 = self->priv->arguments_length1;
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!(_tmp5_ < _tmp6__length1)) {
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 3140 "RESTSupport.c"
+#line 3471 "RESTSupport.c"
}
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = formdata_string;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->arguments;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9__length1 = self->priv->arguments_length1;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = i;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp9_[_tmp10_];
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = publishing_rest_support_argument_to_string (_tmp11_);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = _tmp12_;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = formdata_string;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = self->priv->arguments;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8__length1 = self->priv->arguments_length1;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = i;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = _tmp8_[_tmp9_];
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = publishing_rest_support_argument_to_string (_tmp10_, FALSE);
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = _tmp11_;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp14_;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp13_);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = i;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = self->priv->arguments;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16__length1 = self->priv->arguments_length1;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3172 "RESTSupport.c"
- const gchar* _tmp17_;
- gchar* _tmp18_;
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = formdata_string;
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strconcat (_tmp17_, "&", NULL);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ formdata_string = _tmp13_;
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp12_);
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp14_ = i;
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15_ = self->priv->arguments;
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15__length1 = self->priv->arguments_length1;
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp14_ < (_tmp15__length1 - 1)) {
+#line 3503 "RESTSupport.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp16_ = formdata_string;
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp17_ = g_strconcat (_tmp16_, "&", NULL);
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp18_;
-#line 3183 "RESTSupport.c"
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ formdata_string = _tmp17_;
+#line 3514 "RESTSupport.c"
}
}
}
}
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old_url = NULL;
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
url_with_query = NULL;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 3196 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp21_;
- gint _tmp21__length1;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = self->priv->arguments;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21__length1 = self->priv->arguments_length1;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp21__length1 > 0;
-#line 3205 "RESTSupport.c"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (publishing_rest_support_transaction_get_method (self) == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
+#line 3525 "RESTSupport.c"
+ PublishingRESTSupportArgument** _tmp19_;
+ gint _tmp19__length1;
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19_ = self->priv->arguments;
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19__length1 = self->priv->arguments_length1;
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp18_ = _tmp19__length1 > 0;
+#line 3534 "RESTSupport.c"
} else {
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = FALSE;
-#line 3209 "RESTSupport.c"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp18_ = FALSE;
+#line 3538 "RESTSupport.c"
}
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp19_) {
-#line 3213 "RESTSupport.c"
- SoupMessage* _tmp22_;
- SoupURI* _tmp23_;
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp18_) {
+#line 3542 "RESTSupport.c"
+ SoupMessage* _tmp20_;
+ SoupURI* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
gchar* _tmp24_;
gchar* _tmp25_;
gchar* _tmp26_;
- gchar* _tmp27_;
+ const gchar* _tmp27_;
gchar* _tmp28_;
- const gchar* _tmp29_;
- gchar* _tmp30_;
- SoupMessage* _tmp31_;
- const gchar* _tmp32_;
- SoupURI* _tmp33_;
- SoupURI* _tmp34_;
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = self->priv->message;
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = soup_message_get_uri (_tmp22_);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp29_;
+ const gchar* _tmp30_;
+ SoupURI* _tmp31_;
+ SoupURI* _tmp32_;
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp20_ = self->priv->message;
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp21_ = soup_message_get_uri (_tmp20_);
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp22_ = soup_uri_to_string (_tmp21_, FALSE);
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- old_url = _tmp24_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ old_url = _tmp22_;
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp23_ = publishing_rest_support_transaction_get_endpoint_url (self);
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp24_ = _tmp23_;
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp25_ = g_strconcat (_tmp24_, "?", NULL);
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = _tmp25_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = g_strconcat (_tmp26_, "?", NULL);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = _tmp27_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = formdata_string;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp27_ = formdata_string;
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- url_with_query = _tmp30_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp28_);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ url_with_query = _tmp28_;
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = self->priv->message;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = url_with_query;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = soup_uri_new (_tmp32_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = _tmp33_;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp31_, _tmp34_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp34_);
-#line 3269 "RESTSupport.c"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp24_);
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp29_ = self->priv->message;
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp30_ = url_with_query;
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp31_ = soup_uri_new (_tmp30_);
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp32_ = _tmp31_;
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_set_uri (_tmp29_, _tmp32_);
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ __vala_SoupURI_free0 (_tmp32_);
+#line 3598 "RESTSupport.c"
} else {
- SoupMessage* _tmp35_;
- const gchar* _tmp36_;
- guint8* _tmp37_;
- gint _tmp37__length1;
- guint8* _tmp38_;
- gint _tmp38__length1;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = self->priv->message;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = formdata_string;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = _tmp37_;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 3289 "RESTSupport.c"
+ SoupMessage* _tmp33_;
+ const gchar* _tmp34_;
+ guint8* _tmp35_;
+ gint _tmp35__length1;
+ guint8* _tmp36_;
+ gint _tmp36__length1;
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp33_ = self->priv->message;
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp34_ = formdata_string;
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp35_ = string_get_data (_tmp34_, &_tmp35__length1);
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp36_ = _tmp35_;
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp36__length1 = _tmp35__length1;
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_set_request (_tmp33_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp36_, (gsize) _tmp36__length1);
+#line 3618 "RESTSupport.c"
}
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3293 "RESTSupport.c"
+#line 3622 "RESTSupport.c"
{
- SoupMessage* _tmp39_;
- SoupURI* _tmp40_;
- gchar* _tmp41_;
- gchar* _tmp42_;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->priv->message;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = soup_message_get_uri (_tmp39_);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp41_;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:402: sending message to URI = '%s'", _tmp42_);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp42_);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp37_;
+ SoupURI* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp37_ = self->priv->message;
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp38_ = soup_message_get_uri (_tmp37_);
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp39_ = soup_uri_to_string (_tmp38_, FALSE);
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp40_ = _tmp39_;
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp40_);
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp40_);
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3315 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
goto __finally1;
}
}
__finally1:
{
- const gchar* _tmp43_;
-#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = old_url;
-#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp43_ != NULL) {
-#line 3326 "RESTSupport.c"
- SoupMessage* _tmp44_;
- const gchar* _tmp45_;
- SoupURI* _tmp46_;
- SoupURI* _tmp47_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = self->priv->message;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = old_url;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = soup_uri_new (_tmp45_);
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp44_, _tmp47_);
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp47_);
-#line 3343 "RESTSupport.c"
+ const gchar* _tmp41_;
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp41_ = old_url;
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp41_ != NULL) {
+#line 3655 "RESTSupport.c"
+ SoupMessage* _tmp42_;
+ const gchar* _tmp43_;
+ SoupURI* _tmp44_;
+ SoupURI* _tmp45_;
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp42_ = self->priv->message;
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp43_ = old_url;
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp44_ = soup_uri_new (_tmp43_);
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp45_ = _tmp44_;
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_set_uri (_tmp42_, _tmp45_);
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ __vala_SoupURI_free0 (_tmp45_);
+#line 3672 "RESTSupport.c"
}
}
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3360 "RESTSupport.c"
+#line 3689 "RESTSupport.c"
} else {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/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);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3374 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
}
}
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3383 "RESTSupport.c"
+#line 3712 "RESTSupport.c"
}
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+ GError** error)
+{
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3392 "RESTSupport.c"
+#line 3724 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self) {
+gchar*
+publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self)
+{
gchar* result = NULL;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
- SoupMessageBody* _tmp2_;
- guint8* _tmp3_;
- gint _tmp3__length1;
- gchar* _tmp4_;
-#line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp0_;
+ SoupMessageBody* _tmp1_;
+ guint8* _tmp2_;
+ gint _tmp2__length1;
+ gchar* _tmp3_;
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_body;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_->data;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3__length1 = (gint) _tmp2_->length;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp4_;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->message;
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_->response_body;
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = _tmp1_->data;
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2__length1 = (gint) _tmp1_->length;
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = g_strdup ((const gchar*) _tmp2_);
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp3_;
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3424 "RESTSupport.c"
+#line 3755 "RESTSupport.c"
}
-SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self) {
+SoupMessageHeaders*
+publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self)
+{
SoupMessageHeaders* result = NULL;
- gboolean _tmp0_;
- SoupMessage* _tmp1_;
- SoupMessageHeaders* _tmp2_;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SoupMessage* _tmp0_;
+ SoupMessageHeaders* _tmp1_;
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_headers;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->message;
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_->response_headers;
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp1_;
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3447 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
}
-SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self) {
+SoupMessage*
+publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self)
+{
SoupMessage* result = NULL;
- gboolean _tmp0_;
+ SoupMessage* _tmp0_;
SoupMessage* _tmp1_;
- SoupMessage* _tmp2_;
-#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->message;
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp1_;
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3470 "RESTSupport.c"
+#line 3799 "RESTSupport.c"
}
-static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_vala_array_add1 (PublishingRESTSupportArgument** * array,
+ int* length,
+ int* size,
+ PublishingRESTSupportArgument* value)
+{
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((*length) == (*size)) {
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3481 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
}
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3487 "RESTSupport.c"
+#line 3821 "RESTSupport.c"
}
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value) {
+void
+publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+ const gchar* name,
+ const gchar* value)
+{
PublishingRESTSupportArgument** _tmp0_;
gint _tmp0__length1;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
- PublishingRESTSupportArgument* _tmp3_;
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ PublishingRESTSupportArgument* _tmp1_;
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (name != NULL);
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->arguments;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = name;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 3515 "RESTSupport.c"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = publishing_rest_support_argument_new (name, value);
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp1_);
+#line 3847 "RESTSupport.c"
}
-gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self) {
+gchar*
+publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self)
+{
gchar* result = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_;
-#line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->endpoint_url;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3529 "RESTSupport.c"
+#line 3863 "RESTSupport.c"
const gchar* _tmp2_;
gchar* _tmp3_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->endpoint_url;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp0_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3540 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_;
gchar* _tmp5_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->parent_session;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_session_get_endpoint_url (_tmp4_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp0_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3552 "RESTSupport.c"
+#line 3886 "RESTSupport.c"
}
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3558 "RESTSupport.c"
+#line 3892 "RESTSupport.c"
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+_publishing_rest_support_session_ref0 (gpointer self)
+{
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3565 "RESTSupport.c"
+#line 3901 "RESTSupport.c"
}
-PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self) {
+PublishingRESTSupportSession*
+publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self)
+{
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRESTSupportSession* _tmp1_;
-#line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->parent_session;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3583 "RESTSupport.c"
+#line 3921 "RESTSupport.c"
}
-static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure * cc;
register gpointer data1;
register gpointer data2;
cc = (GCClosure *) closure;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (n_param_values == 3);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = closure->data;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3602 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3608 "RESTSupport.c"
+#line 3953 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/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 3614 "RESTSupport.c"
+#line 3959 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_init (GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_transaction_init (GValue* value)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3621 "RESTSupport.c"
+#line 3968 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_free_value (GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_transaction_free_value (GValue* value)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3630 "RESTSupport.c"
+#line 3979 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_transaction_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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 3640 "RESTSupport.c"
+#line 3992 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3644 "RESTSupport.c"
+#line 3996 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+publishing_rest_support_value_transaction_peek_pointer (const GValue* value)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3652 "RESTSupport.c"
+#line 4006 "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"
+static gchar*
+publishing_rest_support_value_transaction_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 3659 "RESTSupport.c"
+#line 4018 "RESTSupport.c"
PublishingRESTSupportTransaction * object;
object = collect_values[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/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 3666 "RESTSupport.c"
+#line 4025 "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"
+#line 158 "/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 3670 "RESTSupport.c"
+#line 4029 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3674 "RESTSupport.c"
+#line 4033 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3678 "RESTSupport.c"
+#line 4037 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3682 "RESTSupport.c"
+#line 4041 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_transaction_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportTransaction ** object_p;
object_p = collect_values[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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 3693 "RESTSupport.c"
+#line 4057 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3699 "RESTSupport.c"
+#line 4063 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3703 "RESTSupport.c"
+#line 4067 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3707 "RESTSupport.c"
+#line 4071 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3711 "RESTSupport.c"
+#line 4075 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_transaction (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecTransaction* spec;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3725 "RESTSupport.c"
+#line 4095 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gpointer
+publishing_rest_support_value_get_transaction (const GValue* value)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3734 "RESTSupport.c"
+#line 4106 "RESTSupport.c"
}
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_transaction (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportTransaction * old;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3754 "RESTSupport.c"
+#line 4129 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3758 "RESTSupport.c"
+#line 4133 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3764 "RESTSupport.c"
+#line 4139 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_transaction (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportTransaction * old;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3783 "RESTSupport.c"
+#line 4161 "RESTSupport.c"
} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3787 "RESTSupport.c"
+#line 4165 "RESTSupport.c"
}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3793 "RESTSupport.c"
+#line 4171 "RESTSupport.c"
}
}
-static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_transaction_finalize;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_transaction_real_execute;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL] = g_signal_new ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL] = 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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL] = 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 3815 "RESTSupport.c"
+#line 4195 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self)
+{
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE (self);
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = FALSE;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->parent_session = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = NULL;
-#line 149 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->bytes_written = 0;
-#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->err = NULL;
-#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->endpoint_url = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 3836 "RESTSupport.c"
+#line 4218 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRESTSupportTransaction * self;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->arguments = (_vala_array_free (self->priv->arguments, self->priv->arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
-#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 3854 "RESTSupport.c"
+#line 4238 "RESTSupport.c"
}
-GType publishing_rest_support_transaction_get_type (void) {
+GType
+publishing_rest_support_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_transaction_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_transaction_init, publishing_rest_support_value_transaction_free_value, publishing_rest_support_value_transaction_copy_value, publishing_rest_support_value_transaction_peek_pointer, "p", publishing_rest_support_value_transaction_collect_value, "p", publishing_rest_support_value_transaction_lcopy_value };
@@ -3876,235 +4262,223 @@ GType publishing_rest_support_transaction_get_type (void) {
}
-gpointer publishing_rest_support_transaction_ref (gpointer instance) {
+gpointer
+publishing_rest_support_transaction_ref (gpointer instance)
+{
PublishingRESTSupportTransaction * self;
self = instance;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 3879 "RESTSupport.c"
+#line 4267 "RESTSupport.c"
}
-void publishing_rest_support_transaction_unref (gpointer instance) {
+void
+publishing_rest_support_transaction_unref (gpointer instance)
+{
PublishingRESTSupportTransaction * self;
self = instance;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3892 "RESTSupport.c"
+#line 4282 "RESTSupport.c"
}
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable)
+{
PublishingRESTSupportUploadTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- SpitPublishingPublishable* _tmp1_;
- SpitPublishingPublishable* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- SpitPublishingPublisherMediaType _tmp4_;
- gchar* _tmp5_;
- GHashTable* _tmp6_;
- GeeHashMap* _tmp7_;
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SpitPublishingPublishable* _tmp0_;
+ gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GeeHashMap* _tmp3_;
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishable;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, session, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = _g_object_ref0 (publishable);
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp2_;
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishable;
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->publishable = _tmp0_;
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (spit_publishing_publishable_get_media_type (publishable));
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp5_;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->mime_type = _tmp1_;
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp6_;
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->binary_disposition_table = _tmp2_;
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp7_;
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->message_headers = _tmp3_;
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 3947 "RESTSupport.c"
+#line 4329 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable)
+{
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 3954 "RESTSupport.c"
+#line 4339 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url)
+{
PublishingRESTSupportUploadTransaction* self = NULL;
- PublishingRESTSupportSession* _tmp0_;
- const gchar* _tmp1_;
- SpitPublishingPublishable* _tmp2_;
- SpitPublishingPublishable* _tmp3_;
- SpitPublishingPublishable* _tmp4_;
- SpitPublishingPublisherMediaType _tmp5_;
- gchar* _tmp6_;
- GHashTable* _tmp7_;
- GeeHashMap* _tmp8_;
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SpitPublishingPublishable* _tmp0_;
+ gchar* _tmp1_;
+ GHashTable* _tmp2_;
+ GeeHashMap* _tmp3_;
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = publishable;
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, session, endpoint_url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = _g_object_ref0 (publishable);
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp3_;
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishable;
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->publishable = _tmp0_;
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (spit_publishing_publishable_get_media_type (publishable));
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp6_;
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->mime_type = _tmp1_;
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->binary_disposition_table = _tmp2_;
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp8_;
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->message_headers = _tmp3_;
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4013 "RESTSupport.c"
+#line 4388 "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"
+PublishingRESTSupportUploadTransaction*
+publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+ SpitPublishingPublishable* publishable,
+ const gchar* endpoint_url)
+{
+#line 470 "/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 4020 "RESTSupport.c"
+#line 4399 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value) {
+static void
+publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base,
+ const gchar* key,
+ const gchar* value)
+{
PublishingRESTSupportUploadTransaction * self;
GeeHashMap* _tmp0_;
- const gchar* _tmp1_;
- const gchar* _tmp2_;
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->message_headers;
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = key;
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 4043 "RESTSupport.c"
+#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, value);
+#line 4420 "RESTSupport.c"
}
-static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
+static gchar*
+publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type)
+{
gchar* result = NULL;
- SpitPublishingPublisherMediaType _tmp0_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = media_type;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4054 "RESTSupport.c"
- gchar* _tmp1_;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup ("image/jpeg");
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp1_;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 4430 "RESTSupport.c"
+ gchar* _tmp0_;
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = g_strdup ("image/jpeg");
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp0_;
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4062 "RESTSupport.c"
+#line 4438 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp2_;
-#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 4069 "RESTSupport.c"
- gchar* _tmp3_;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup ("video/mpeg");
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (media_type == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4442 "RESTSupport.c"
+ gchar* _tmp1_;
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = g_strdup ("video/mpeg");
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp1_;
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4077 "RESTSupport.c"
+#line 4450 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp4_;
- GEnumValue* _tmp5_;
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = media_type;
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 4087 "RESTSupport.c"
+ GEnumValue* _tmp2_;
+#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), media_type);
+#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_error ("RESTSupport.vala:491: UploadTransaction: unknown media type %s.", (_tmp2_ != NULL) ? _tmp2_->value_name : NULL);
+#line 4457 "RESTSupport.c"
}
}
}
-static void _g_free0_ (gpointer var) {
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_g_free0_ (gpointer var)
+{
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 4096 "RESTSupport.c"
+#line 4468 "RESTSupport.c"
}
-static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self) {
+static GHashTable*
+publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self)
+{
GHashTable* result = NULL;
GHashTable* _result_ = NULL;
GHashFunc _tmp0_;
@@ -4117,85 +4491,94 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
-#line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_str_hash;
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_str_equal;
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, _g_free0_);
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_result_ = _tmp2_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("filename");
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->publishable;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = g_file_get_basename (_tmp6_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp7_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hash_table_insert (_result_, _tmp3_, _tmp9_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp8_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_tmp6_);
-#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _result_;
-#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4147 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+_g_hash_table_ref0 (gpointer self)
+{
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 4154 "RESTSupport.c"
+#line 4530 "RESTSupport.c"
}
-void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
+void
+publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self,
+ GHashTable* new_disp_table)
+{
GHashTable* _tmp0_;
- GHashTable* _tmp1_;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (new_disp_table != NULL);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = new_disp_table;
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_hash_table_ref0 (_tmp0_);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = _g_hash_table_ref0 (new_disp_table);
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp1_;
-#line 4173 "RESTSupport.c"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->binary_disposition_table = _tmp0_;
+#line 4549 "RESTSupport.c"
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_vala_SoupMultipart_free (SoupMultipart* self)
+{
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4180 "RESTSupport.c"
+#line 4558 "RESTSupport.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_vala_SoupBuffer_free (SoupBuffer* self)
+{
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4187 "RESTSupport.c"
+#line 4567 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+static void
+publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base,
+ GError** error)
+{
PublishingRESTSupportUploadTransaction * self;
PublishingRESTSupportArgument** request_arguments = NULL;
gint _tmp0_;
@@ -4212,110 +4595,108 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gsize payload_length = 0UL;
gint payload_part_num = 0;
SoupMultipart* _tmp19_;
- gint _tmp20_;
SoupBuffer* bindable_data = NULL;
- const gchar* _tmp21_;
+ const gchar* _tmp20_;
+ guint8* _tmp21_;
+ gint _tmp21__length1;
guint8* _tmp22_;
gint _tmp22__length1;
- guint8* _tmp23_;
- gint _tmp23__length1;
- gsize _tmp24_;
- SoupBuffer* _tmp25_;
- SoupMultipart* _tmp26_;
- SpitPublishingPublishable* _tmp27_;
+ gsize _tmp23_;
+ SoupBuffer* _tmp24_;
+ SoupMultipart* _tmp25_;
+ SpitPublishingPublishable* _tmp26_;
+ GFile* _tmp27_;
GFile* _tmp28_;
- GFile* _tmp29_;
+ gchar* _tmp29_;
gchar* _tmp30_;
- gchar* _tmp31_;
- const gchar* _tmp32_;
- SoupBuffer* _tmp33_;
+ const gchar* _tmp31_;
+ SoupBuffer* _tmp32_;
SoupMessageHeaders* image_part_header = NULL;
SoupBuffer* image_part_body = NULL;
- SoupMultipart* _tmp34_;
- gint _tmp35_;
- SoupMessageHeaders* _tmp36_ = NULL;
- SoupBuffer* _tmp37_ = NULL;
- SoupMessageHeaders* _tmp38_;
- GHashTable* _tmp39_;
+ SoupMultipart* _tmp33_;
+ gint _tmp34_;
+ SoupMessageHeaders* _tmp35_ = NULL;
+ SoupBuffer* _tmp36_ = NULL;
+ SoupMessageHeaders* _tmp37_;
+ GHashTable* _tmp38_;
SoupMessage* outbound_message = NULL;
+ gchar* _tmp39_;
gchar* _tmp40_;
- gchar* _tmp41_;
- SoupMultipart* _tmp42_;
+ SoupMultipart* _tmp41_;
+ SoupMessage* _tmp42_;
SoupMessage* _tmp43_;
- SoupMessage* _tmp44_;
GeeMapIterator* i = NULL;
- GeeHashMap* _tmp45_;
- GeeMapIterator* _tmp46_;
+ GeeHashMap* _tmp44_;
+ GeeMapIterator* _tmp45_;
gboolean cont = FALSE;
- GeeMapIterator* _tmp47_;
- gboolean _tmp48_;
- SoupMessage* _tmp60_;
+ GeeMapIterator* _tmp46_;
+ SoupMessage* _tmp57_;
GError * _inner_error_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = _tmp1_;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments_length1 = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_request_arguments_size_ = request_arguments_length1;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = request_arguments;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = request_arguments_length1;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2__length1 > 0, "request_arguments.length > 0");
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = soup_multipart_new ("multipart/form-data");
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
message_parts = _tmp3_;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = request_arguments;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4271 "RESTSupport.c"
+#line 4652 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection = _tmp4_;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection_length1 = _tmp4__length1;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4283 "RESTSupport.c"
+#line 4664 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_;
PublishingRESTSupportArgument* arg = NULL;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/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"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4290 "RESTSupport.c"
+#line 4671 "RESTSupport.c"
{
SoupMultipart* _tmp6_;
PublishingRESTSupportArgument* _tmp7_;
const gchar* _tmp8_;
PublishingRESTSupportArgument* _tmp9_;
const gchar* _tmp10_;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = message_parts;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = arg;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp7_->key;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = arg;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = _tmp9_->value;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4311 "RESTSupport.c"
+#line 4692 "RESTSupport.c"
}
}
}
@@ -4327,48 +4708,48 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gchar* _tmp15_;
gchar* _tmp16_ = NULL;
gsize _tmp17_ = 0UL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = self->publishable;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = spit_publishing_publishable_get_serialized_file (_tmp11_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = _tmp12_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = g_file_get_path (_tmp13_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = _tmp14_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_file_get_contents (_tmp15_, &_tmp16_, &_tmp17_, &_inner_error_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
payload = _tmp16_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
payload_length = _tmp17_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp15_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_tmp13_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4349 "RESTSupport.c"
+#line 4730 "RESTSupport.c"
goto __catch2_g_file_error;
}
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/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 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4364 "RESTSupport.c"
+#line 4745 "RESTSupport.c"
}
}
goto __finally2;
@@ -4376,297 +4757,298 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
{
GError* e = NULL;
GError* _tmp18_;
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
e = _inner_error_;
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp18_;
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4382 "RESTSupport.c"
+#line 4763 "RESTSupport.c"
goto __finally2;
}
__finally2:
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4400 "RESTSupport.c"
+#line 4781 "RESTSupport.c"
} else {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4414 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
}
}
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = message_parts;
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = soup_multipart_get_length (_tmp19_);
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- payload_part_num = _tmp20_;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = payload;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23__length1 = _tmp22__length1;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = payload_length;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- bindable_data = _tmp25_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message_parts;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = self->publishable;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_file_get_path (_tmp29_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = self->mime_type;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = bindable_data;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp31_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (_tmp29_);
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = message_parts;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = payload_part_num;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_);
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_header = _tmp36_;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_body = _tmp37_;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = image_part_header;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->binary_disposition_table;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = _tmp40_;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = message_parts;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp41_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- outbound_message = _tmp44_;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = self->message_headers;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- i = _tmp46_;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = i;
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = gee_map_iterator_next (_tmp47_);
+ _tmp19_ = message_parts;
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp48_;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- while (TRUE) {
-#line 4503 "RESTSupport.c"
- gboolean _tmp49_;
- SoupMessage* _tmp50_;
- SoupMessageHeaders* _tmp51_;
- GeeMapIterator* _tmp52_;
- gpointer _tmp53_;
- gchar* _tmp54_;
- GeeMapIterator* _tmp55_;
- gpointer _tmp56_;
- gchar* _tmp57_;
- GeeMapIterator* _tmp58_;
- gboolean _tmp59_;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp49_ = cont;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp49_) {
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- break;
-#line 4521 "RESTSupport.c"
- }
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = outbound_message;
+ payload_part_num = soup_multipart_get_length (_tmp19_);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp51_ = _tmp50_->request_headers;
+ _tmp20_ = payload;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp52_ = i;
+ _tmp21_ = string_get_data (_tmp20_, &_tmp21__length1);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp53_ = gee_map_iterator_get_key (_tmp52_);
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp54_ = (gchar*) _tmp53_;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp55_ = i;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp56_ = gee_map_iterator_get_value (_tmp55_);
+ _tmp22_ = _tmp21_;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp57_ = (gchar*) _tmp56_;
+ _tmp22__length1 = _tmp21__length1;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_);
+ _tmp23_ = payload_length;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp57_);
+ _tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp22_ + 0, ((gint) _tmp23_) - 0);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp54_);
+ bindable_data = _tmp24_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp58_ = i;
+ _tmp25_ = message_parts;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp59_ = gee_map_iterator_next (_tmp58_);
+ _tmp26_ = self->publishable;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp59_;
-#line 4551 "RESTSupport.c"
- }
-#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp60_ = outbound_message;
-#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp60_);
-#line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
+ _tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp28_ = _tmp27_;
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp29_ = g_file_get_path (_tmp28_);
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp30_ = _tmp29_;
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp31_ = self->mime_type;
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp32_ = bindable_data;
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_multipart_append_form_file (_tmp25_, "", _tmp30_, _tmp31_, _tmp32_);
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp30_);
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (_tmp28_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+ _tmp33_ = message_parts;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
+ _tmp34_ = payload_part_num;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+ soup_multipart_get_part (_tmp33_, _tmp34_, &_tmp35_, &_tmp36_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_propagate_error (error, _inner_error_);
+ image_part_header = _tmp35_;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ image_part_body = _tmp36_;
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp37_ = image_part_header;
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp38_ = self->binary_disposition_table;
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_headers_set_content_disposition (_tmp37_, "form-data", _tmp38_);
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp39_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp40_ = _tmp39_;
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp41_ = message_parts;
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp42_ = soup_form_request_new_from_multipart (_tmp40_, _tmp41_);
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp43_ = _tmp42_;
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp40_);
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ outbound_message = _tmp43_;
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp44_ = self->message_headers;
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp45_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ i = _tmp45_;
+#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp46_ = i;
+#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ cont = gee_map_iterator_next (_tmp46_);
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ while (TRUE) {
+#line 4880 "RESTSupport.c"
+ gboolean _tmp47_;
+ SoupMessage* _tmp48_;
+ SoupMessageHeaders* _tmp49_;
+ GeeMapIterator* _tmp50_;
+ gpointer _tmp51_;
+ gchar* _tmp52_;
+ GeeMapIterator* _tmp53_;
+ gpointer _tmp54_;
+ gchar* _tmp55_;
+ GeeMapIterator* _tmp56_;
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp47_ = cont;
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!_tmp47_) {
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ break;
+#line 4897 "RESTSupport.c"
+ }
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp48_ = outbound_message;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp49_ = _tmp48_->request_headers;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp50_ = i;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp51_ = gee_map_iterator_get_key (_tmp50_);
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp52_ = (gchar*) _tmp51_;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp53_ = i;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp54_ = gee_map_iterator_get_value (_tmp53_);
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp55_ = (gchar*) _tmp54_;
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_headers_append (_tmp49_, _tmp52_, _tmp55_);
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp55_);
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp52_);
+#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp56_ = i;
+#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ cont = gee_map_iterator_next (_tmp56_);
+#line 4925 "RESTSupport.c"
+ }
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp57_ = outbound_message;
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp57_);
+#line 549 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_propagate_error (error, _inner_error_);
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4581 "RESTSupport.c"
+#line 4955 "RESTSupport.c"
} else {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4601 "RESTSupport.c"
+#line 4975 "RESTSupport.c"
}
}
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/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 4616 "RESTSupport.c"
+#line 4990 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass)
+{
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute;
-#line 4629 "RESTSupport.c"
+#line 5005 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
-#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self)
+{
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = NULL;
-#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4640 "RESTSupport.c"
+#line 5018 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+static void
+publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj)
+{
PublishingRESTSupportUploadTransaction * self;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4658 "RESTSupport.c"
+#line 5038 "RESTSupport.c"
}
-GType publishing_rest_support_upload_transaction_get_type (void) {
+GType
+publishing_rest_support_upload_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_upload_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_upload_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportUploadTransaction), 0, (GInstanceInitFunc) publishing_rest_support_upload_transaction_instance_init, NULL };
@@ -4678,439 +5060,315 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
}
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
+static PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_construct (GType object_type,
+ xmlDoc* doc)
+{
PublishingRESTSupportXmlDocument* self = NULL;
- xmlDoc* _tmp0_;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = doc;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->document = _tmp0_;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->document = doc;
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4685 "RESTSupport.c"
+#line 5067 "RESTSupport.c"
}
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_new (xmlDoc* doc)
+{
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4692 "RESTSupport.c"
+#line 5076 "RESTSupport.c"
}
-xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self) {
+xmlNode*
+publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self)
+{
xmlNode* result = NULL;
xmlDoc* _tmp0_;
xmlNode* _tmp1_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->document;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = xmlDocGetRootElement (_tmp0_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4710 "RESTSupport.c"
+#line 5096 "RESTSupport.c"
}
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error) {
+xmlNode*
+publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+ xmlNode* parent,
+ const gchar* child_name,
+ GError** error)
+{
xmlNode* result = NULL;
xmlNode* doc_node_iter = NULL;
xmlNode* _tmp0_;
- xmlNode* _tmp1_;
- const gchar* _tmp10_;
- GError* _tmp11_;
+ GError* _tmp8_;
GError * _inner_error_ = NULL;
-#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (child_name != NULL, NULL);
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent;
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _tmp0_->children;
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp1_;
-#line 4732 "RESTSupport.c"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = parent->children;
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ doc_node_iter = _tmp0_;
+#line 5119 "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"
+ gboolean _tmp1_ = FALSE;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = TRUE;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4739 "RESTSupport.c"
+#line 5126 "RESTSupport.c"
+ xmlNode* _tmp4_;
xmlNode* _tmp5_;
- xmlNode* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp2_) {
-#line 4746 "RESTSupport.c"
+ const gchar* _tmp6_;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!_tmp1_) {
+#line 5132 "RESTSupport.c"
+ xmlNode* _tmp2_;
xmlNode* _tmp3_;
- xmlNode* _tmp4_;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = doc_node_iter;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->next;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp4_;
-#line 4755 "RESTSupport.c"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = doc_node_iter;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = _tmp2_->next;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ doc_node_iter = _tmp3_;
+#line 5141 "RESTSupport.c"
}
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = FALSE;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = doc_node_iter;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp5_ != NULL)) {
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = FALSE;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = doc_node_iter;
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!(_tmp4_ != NULL)) {
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4765 "RESTSupport.c"
+#line 5151 "RESTSupport.c"
}
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = doc_node_iter;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_->name;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = child_name;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4775 "RESTSupport.c"
- xmlNode* _tmp9_;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = doc_node_iter;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp9_;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = doc_node_iter;
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = _tmp5_->name;
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (g_strcmp0 (_tmp6_, child_name) == 0) {
+#line 5159 "RESTSupport.c"
+ xmlNode* _tmp7_;
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = doc_node_iter;
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp7_;
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4783 "RESTSupport.c"
+#line 5167 "RESTSupport.c"
}
}
}
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = child_name;
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp11_;
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", child_name);
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp8_;
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4799 "RESTSupport.c"
+#line 5181 "RESTSupport.c"
} else {
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/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);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4807 "RESTSupport.c"
+#line 5189 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error) {
+gchar*
+publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+ xmlNode* node,
+ const gchar* property_key,
+ GError** error)
+{
gchar* result = NULL;
gchar* value_string = NULL;
- xmlNode* _tmp0_;
+ gchar* _tmp0_;
const gchar* _tmp1_;
- gchar* _tmp2_;
- const gchar* _tmp3_;
GError * _inner_error_ = NULL;
-#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (property_key != NULL, NULL);
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = node;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = property_key;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- value_string = _tmp2_;
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value_string;
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_ == NULL) {
-#line 4836 "RESTSupport.c"
- const gchar* _tmp4_;
- xmlNode* _tmp5_;
- const gchar* _tmp6_;
- GError* _tmp7_;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = property_key;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = node;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->name;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", _tmp4_, _tmp6_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp7_;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = (gchar*) xmlGetProp (node, (xmlChar*) property_key);
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ value_string = _tmp0_;
+#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = value_string;
+#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp1_ == NULL) {
+#line 5217 "RESTSupport.c"
+ const gchar* _tmp2_;
+ GError* _tmp3_;
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = node->name;
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", property_key, _tmp2_);
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp3_;
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4859 "RESTSupport.c"
+#line 5234 "RESTSupport.c"
} else {
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#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);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4869 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
}
}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4876 "RESTSupport.c"
+#line 5251 "RESTSupport.c"
}
-static gchar* string_chug (const gchar* self) {
+static gchar*
+string_chug (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strchug (_tmp1_);
-#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4899 "RESTSupport.c"
+#line 5276 "RESTSupport.c"
}
-static gchar* string_chomp (const gchar* self) {
+static gchar*
+string_chomp (const gchar* self)
+{
gchar* result = NULL;
gchar* _result_ = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
-#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_strchomp (_tmp1_);
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = _result_;
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 4922 "RESTSupport.c"
+#line 5301 "RESTSupport.c"
}
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error) {
+PublishingRESTSupportXmlDocument*
+publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+ PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+ void* check_for_error_response_target,
+ GError** error)
+{
PublishingRESTSupportXmlDocument* result = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
- gboolean _tmp6_ = FALSE;
- const gchar* _tmp7_;
+ gboolean _tmp4_ = FALSE;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- gchar* _tmp11_;
- gboolean _tmp12_;
- gboolean _tmp13_;
+ gboolean _tmp9_;
xmlDoc* doc = NULL;
- const gchar* _tmp21_;
- const gchar* _tmp22_;
- gint _tmp23_;
- gint _tmp24_;
- xmlDoc* _tmp25_;
- xmlDoc* _tmp26_;
- xmlDoc* _tmp28_;
- xmlNode* _tmp29_;
+ gint _tmp15_;
+ gint _tmp16_;
+ xmlDoc* _tmp17_;
+ xmlDoc* _tmp18_;
+ xmlDoc* _tmp20_;
+ xmlNode* _tmp21_;
PublishingRESTSupportXmlDocument* rest_doc = NULL;
- xmlDoc* _tmp31_;
- PublishingRESTSupportXmlDocument* _tmp32_;
+ xmlDoc* _tmp23_;
+ PublishingRESTSupportXmlDocument* _tmp24_;
gchar* _result_ = NULL;
- PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_;
- void* _tmp33__target;
- PublishingRESTSupportXmlDocument* _tmp34_;
- gchar* _tmp35_;
- const gchar* _tmp36_;
+ PublishingRESTSupportXmlDocument* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
GError * _inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = input_string;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == NULL) {
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (input_string == NULL) {
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 4963 "RESTSupport.c"
+#line 5338 "RESTSupport.c"
} else {
- const gchar* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = input_string;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = strlen (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = _tmp4_ == 0;
-#line 4976 "RESTSupport.c"
- }
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_) {
-#line 4980 "RESTSupport.c"
- GError* _tmp5_;
-#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");
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp5_;
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_propagate_error (error, _inner_error_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return NULL;
-#line 4992 "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);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_clear_error (&_inner_error_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return NULL;
-#line 5000 "RESTSupport.c"
- }
- }
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = input_string;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_chug (_tmp7_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_chomp (_tmp9_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = g_str_has_prefix (_tmp11_, "<");
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = !_tmp12_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp13_) {
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = TRUE;
-#line 5025 "RESTSupport.c"
- } else {
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- gboolean _tmp19_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = input_string;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = string_chug (_tmp14_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = _tmp15_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = string_chomp (_tmp16_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = g_str_has_suffix (_tmp18_, ">");
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = !_tmp19_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp16_);
-#line 5051 "RESTSupport.c"
- }
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5055 "RESTSupport.c"
- GError* _tmp20_;
-#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");
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp20_;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_propagate_error (error, _inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return NULL;
-#line 5067 "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);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_clear_error (&_inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return NULL;
-#line 5075 "RESTSupport.c"
- }
- }
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = input_string;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = input_string;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = strlen (_tmp22_);
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = _tmp23_;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc = _tmp25_;
+ gint _tmp1_;
+ gint _tmp2_;
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = strlen (input_string);
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = doc;
+ _tmp2_ = _tmp1_;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp26_ == NULL) {
-#line 5094 "RESTSupport.c"
- GError* _tmp27_;
+ _tmp0_ = _tmp2_ == 0;
+#line 5348 "RESTSupport.c"
+ }
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp0_) {
+#line 5352 "RESTSupport.c"
+ GError* _tmp3_;
#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");
+ _tmp3_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp27_;
+ _inner_error_ = _tmp3_;
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5106 "RESTSupport.c"
+#line 5364 "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);
@@ -5118,28 +5376,64 @@ 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 5114 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
}
}
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = doc;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_->children;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp29_ == NULL) {
-#line 5123 "RESTSupport.c"
- GError* _tmp30_;
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = string_chug (input_string);
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = _tmp5_;
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = string_chomp (_tmp6_);
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = _tmp7_;
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = !g_str_has_prefix (_tmp8_, "<");
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp8_);
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp6_);
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp9_) {
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = TRUE;
+#line 5393 "RESTSupport.c"
+ } else {
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = string_chug (input_string);
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = _tmp10_;
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = string_chomp (_tmp11_);
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = _tmp12_;
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = !g_str_has_suffix (_tmp13_, ">");
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp13_);
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp11_);
+#line 5413 "RESTSupport.c"
+ }
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp4_) {
+#line 5417 "RESTSupport.c"
+ GError* _tmp14_;
#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");
+ _tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp30_;
+ _inner_error_ = _tmp14_;
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5135 "RESTSupport.c"
+#line 5429 "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);
@@ -5147,289 +5441,390 @@ 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 5143 "RESTSupport.c"
+#line 5437 "RESTSupport.c"
}
}
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = doc;
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- rest_doc = _tmp32_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = check_for_error_response;
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33__target = check_for_error_response_target;
+ _tmp15_ = strlen (input_string);
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = rest_doc;
+ _tmp16_ = _tmp15_;
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
+ _tmp17_ = xmlReadMemory (input_string, (gint) _tmp16_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _result_ = _tmp35_;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _result_;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp36_ != NULL) {
-#line 5166 "RESTSupport.c"
- const gchar* _tmp37_;
- GError* _tmp38_;
+ doc = _tmp17_;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = _result_;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp38_;
+ _tmp18_ = doc;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp18_ == NULL) {
+#line 5452 "RESTSupport.c"
+ GError* _tmp19_;
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp19_;
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return NULL;
+#line 5464 "RESTSupport.c"
+ } else {
+#line 615 "/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);
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_clear_error (&_inner_error_);
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return NULL;
+#line 5472 "RESTSupport.c"
+ }
+ }
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp20_ = doc;
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp21_ = _tmp20_->children;
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp21_ == NULL) {
+#line 5481 "RESTSupport.c"
+ GError* _tmp22_;
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp22_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp22_;
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_propagate_error (error, _inner_error_);
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return NULL;
+#line 5493 "RESTSupport.c"
+ } else {
+#line 621 "/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);
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_clear_error (&_inner_error_);
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return NULL;
+#line 5501 "RESTSupport.c"
+ }
+ }
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp23_ = doc;
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp24_ = publishing_rest_support_xml_document_new (_tmp23_);
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ rest_doc = _tmp24_;
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp25_ = rest_doc;
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp26_ = check_for_error_response (_tmp25_, check_for_error_response_target);
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _result_ = _tmp26_;
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp27_ = _result_;
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp27_ != NULL) {
+#line 5520 "RESTSupport.c"
+ const gchar* _tmp28_;
+ GError* _tmp29_;
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp28_ = _result_;
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp28_);
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _inner_error_ = _tmp29_;
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_propagate_error (error, _inner_error_);
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5185 "RESTSupport.c"
+#line 5539 "RESTSupport.c"
} else {
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/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);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5197 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
}
}
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = rest_doc;
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5206 "RESTSupport.c"
+#line 5560 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_init (GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_xml_document_init (GValue* value)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5213 "RESTSupport.c"
+#line 5569 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_xml_document_free_value (GValue* value)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5222 "RESTSupport.c"
+#line 5580 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_xml_document_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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 5232 "RESTSupport.c"
+#line 5593 "RESTSupport.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5236 "RESTSupport.c"
+#line 5597 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+publishing_rest_support_value_xml_document_peek_pointer (const GValue* value)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5244 "RESTSupport.c"
+#line 5607 "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"
+static gchar*
+publishing_rest_support_value_xml_document_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5251 "RESTSupport.c"
+#line 5619 "RESTSupport.c"
PublishingRESTSupportXmlDocument * object;
object = collect_values[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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"
+#line 554 "/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 5258 "RESTSupport.c"
+#line 5626 "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"
+#line 554 "/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 5262 "RESTSupport.c"
+#line 5630 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5266 "RESTSupport.c"
+#line 5634 "RESTSupport.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5270 "RESTSupport.c"
+#line 5638 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5274 "RESTSupport.c"
+#line 5642 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_xml_document_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportXmlDocument ** object_p;
object_p = collect_values[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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 5285 "RESTSupport.c"
+#line 5658 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5291 "RESTSupport.c"
+#line 5664 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5295 "RESTSupport.c"
+#line 5668 "RESTSupport.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5299 "RESTSupport.c"
+#line 5672 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5303 "RESTSupport.c"
+#line 5676 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_xml_document (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecXmlDocument* spec;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5317 "RESTSupport.c"
+#line 5696 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gpointer
+publishing_rest_support_value_get_xml_document (const GValue* value)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5326 "RESTSupport.c"
+#line 5707 "RESTSupport.c"
}
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_xml_document (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportXmlDocument * old;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5346 "RESTSupport.c"
+#line 5730 "RESTSupport.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5350 "RESTSupport.c"
+#line 5734 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5356 "RESTSupport.c"
+#line 5740 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_xml_document (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportXmlDocument * old;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5375 "RESTSupport.c"
+#line 5762 "RESTSupport.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5379 "RESTSupport.c"
+#line 5766 "RESTSupport.c"
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5385 "RESTSupport.c"
+#line 5772 "RESTSupport.c"
}
}
-static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_parent_class = g_type_class_peek_parent (klass);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5397 "RESTSupport.c"
+#line 5786 "RESTSupport.c"
}
-static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self)
+{
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5406 "RESTSupport.c"
+#line 5797 "RESTSupport.c"
}
-static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj) {
+static void
+publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj)
+{
PublishingRESTSupportXmlDocument * self;
xmlDoc* _tmp0_;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->document;
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5421 "RESTSupport.c"
+#line 5814 "RESTSupport.c"
}
-GType publishing_rest_support_xml_document_get_type (void) {
+GType
+publishing_rest_support_xml_document_get_type (void)
+{
static volatile gsize publishing_rest_support_xml_document_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_xml_document_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_xml_document_init, publishing_rest_support_value_xml_document_free_value, publishing_rest_support_value_xml_document_copy_value, publishing_rest_support_value_xml_document_peek_pointer, "p", publishing_rest_support_value_xml_document_collect_value, "p", publishing_rest_support_value_xml_document_lcopy_value };
@@ -5443,295 +5838,298 @@ GType publishing_rest_support_xml_document_get_type (void) {
}
-gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
+gpointer
+publishing_rest_support_xml_document_ref (gpointer instance)
+{
PublishingRESTSupportXmlDocument * self;
self = instance;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5446 "RESTSupport.c"
+#line 5843 "RESTSupport.c"
}
-void publishing_rest_support_xml_document_unref (gpointer instance) {
+void
+publishing_rest_support_xml_document_unref (gpointer instance)
+{
PublishingRESTSupportXmlDocument * self;
self = instance;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5459 "RESTSupport.c"
+#line 5858 "RESTSupport.c"
}
}
-gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
+gchar*
+publishing_rest_support_decimal_entity_encode (const gchar* source)
+{
gchar* result = NULL;
GString* encoded_str_builder = NULL;
GString* _tmp0_;
gchar* current_char = NULL;
- const gchar* _tmp1_;
- gchar* _tmp2_;
- GString* _tmp23_;
- const gchar* _tmp24_;
- gchar* _tmp25_;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp1_;
+ GString* _tmp20_;
+ const gchar* _tmp21_;
+ gchar* _tmp22_;
+#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (source != NULL, NULL);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_string_new ("");
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
encoded_str_builder = _tmp0_;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = source;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp2_;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = g_strdup (source);
+#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ current_char = _tmp1_;
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5488 "RESTSupport.c"
+#line 5886 "RESTSupport.c"
gint current_char_value = 0;
- const gchar* _tmp3_;
- gunichar _tmp4_;
- gint _tmp5_;
+ const gchar* _tmp2_;
+ gint _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
- gint _tmp9_;
- const gchar* _tmp20_;
- const gchar* _tmp21_;
- gchar* _tmp22_;
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = current_char;
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char_value = (gint) _tmp4_;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = current_char_value;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp5_ < 1) {
-#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gint _tmp7_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
+#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = current_char;
+#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ current_char_value = (gint) g_utf8_get_char_validated (_tmp2_, (gssize) -1);
+#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = current_char_value;
+#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp3_ < 1) {
+#line 648 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5512 "RESTSupport.c"
+#line 5907 "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 5518 "RESTSupport.c"
- gint _tmp10_;
-#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 5524 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = current_char_value;
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp7_ < 128) {
+#line 5913 "RESTSupport.c"
+ gint _tmp8_;
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = current_char_value;
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = _tmp8_ != ((gint) '&');
+#line 5919 "RESTSupport.c"
} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = FALSE;
-#line 5528 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = FALSE;
+#line 5923 "RESTSupport.c"
}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp8_) {
-#line 5532 "RESTSupport.c"
- gint _tmp11_;
-#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 5538 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp6_) {
+#line 5927 "RESTSupport.c"
+ gint _tmp9_;
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = current_char_value;
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = _tmp9_ != ((gint) '<');
+#line 5933 "RESTSupport.c"
} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = FALSE;
-#line 5542 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = FALSE;
+#line 5937 "RESTSupport.c"
}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_) {
-#line 5546 "RESTSupport.c"
- gint _tmp12_;
-#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 5552 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp5_) {
+#line 5941 "RESTSupport.c"
+ gint _tmp10_;
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = current_char_value;
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = _tmp10_ != ((gint) '>');
+#line 5947 "RESTSupport.c"
} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = FALSE;
-#line 5556 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = FALSE;
+#line 5951 "RESTSupport.c"
}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5560 "RESTSupport.c"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp4_) {
+#line 5955 "RESTSupport.c"
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = encoded_str_builder;
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = current_char;
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append_unichar (_tmp11_, g_utf8_get_char_validated (_tmp12_, (gssize) -1));
+#line 5964 "RESTSupport.c"
+ } else {
GString* _tmp13_;
- const gchar* _tmp14_;
- gunichar _tmp15_;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gint _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = encoded_str_builder;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = current_char;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _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 5572 "RESTSupport.c"
- } else {
- GString* _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = encoded_str_builder;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = current_char_value;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strdup_printf ("&#%d;", _tmp17_);
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp18_;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp16_, _tmp19_);
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp19_);
-#line 5590 "RESTSupport.c"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp14_ = current_char_value;
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15_ = g_strdup_printf ("&#%d;", _tmp14_);
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp16_ = _tmp15_;
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append (_tmp13_, _tmp16_);
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp16_);
+#line 5982 "RESTSupport.c"
}
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = current_char;
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = g_utf8_next_char (_tmp20_);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = g_strdup (_tmp21_);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp17_ = current_char;
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp18_ = g_utf8_next_char (_tmp17_);
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19_ = g_strdup (_tmp18_);
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp22_;
-#line 5602 "RESTSupport.c"
- }
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = encoded_str_builder;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = _tmp23_->str;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = g_strdup (_tmp24_);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp25_;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ current_char = _tmp19_;
+#line 5994 "RESTSupport.c"
+ }
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp20_ = encoded_str_builder;
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp21_ = _tmp20_->str;
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp22_ = g_strdup (_tmp21_);
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp22_;
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (encoded_str_builder);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5618 "RESTSupport.c"
+#line 6010 "RESTSupport.c"
}
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable**
+_vala_array_dup2 (SpitPublishingPublishable** self,
+ int length)
+{
SpitPublishingPublishable** result;
int i;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5629 "RESTSupport.c"
+#line 6024 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5635 "RESTSupport.c"
+#line 6030 "RESTSupport.c"
}
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5639 "RESTSupport.c"
+#line 6034 "RESTSupport.c"
}
-PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1) {
+PublishingRESTSupportBatchUploader*
+publishing_rest_support_batch_uploader_construct (GType object_type,
+ PublishingRESTSupportSession* session,
+ SpitPublishingPublishable** publishables,
+ int publishables_length1)
+{
PublishingRESTSupportBatchUploader* self = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
- PublishingRESTSupportSession* _tmp2_;
- PublishingRESTSupportSession* _tmp3_;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ PublishingRESTSupportSession* _tmp1_;
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishables;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = (publishables != NULL) ? _vala_array_dup2 (publishables, publishables_length1) : ((gpointer) publishables);
+#line 674 "/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_);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = _tmp0__length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables = _tmp1_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables_length1 = _tmp1__length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->publishables = _tmp0_;
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->publishables_length1 = _tmp0__length1;
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = session;
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _publishing_rest_support_session_ref0 (session);
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp3_;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->session = _tmp1_;
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5681 "RESTSupport.c"
+#line 6072 "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"
+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 696 "/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 5688 "RESTSupport.c"
+#line 6084 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self) {
+static void
+publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self)
+{
gboolean stop = FALSE;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
gboolean _tmp23_;
GError * _inner_error_ = NULL;
-#line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = 0;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
stop = FALSE;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5708 "RESTSupport.c"
+#line 6106 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
gint _publishable_collection_size_ = 0;
gint publishable_it = 0;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable_collection = _tmp0_;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable_collection_length1 = _tmp0__length1;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5720 "RESTSupport.c"
+#line 6118 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* publishable = NULL;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/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"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5727 "RESTSupport.c"
+#line 6125 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_;
@@ -5754,104 +6152,104 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
guint _tmp20_;
gboolean _tmp21_;
gint _tmp22_;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishable;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = spit_publishing_publishable_get_serialized_file (_tmp2_);
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file = _tmp3_;
-#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = file;
-#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5760 "RESTSupport.c"
+#line 6158 "RESTSupport.c"
gint _tmp5_;
-#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
-#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = _tmp5_ + 1;
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5772 "RESTSupport.c"
+#line 6170 "RESTSupport.c"
}
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = self->priv->publishables;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7__length1 = self->priv->publishables_length1;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
fraction_complete = ((gdouble) _tmp6_) / _tmp7__length1;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->status_updated;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8__target = self->priv->status_updated_target;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5788 "RESTSupport.c"
+#line 6186 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_;
void* _tmp9__target;
gint _tmp10_;
gdouble _tmp11_;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->status_updated;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9__target = self->priv->status_updated_target;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->current_file;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = fraction_complete;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5803 "RESTSupport.c"
+#line 6201 "RESTSupport.c"
}
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12__length1 = self->priv->publishables_length1;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = self->priv->current_file;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = _tmp12_[_tmp13_];
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = publishing_rest_support_batch_uploader_create_transaction (self, _tmp14_);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
txn = _tmp15_;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = txn;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 696 "/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 5821 "RESTSupport.c"
+#line 6219 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_;
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = txn;
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (_tmp17_, &_inner_error_);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5832 "RESTSupport.c"
+#line 6230 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5847 "RESTSupport.c"
+#line 6245 "RESTSupport.c"
}
}
goto __finally3;
@@ -5859,476 +6257,523 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
{
GError* err = NULL;
GError* _tmp18_;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = err;
-#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp18_);
-#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
stop = TRUE;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 5867 "RESTSupport.c"
+#line 6265 "RESTSupport.c"
}
__finally3:
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/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);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5884 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
}
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp20_, NULL, FALSE);
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = stop;
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp21_) {
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5904 "RESTSupport.c"
+#line 6302 "RESTSupport.c"
}
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = _tmp22_ + 1;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 5916 "RESTSupport.c"
+#line 6314 "RESTSupport.c"
}
}
}
-#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = stop;
-#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 5924 "RESTSupport.c"
+#line 6322 "RESTSupport.c"
gint _tmp24_;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp24_);
-#line 5930 "RESTSupport.c"
+#line 6328 "RESTSupport.c"
}
}
-static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes) {
+static void
+publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self,
+ gint bytes_written_so_far,
+ gint total_bytes)
+{
gdouble file_span = 0.0;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
gdouble this_file_fraction_complete = 0.0;
- gint _tmp1_;
- gint _tmp2_;
gdouble fraction_complete = 0.0;
- gint _tmp3_;
+ gint _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
gdouble _tmp4_;
- gdouble _tmp5_;
- gdouble _tmp6_;
- SpitPublishingProgressCallback _tmp7_;
- void* _tmp7__target;
-#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ SpitPublishingProgressCallback _tmp5_;
+ void* _tmp5__target;
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file_span = 1.0 / _tmp0__length1;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = bytes_written_so_far;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = total_bytes;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->current_file;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ this_file_fraction_complete = ((gdouble) bytes_written_so_far) / total_bytes;
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = self->priv->current_file;
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = file_span;
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = this_file_fraction_complete;
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = file_span;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = this_file_fraction_complete;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = file_span;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->status_updated;
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__target = self->priv->status_updated_target;
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_ != NULL) {
-#line 5979 "RESTSupport.c"
- SpitPublishingProgressCallback _tmp8_;
- void* _tmp8__target;
- gint _tmp9_;
- gdouble _tmp10_;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->status_updated;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__target = self->priv->status_updated_target;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->current_file;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = fraction_complete;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 5994 "RESTSupport.c"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ fraction_complete = (_tmp1_ * _tmp2_) + (_tmp3_ * _tmp4_);
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = self->priv->status_updated;
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5__target = self->priv->status_updated_target;
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp5_ != NULL) {
+#line 6375 "RESTSupport.c"
+ SpitPublishingProgressCallback _tmp6_;
+ void* _tmp6__target;
+ gint _tmp7_;
+ gdouble _tmp8_;
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = self->priv->status_updated;
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6__target = self->priv->status_updated_target;
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = self->priv->current_file;
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = fraction_complete;
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ (_tmp7_ + 1, _tmp8_, _tmp6__target);
+#line 6390 "RESTSupport.c"
}
}
-PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self) {
+PublishingRESTSupportSession*
+publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self)
+{
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_;
PublishingRESTSupportSession* _tmp1_;
-#line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->session;
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6013 "RESTSupport.c"
+#line 6411 "RESTSupport.c"
}
-SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self) {
+SpitPublishingPublishable*
+publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self)
+{
SpitPublishingPublishable* result = NULL;
SpitPublishingPublishable** _tmp0_;
gint _tmp0__length1;
gint _tmp1_;
SpitPublishingPublishable* _tmp2_;
SpitPublishingPublishable* _tmp3_;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->current_file;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp0_[_tmp1_];
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp3_;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6040 "RESTSupport.c"
+#line 6440 "RESTSupport.c"
}
-static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static PublishingRESTSupportTransaction*
+publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable)
+{
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6049 "RESTSupport.c"
+#line 6452 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+PublishingRESTSupportTransaction*
+publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingPublishable* publishable)
+{
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6058 "RESTSupport.c"
+#line 6464 "RESTSupport.c"
}
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
- SpitPublishingProgressCallback _tmp0_;
- void* _tmp0__target;
- SpitPublishingPublishable** _tmp1_;
- gint _tmp1__length1;
-#line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+ SpitPublishingProgressCallback status_updated,
+ void* status_updated_target)
+{
+ SpitPublishingPublishable** _tmp0_;
+ gint _tmp0__length1;
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = status_updated;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0__target = status_updated_target;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated = _tmp0_;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated_target = _tmp0__target;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->publishables;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = self->priv->publishables_length1;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1__length1 > 0) {
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->status_updated = status_updated;
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->status_updated_target = status_updated_target;
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->publishables;
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0__length1 = self->priv->publishables_length1;
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp0__length1 > 0) {
+#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 6085 "RESTSupport.c"
+#line 6489 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_batch_uploader_init (GValue* value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6093 "RESTSupport.c"
+#line 6499 "RESTSupport.c"
}
-static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_batch_uploader_free_value (GValue* value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6102 "RESTSupport.c"
+#line 6510 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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 6112 "RESTSupport.c"
+#line 6523 "RESTSupport.c"
} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6116 "RESTSupport.c"
+#line 6527 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6124 "RESTSupport.c"
+#line 6537 "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"
+static gchar*
+publishing_rest_support_value_batch_uploader_collect_value (GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 6131 "RESTSupport.c"
+#line 6549 "RESTSupport.c"
PublishingRESTSupportBatchUploader * object;
object = collect_values[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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"
+#line 664 "/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 6138 "RESTSupport.c"
+#line 6556 "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"
+#line 664 "/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 6142 "RESTSupport.c"
+#line 6560 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6146 "RESTSupport.c"
+#line 6564 "RESTSupport.c"
} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6150 "RESTSupport.c"
+#line 6568 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6154 "RESTSupport.c"
+#line 6572 "RESTSupport.c"
}
-static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
PublishingRESTSupportBatchUploader ** object_p;
object_p = collect_values[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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 6165 "RESTSupport.c"
+#line 6588 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6171 "RESTSupport.c"
+#line 6594 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6175 "RESTSupport.c"
+#line 6598 "RESTSupport.c"
} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6179 "RESTSupport.c"
+#line 6602 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6183 "RESTSupport.c"
+#line 6606 "RESTSupport.c"
}
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
PublishingRESTSupportParamSpecBatchUploader* spec;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6197 "RESTSupport.c"
+#line 6626 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gpointer
+publishing_rest_support_value_get_batch_uploader (const GValue* value)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6206 "RESTSupport.c"
+#line 6637 "RESTSupport.c"
}
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_set_batch_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportBatchUploader * old;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6226 "RESTSupport.c"
+#line 6660 "RESTSupport.c"
} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6230 "RESTSupport.c"
+#line 6664 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6236 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
}
}
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
+void
+publishing_rest_support_value_take_batch_uploader (GValue* value,
+ gpointer v_object)
+{
PublishingRESTSupportBatchUploader * old;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6255 "RESTSupport.c"
+#line 6692 "RESTSupport.c"
} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6259 "RESTSupport.c"
+#line 6696 "RESTSupport.c"
}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6265 "RESTSupport.c"
+#line 6702 "RESTSupport.c"
}
}
-static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_rest_support_batch_uploader_finalize;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = 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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL] = 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 6283 "RESTSupport.c"
+#line 6722 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self)
+{
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE (self);
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = 0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = NULL;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables_length1 = 0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->session = NULL;
-#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->status_updated = NULL;
-#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->status_updated_target = self;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6306 "RESTSupport.c"
+#line 6747 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+static void
+publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj)
+{
PublishingRESTSupportBatchUploader * self;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6320 "RESTSupport.c"
+#line 6763 "RESTSupport.c"
}
-GType publishing_rest_support_batch_uploader_get_type (void) {
+GType
+publishing_rest_support_batch_uploader_get_type (void)
+{
static volatile gsize publishing_rest_support_batch_uploader_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_batch_uploader_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { publishing_rest_support_value_batch_uploader_init, publishing_rest_support_value_batch_uploader_free_value, publishing_rest_support_value_batch_uploader_copy_value, publishing_rest_support_value_batch_uploader_peek_pointer, "p", publishing_rest_support_value_batch_uploader_collect_value, "p", publishing_rest_support_value_batch_uploader_lcopy_value };
@@ -6342,242 +6787,256 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
}
-gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
+gpointer
+publishing_rest_support_batch_uploader_ref (gpointer instance)
+{
PublishingRESTSupportBatchUploader * self;
self = instance;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6345 "RESTSupport.c"
+#line 6792 "RESTSupport.c"
}
-void publishing_rest_support_batch_uploader_unref (gpointer instance) {
+void
+publishing_rest_support_batch_uploader_unref (gpointer instance)
+{
PublishingRESTSupportBatchUploader * self;
self = instance;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6358 "RESTSupport.c"
+#line 6807 "RESTSupport.c"
}
}
-static gunichar string_get_char (const gchar* self, glong index) {
+static gunichar
+string_get_char (const gchar* self,
+ glong index)
+{
gunichar result = 0U;
- glong _tmp0_;
- gunichar _tmp1_;
-#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1154 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = g_utf8_get_char (((gchar*) self) + index);
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6377 "RESTSupport.c"
+#line 6823 "RESTSupport.c"
}
-gchar* publishing_rest_support_asciify_string (const gchar* s) {
+gchar*
+publishing_rest_support_asciify_string (const gchar* s)
+{
gchar* result = NULL;
gchar* t = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
GString* b = NULL;
- GString* _tmp2_;
- GString* _tmp14_;
- const gchar* _tmp15_;
- gchar* _tmp16_;
-#line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ GString* _tmp1_;
+ GString* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (s != NULL, NULL);
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = s;
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- t = _tmp1_;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_string_new ("");
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- b = _tmp2_;
-#line 6403 "RESTSupport.c"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = g_utf8_normalize (s, (gssize) -1, G_NORMALIZE_DEFAULT);
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ t = _tmp0_;
+#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = g_string_new ("");
+#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ b = _tmp1_;
+#line 6848 "RESTSupport.c"
{
const gchar* u = NULL;
- const gchar* _tmp3_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = t;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp3_;
-#line 6411 "RESTSupport.c"
+ const gchar* _tmp2_;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = t;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ u = _tmp2_;
+#line 6856 "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"
+ gboolean _tmp3_ = FALSE;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = TRUE;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6418 "RESTSupport.c"
+#line 6863 "RESTSupport.c"
+ const gchar* _tmp6_;
+ gunichar c = 0U;
const gchar* _tmp7_;
gunichar _tmp8_;
- gunichar c = 0U;
- const gchar* _tmp9_;
- gunichar _tmp10_;
- gunichar _tmp11_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 6427 "RESTSupport.c"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!_tmp3_) {
+#line 6870 "RESTSupport.c"
+ const gchar* _tmp4_;
const gchar* _tmp5_;
- const gchar* _tmp6_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = u;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_utf8_next_char (_tmp5_);
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp6_;
-#line 6436 "RESTSupport.c"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = u;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = g_utf8_next_char (_tmp4_);
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ u = _tmp5_;
+#line 6879 "RESTSupport.c"
}
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = u;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_get_char (_tmp7_, (glong) 0);
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp8_ != ((gunichar) 0))) {
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = FALSE;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = u;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!(string_get_char (_tmp6_, (glong) 0) != ((gunichar) 0))) {
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6448 "RESTSupport.c"
+#line 6889 "RESTSupport.c"
}
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = u;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_get_char (_tmp9_, (glong) 0);
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- c = _tmp10_;
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = c;
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (((gint) _tmp11_) < 128) {
-#line 6460 "RESTSupport.c"
- GString* _tmp12_;
- gunichar _tmp13_;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = b;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = c;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6469 "RESTSupport.c"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = u;
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ c = string_get_char (_tmp7_, (glong) 0);
+#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = c;
+#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (((gint) _tmp8_) < 128) {
+#line 6899 "RESTSupport.c"
+ GString* _tmp9_;
+ gunichar _tmp10_;
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = b;
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = c;
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append_unichar (_tmp9_, _tmp10_);
+#line 6908 "RESTSupport.c"
}
}
}
}
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = b;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = _tmp14_->str;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = g_strdup (_tmp15_);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp16_;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = b;
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = _tmp11_->str;
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = g_strdup (_tmp12_);
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp13_;
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (b);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (t);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6488 "RESTSupport.c"
+#line 6927 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gchar*
+publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self)
+{
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6497 "RESTSupport.c"
+#line 6938 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gchar*
+publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self)
+{
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6506 "RESTSupport.c"
+#line 6949 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gchar*
+publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self)
+{
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6515 "RESTSupport.c"
+#line 6960 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gchar*
+publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self)
+{
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6524 "RESTSupport.c"
+#line 6971 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self)
+{
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6533 "RESTSupport.c"
+#line 6982 "RESTSupport.c"
}
-void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self)
+{
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6542 "RESTSupport.c"
+#line 6993 "RESTSupport.c"
}
-PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type) {
+PublishingRESTSupportGoogleSession*
+publishing_rest_support_google_session_construct (GType object_type)
+{
PublishingRESTSupportGoogleSession* self = NULL;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6552 "RESTSupport.c"
+#line 7005 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass)
+{
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_user_name;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate;
-#line 6565 "RESTSupport.c"
+#line 7020 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_instance_init (PublishingRESTSupportGoogleSession * self) {
+static void
+publishing_rest_support_google_session_instance_init (PublishingRESTSupportGoogleSession * self)
+{
}
-GType publishing_rest_support_google_session_get_type (void) {
+GType
+publishing_rest_support_google_session_get_type (void)
+{
static volatile gsize publishing_rest_support_google_session_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_session_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGoogleSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGoogleSession), 0, (GInstanceInitFunc) publishing_rest_support_google_session_instance_init, NULL };
@@ -6589,237 +7048,270 @@ GType publishing_rest_support_google_session_get_type (void) {
}
-static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+_publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender,
+ gpointer self)
+{
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self);
-#line 6588 "RESTSupport.c"
+#line 7050 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope) {
+PublishingRESTSupportGooglePublisher*
+publishing_rest_support_google_publisher_construct (GType object_type,
+ SpitPublishingService* service,
+ SpitPublishingPluginHost* host,
+ const gchar* scope)
+{
PublishingRESTSupportGooglePublisher * self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_;
- SpitPublishingService* _tmp3_;
- SpitPublishingPluginHost* _tmp4_;
- SpitPublishingAuthenticator* _tmp5_;
- SpitPublishingAuthenticator* _tmp6_;
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp0_;
+ PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_;
+ SpitPublishingAuthenticator* _tmp2_;
+ SpitPublishingAuthenticator* _tmp3_;
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (scope != NULL, NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = scope;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = g_strdup (scope);
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->scope = _tmp1_;
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->scope = _tmp0_;
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = publishing_rest_support_google_publisher_google_session_impl_new ();
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp2_;
-#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = service;
-#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->service = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = host;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->host = _tmp4_;
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_google_publisher_get_authenticator (self);
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->session = _tmp1_;
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->service = service;
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->host = host;
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = publishing_rest_support_google_publisher_get_authenticator (self);
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->authenticator);
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->authenticator = _tmp5_;
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = self->priv->authenticator;
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self->priv->authenticator = _tmp2_;
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = self->priv->authenticator;
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_signal_connect_object (_tmp3_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6643 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
}
-static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static SpitPublishingAuthenticator*
+publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self)
+{
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6652 "RESTSupport.c"
+#line 7112 "RESTSupport.c"
}
-SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+SpitPublishingAuthenticator*
+publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self)
+{
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
-#line 6661 "RESTSupport.c"
+#line 7123 "RESTSupport.c"
}
-SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
+SpitPublishingPluginHost*
+publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self)
+{
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_;
-#line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->host;
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6676 "RESTSupport.c"
+#line 7140 "RESTSupport.c"
}
-PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self) {
+PublishingRESTSupportGoogleSession*
+publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self)
+{
PublishingRESTSupportGoogleSession* result = NULL;
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_;
PublishingRESTSupportGoogleSession* _tmp1_;
-#line 825 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->session;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6694 "RESTSupport.c"
+#line 7160 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self)
+{
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6703 "RESTSupport.c"
+#line 7171 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self)
+{
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 6712 "RESTSupport.c"
+#line 7182 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self)
+{
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6721 "RESTSupport.c"
+#line 7193 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self)
+{
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 6730 "RESTSupport.c"
+#line 7204 "RESTSupport.c"
}
-static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
+static gboolean
+publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self)
+{
gboolean _tmp0_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
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 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return _tmp0_;
-#line 6740 "RESTSupport.c"
+#line 7216 "RESTSupport.c"
}
-gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+gboolean
+publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self)
+{
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 6749 "RESTSupport.c"
+#line 7227 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self)
+{
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6758 "RESTSupport.c"
+#line 7238 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self)
+{
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 6767 "RESTSupport.c"
+#line 7249 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self)
+{
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6776 "RESTSupport.c"
+#line 7260 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+void
+publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self)
+{
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 6785 "RESTSupport.c"
+#line 7271 "RESTSupport.c"
}
-static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base) {
+static SpitPublishingService*
+publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base)
+{
PublishingRESTSupportGooglePublisher * self;
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_;
SpitPublishingService* _tmp1_;
-#line 839 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->service;
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6804 "RESTSupport.c"
+#line 7292 "RESTSupport.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static gpointer
+_g_variant_ref0 (gpointer self)
+{
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_variant_ref (self) : NULL;
-#line 6811 "RESTSupport.c"
+#line 7301 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self) {
+static void
+publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self)
+{
GHashTable* params = NULL;
SpitPublishingAuthenticator* _tmp0_;
GHashTable* _tmp1_;
@@ -6844,245 +7336,262 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica
GVariant* _tmp17_;
const gchar* _tmp18_;
gchar* _tmp19_;
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->authenticator;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
params = _tmp1_;
-#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
refresh_token = NULL;
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 861 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
access_token = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
user_name = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hash_table_lookup_extended (params, "RefreshToken", NULL, &_tmp2_);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (refresh_token);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _g_variant_ref0 (_tmp2_);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
refresh_token = _tmp3_;
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hash_table_lookup_extended (params, "AccessToken", NULL, &_tmp4_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (access_token);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _g_variant_ref0 (_tmp4_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
access_token = _tmp5_;
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hash_table_lookup_extended (params, "UserName", NULL, &_tmp6_);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (user_name);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _g_variant_ref0 (_tmp6_);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
user_name = _tmp7_;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->session;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = refresh_token;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = g_variant_get_string (_tmp9_, NULL);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = g_strdup (_tmp10_);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp8_->refresh_token);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_->refresh_token = _tmp11_;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->session;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = access_token;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = g_variant_get_string (_tmp13_, NULL);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = g_strdup (_tmp14_);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp12_->access_token);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_->access_token = _tmp15_;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = self->priv->session;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = user_name;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = g_variant_get_string (_tmp17_, NULL);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_strdup (_tmp18_);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp16_->user_name);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_->user_name = _tmp19_;
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_login_flow_complete (self);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (user_name);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (access_token);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_variant_unref0 (refresh_token);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (params);
-#line 6924 "RESTSupport.c"
+#line 7416 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
+static PublishingRESTSupportGooglePublisherGoogleSessionImpl*
+publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->access_token = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->user_name = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6946 "RESTSupport.c"
+#line 7440 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static PublishingRESTSupportGooglePublisherGoogleSessionImpl*
+publishing_rest_support_google_publisher_google_session_impl_new (void)
+{
+#line 776 "/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 6953 "RESTSupport.c"
+#line 7449 "RESTSupport.c"
}
-static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base) {
+static gboolean
+publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gboolean result = FALSE;
const gchar* _tmp0_;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->access_token;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_ != NULL;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6969 "RESTSupport.c"
+#line 7467 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base) {
+static gchar*
+publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
gchar* _tmp2_;
-#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->user_name;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_ != NULL, "user_name != null");
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->user_name;
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6993 "RESTSupport.c"
+#line 7493 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base) {
+static gchar*
+publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gchar* result = NULL;
- gboolean _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
-#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "is_authenticated()");
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->access_token;
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "is_authenticated()");
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->access_token;
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp1_;
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7017 "RESTSupport.c"
+#line 7516 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 781 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->access_token = NULL;
-#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->user_name = NULL;
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 7037 "RESTSupport.c"
+#line 7538 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass)
+{
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_google_session_impl_parent_class = g_type_class_peek_parent (klass);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 7054 "RESTSupport.c"
+#line 7557 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_instance_init (PublishingRESTSupportGooglePublisherGoogleSessionImpl * self) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_instance_init (PublishingRESTSupportGooglePublisherGoogleSessionImpl * self)
+{
}
-static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj) {
+static void
+publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj)
+{
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/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 7074 "RESTSupport.c"
+#line 7581 "RESTSupport.c"
}
-static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) {
+static GType
+publishing_rest_support_google_publisher_google_session_impl_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_google_session_impl_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_google_session_impl_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherGoogleSessionImplClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_google_session_impl_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherGoogleSessionImpl), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_google_session_impl_instance_init, NULL };
@@ -7094,107 +7603,104 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
}
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), endpoint_url, method);
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7109 "RESTSupport.c"
+#line 7614 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 804 "/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 7116 "RESTSupport.c"
+#line 7625 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+ PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
- PublishingRESTSupportGoogleSession* _tmp0_;
- const gchar* _tmp1_;
- PublishingRESTSupportHttpMethod _tmp2_;
- PublishingRESTSupportGoogleSession* _tmp3_;
- gboolean _tmp4_;
- PublishingRESTSupportGoogleSession* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- 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 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = session;
-#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp4_, "session.is_authenticated()");
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = session;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp7_);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), endpoint_url, method);
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = publishing_rest_support_google_session_get_access_token (session);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = g_strconcat ("Bearer ", _tmp1_, NULL);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = _tmp2_;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp3_);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp3_);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp1_);
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7168 "RESTSupport.c"
+#line 7664 "RESTSupport.c"
}
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction*
+publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+ const gchar* endpoint_url,
+ PublishingRESTSupportHttpMethod method)
+{
+#line 809 "/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 7175 "RESTSupport.c"
+#line 7675 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
-#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass)
+{
+#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 7182 "RESTSupport.c"
+#line 7684 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_authenticated_transaction_instance_init (PublishingRESTSupportGooglePublisherAuthenticatedTransaction * self) {
+static void
+publishing_rest_support_google_publisher_authenticated_transaction_instance_init (PublishingRESTSupportGooglePublisherAuthenticatedTransaction * self)
+{
}
-GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) {
+GType
+publishing_rest_support_google_publisher_authenticated_transaction_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_authenticated_transaction_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_authenticated_transaction_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_authenticated_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherAuthenticatedTransaction), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_authenticated_transaction_instance_init, NULL };
@@ -7206,68 +7712,78 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
}
-static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass)
+{
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_get_authenticator;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_on_login_flow_complete;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_do_logout;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_is_running;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_start;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 7221 "RESTSupport.c"
+#line 7729 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface)
+{
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_is_running;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_start;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service;
-#line 7236 "RESTSupport.c"
+#line 7746 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+static void
+publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self)
+{
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 7243 "RESTSupport.c"
+#line 7755 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
+static void
+publishing_rest_support_google_publisher_finalize (GObject * obj)
+{
PublishingRESTSupportGooglePublisher * self;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
-#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->authenticator);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 7259 "RESTSupport.c"
+#line 7773 "RESTSupport.c"
}
-GType publishing_rest_support_google_publisher_get_type (void) {
+GType
+publishing_rest_support_google_publisher_get_type (void)
+{
static volatile gsize publishing_rest_support_google_publisher_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisher), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_instance_init, NULL };
@@ -7281,7 +7797,11 @@ GType publishing_rest_support_google_publisher_get_type (void) {
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -7293,7 +7813,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index f06473c..d92c264 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -123,6 +123,20 @@ public class Argument {
this.value = value;
}
+ public static string serialize_list(Argument[] args, bool escape = false, string? separator = "&") {
+ var builder = new StringBuilder("");
+
+ foreach (var arg in args) {
+ builder.append(arg.to_string(escape));
+ builder.append(separator);
+ }
+
+ if (builder.len > 0)
+ builder.truncate(builder.len - separator.length);
+
+ return builder.str;
+ }
+
public static int compare(Argument arg1, Argument arg2) {
return strcmp(arg1.key, arg2.key);
}
@@ -136,8 +150,8 @@ public class Argument {
return sorted_args.to_array();
}
- public string to_string () {
- return "%s=%s".printf (this.key, this.value);
+ public string to_string (bool escape = false) {
+ return "%s=%s%s%s".printf (this.key, escape ? "\"" : "", this.value, escape ? "\"" : "");
}
}
@@ -154,6 +168,7 @@ public class Transaction {
public signal void chunk_transmitted(int bytes_written_so_far, int total_bytes);
public signal void network_error(Spit.Publishing.PublishingError err);
public signal void completed();
+
public Transaction(Session parent_session, HttpMethod method = HttpMethod.POST) {
// if our creator doesn't specify an endpoint url by using the Transaction.with_endpoint_url
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index fa81657..828d6df 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.36.6, the Vala compiler
+/* Resources.c generated by valac 0.40.4, the Vala compiler
* generated from Resources.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -46,113 +47,129 @@
"c., \n" \
"51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#define RESOURCES_TRANSLATORS _ ("translator-credits")
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
-static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+GdkPixbuf** resources_load_icon_set (GFile* icon_file,
+ int* result_length1);
+static void _vala_array_add4 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value);
+GdkPixbuf** resources_load_from_resource (const gchar* resource_path,
+ int* result_length1);
+static void _vala_array_add5 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return self ? g_object_ref (self) : NULL;
-#line 40 "Resources.c"
+#line 55 "Resources.c"
}
-static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void
+_vala_array_add4 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value)
+{
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if ((*length) == (*size)) {
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*array = g_renew (GdkPixbuf*, *array, (*size) + 1);
-#line 51 "Resources.c"
+#line 71 "Resources.c"
}
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[(*length)++] = value;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[*length] = NULL;
-#line 57 "Resources.c"
+#line 77 "Resources.c"
}
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
+GdkPixbuf**
+resources_load_icon_set (GFile* icon_file,
+ int* result_length1)
+{
GdkPixbuf** result = NULL;
GdkPixbuf* icon = NULL;
- GdkPixbuf* _tmp10_;
- GdkPixbuf** _tmp16_;
- gint _tmp16__length1;
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf** _tmp14_;
+ gint _tmp14__length1;
GError * _inner_error_ = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL);
#line 41 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon = NULL;
-#line 72 "Resources.c"
+#line 95 "Resources.c"
{
GdkPixbuf* _tmp0_ = NULL;
- GFile* _tmp1_;
+ gchar* _tmp1_;
gchar* _tmp2_;
- gchar* _tmp3_;
+ GdkPixbuf* _tmp3_;
GdkPixbuf* _tmp4_;
GdkPixbuf* _tmp5_;
- GdkPixbuf* _tmp6_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp1_ = icon_file;
+ _tmp1_ = g_file_get_path (icon_file);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp2_ = g_file_get_path (_tmp1_);
+ _tmp2_ = _tmp1_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp3_ = _tmp2_;
+ _tmp3_ = gdk_pixbuf_new_from_file (_tmp2_, &_inner_error_);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_);
+ _tmp4_ = _tmp3_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp5_ = _tmp4_;
+ _g_free0 (_tmp2_);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _g_free0 (_tmp3_);
-#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp0_ = _tmp5_;
+ _tmp0_ = _tmp4_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 97 "Resources.c"
+#line 117 "Resources.c"
goto __catch4_g_error;
}
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp6_ = _tmp0_;
+ _tmp5_ = _tmp0_;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_tmp0_ = NULL;
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon = _tmp6_;
+ icon = _tmp5_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (_tmp0_);
-#line 110 "Resources.c"
+#line 130 "Resources.c"
}
goto __finally4;
__catch4_g_error:
{
GError* err = NULL;
- GFile* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
err = _inner_error_;
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_inner_error_ = NULL;
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7_ = icon_file;
-#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp8_ = g_file_get_path (_tmp7_);
+ _tmp6_ = g_file_get_path (icon_file);
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = _tmp6_;
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp9_);
+ g_warning ("Resources.vala:45: couldn't load icon set from %s.", _tmp7_);
#line 45 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp7_);
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_error_free0 (err);
-#line 135 "Resources.c"
+#line 152 "Resources.c"
}
__finally4:
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -165,152 +182,154 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
g_clear_error (&_inner_error_);
#line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return NULL;
-#line 148 "Resources.c"
+#line 165 "Resources.c"
}
#line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10_ = icon;
+ _tmp8_ = icon;
#line 48 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- if (_tmp10_ != NULL) {
-#line 154 "Resources.c"
+ if (_tmp8_ != NULL) {
+#line 171 "Resources.c"
GdkPixbuf** icon_pixbuf_set = NULL;
- GdkPixbuf** _tmp11_;
+ GdkPixbuf** _tmp9_;
gint icon_pixbuf_set_length1;
gint _icon_pixbuf_set_size_;
- GdkPixbuf** _tmp12_;
- gint _tmp12__length1;
- GdkPixbuf* _tmp13_;
- GdkPixbuf* _tmp14_;
- GdkPixbuf** _tmp15_;
- gint _tmp15__length1;
+ GdkPixbuf** _tmp10_;
+ gint _tmp10__length1;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf** _tmp13_;
+ gint _tmp13__length1;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11_ = g_new0 (GdkPixbuf*, 0 + 1);
+ _tmp9_ = g_new0 (GdkPixbuf*, 0 + 1);
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon_pixbuf_set = _tmp11_;
+ icon_pixbuf_set = _tmp9_;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon_pixbuf_set_length1 = 0;
#line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_icon_pixbuf_set_size_ = icon_pixbuf_set_length1;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp12_ = icon_pixbuf_set;
+ _tmp10_ = icon_pixbuf_set;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp12__length1 = icon_pixbuf_set_length1;
+ _tmp10__length1 = icon_pixbuf_set_length1;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp13_ = icon;
+ _tmp11_ = icon;
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp14_ = _g_object_ref0 (_tmp13_);
+ _tmp12_ = _g_object_ref0 (_tmp11_);
#line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _vala_array_add2 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp14_);
+ _vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp12_);
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp15_ = icon_pixbuf_set;
+ _tmp13_ = icon_pixbuf_set;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp15__length1 = icon_pixbuf_set_length1;
+ _tmp13__length1 = icon_pixbuf_set_length1;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp15__length1;
-#line 191 "Resources.c"
+ *result_length1 = _tmp13__length1;
+#line 208 "Resources.c"
}
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp15_;
+ result = _tmp13_;
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 199 "Resources.c"
+#line 216 "Resources.c"
}
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp16_ = NULL;
+ _tmp14_ = NULL;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp16__length1 = 0;
+ _tmp14__length1 = 0;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp16__length1;
-#line 209 "Resources.c"
+ *result_length1 = _tmp14__length1;
+#line 226 "Resources.c"
}
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp16_;
+ result = _tmp14_;
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 54 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 217 "Resources.c"
+#line 234 "Resources.c"
}
-static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void
+_vala_array_add5 (GdkPixbuf** * array,
+ int* length,
+ int* size,
+ GdkPixbuf* value)
+{
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if ((*length) == (*size)) {
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
*array = g_renew (GdkPixbuf*, *array, (*size) + 1);
-#line 228 "Resources.c"
+#line 250 "Resources.c"
}
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[(*length)++] = value;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
(*array)[*length] = NULL;
-#line 234 "Resources.c"
+#line 256 "Resources.c"
}
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) {
+GdkPixbuf**
+resources_load_from_resource (const gchar* resource_path,
+ int* result_length1)
+{
GdkPixbuf** result = NULL;
GdkPixbuf* icon = NULL;
- GdkPixbuf* _tmp5_;
- GdkPixbuf** _tmp11_;
- gint _tmp11__length1;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf** _tmp9_;
+ gint _tmp9__length1;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
g_return_val_if_fail (resource_path != NULL, NULL);
#line 58 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon = NULL;
-#line 249 "Resources.c"
+#line 274 "Resources.c"
{
GdkPixbuf* _tmp0_ = NULL;
- const gchar* _tmp1_;
+ GdkPixbuf* _tmp1_;
GdkPixbuf* _tmp2_;
- GdkPixbuf* _tmp3_;
-#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp1_ = resource_path;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp2_ = gdk_pixbuf_new_from_resource (_tmp1_, &_inner_error_);
+ _tmp1_ = gdk_pixbuf_new_from_resource (resource_path, &_inner_error_);
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp0_ = _tmp2_;
+ _tmp0_ = _tmp1_;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 263 "Resources.c"
+#line 285 "Resources.c"
goto __catch5_g_error;
}
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp3_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_tmp0_ = NULL;
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon = _tmp3_;
+ icon = _tmp2_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (_tmp0_);
-#line 276 "Resources.c"
+#line 298 "Resources.c"
}
goto __finally5;
__catch5_g_error:
{
GError* _error_ = NULL;
- const gchar* _tmp4_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_error_ = _inner_error_;
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_inner_error_ = NULL;
#line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp4_ = resource_path;
-#line 62 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- g_warning ("Resources.vala:62: Couldn't load icon set from %s", _tmp4_);
+ g_warning ("Resources.vala:62: Couldn't load icon set from %s", resource_path);
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_error_free0 (_error_);
-#line 293 "Resources.c"
+#line 312 "Resources.c"
}
__finally5:
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -323,80 +342,84 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
g_clear_error (&_inner_error_);
#line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return NULL;
-#line 306 "Resources.c"
+#line 325 "Resources.c"
}
#line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp5_ = icon;
+ _tmp3_ = icon;
#line 65 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- if (_tmp5_ != NULL) {
-#line 312 "Resources.c"
+ if (_tmp3_ != NULL) {
+#line 331 "Resources.c"
GdkPixbuf** icon_pixbuf_set = NULL;
- GdkPixbuf** _tmp6_;
+ GdkPixbuf** _tmp4_;
gint icon_pixbuf_set_length1;
gint _icon_pixbuf_set_size_;
- GdkPixbuf** _tmp7_;
- gint _tmp7__length1;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
- GdkPixbuf** _tmp10_;
- gint _tmp10__length1;
+ GdkPixbuf** _tmp5_;
+ gint _tmp5__length1;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+ GdkPixbuf** _tmp8_;
+ gint _tmp8__length1;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp6_ = g_new0 (GdkPixbuf*, 0 + 1);
+ _tmp4_ = g_new0 (GdkPixbuf*, 0 + 1);
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- icon_pixbuf_set = _tmp6_;
+ icon_pixbuf_set = _tmp4_;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
icon_pixbuf_set_length1 = 0;
#line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_icon_pixbuf_set_size_ = icon_pixbuf_set_length1;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7_ = icon_pixbuf_set;
+ _tmp5_ = icon_pixbuf_set;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp7__length1 = icon_pixbuf_set_length1;
+ _tmp5__length1 = icon_pixbuf_set_length1;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp8_ = icon;
+ _tmp6_ = icon;
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp9_ = _g_object_ref0 (_tmp8_);
+ _tmp7_ = _g_object_ref0 (_tmp6_);
#line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _vala_array_add3 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp9_);
+ _vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp7_);
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10_ = icon_pixbuf_set;
+ _tmp8_ = icon_pixbuf_set;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp10__length1 = icon_pixbuf_set_length1;
+ _tmp8__length1 = icon_pixbuf_set_length1;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp10__length1;
-#line 349 "Resources.c"
+ *result_length1 = _tmp8__length1;
+#line 368 "Resources.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp10_;
+ result = _tmp8_;
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 357 "Resources.c"
+#line 376 "Resources.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11_ = NULL;
+ _tmp9_ = NULL;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- _tmp11__length1 = 0;
+ _tmp9__length1 = 0;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
if (result_length1) {
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- *result_length1 = _tmp11__length1;
-#line 367 "Resources.c"
+ *result_length1 = _tmp9__length1;
+#line 386 "Resources.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
_g_object_unref0 (icon);
#line 71 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
return result;
-#line 375 "Resources.c"
+#line 394 "Resources.c"
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -408,7 +431,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index 8b6c4c9..dd556c2 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -1,4 +1,4 @@
-/* WebAuthenticationPane.c generated by valac 0.36.6, the Vala compiler
+/* WebAuthenticationPane.c generated by valac 0.40.4, the Vala compiler
* generated from WebAuthenticationPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include "shotwell-plugin-dev-1.0.h"
@@ -27,6 +28,13 @@
typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+enum {
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_0_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -52,19 +60,22 @@ static SpitPublishingDialogPaneIface * shotwell_plugins_common_web_authenticatio
GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate))
-enum {
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY,
- SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY
-};
static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base);
-static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event);
-static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self,
+ WebKitLoadEvent load_event);
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender,
+ WebKitLoadEvent load_event,
+ gpointer self);
static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender,
+ WebKitContextMenu* context_menu,
+ GdkEvent* event,
+ WebKitHitTestResult* hit_test_result,
+ gpointer self);
void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+ GdkCursorType type);
WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
@@ -73,40 +84,62 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
-static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value);
-static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value);
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self,
+ SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self,
+ const gchar* value);
static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj);
-static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-
-static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
+
+
+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 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
-#line 87 "WebAuthenticationPane.c"
+#line 110 "WebAuthenticationPane.c"
}
-static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
+static gboolean
+__lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
gboolean result = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 97 "WebAuthenticationPane.c"
+#line 122 "WebAuthenticationPane.c"
}
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+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 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 106 "WebAuthenticationPane.c"
+#line 137 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -139,36 +172,45 @@ static void shotwell_plugins_common_web_authentication_pane_real_constructed (GO
_tmp4_ = self->priv->webview;
#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 143 "WebAuthenticationPane.c"
+#line 176 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
#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 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return;
-#line 152 "WebAuthenticationPane.c"
+#line 187 "WebAuthenticationPane.c"
}
-void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+void
+shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
-#line 161 "WebAuthenticationPane.c"
+#line 198 "WebAuthenticationPane.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self ? g_object_ref (self) : NULL;
-#line 168 "WebAuthenticationPane.c"
+#line 207 "WebAuthenticationPane.c"
}
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
+void
+shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+ GdkCursorType type)
+{
GdkWindow* window = NULL;
WebKitWebView* _tmp0_;
GdkWindow* _tmp1_;
@@ -177,8 +219,7 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
GdkDisplay* _tmp3_;
GdkDisplay* _tmp4_;
GdkCursor* cursor = NULL;
- GdkCursorType _tmp5_;
- GdkCursor* _tmp6_;
+ GdkCursor* _tmp5_;
#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -196,11 +237,9 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
display = _tmp4_;
#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp5_ = type;
+ _tmp5_ = gdk_cursor_new_for_display (display, type);
#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
-#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- cursor = _tmp6_;
+ cursor = _tmp5_;
#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"
@@ -209,33 +248,33 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
_g_object_unref0 (display);
#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (window);
-#line 213 "WebAuthenticationPane.c"
+#line 252 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
- WebKitLoadEvent _tmp0_;
+static void
+shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self,
+ WebKitLoadEvent load_event)
+{
#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = load_event;
-#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- switch (_tmp0_) {
+ switch (load_event) {
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_STARTED:
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_REDIRECTED:
-#line 229 "WebAuthenticationPane.c"
+#line 268 "WebAuthenticationPane.c"
{
#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 235 "WebAuthenticationPane.c"
+#line 274 "WebAuthenticationPane.c"
}
#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_FINISHED:
-#line 239 "WebAuthenticationPane.c"
+#line 278 "WebAuthenticationPane.c"
{
#line 44 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
@@ -243,19 +282,21 @@ static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed
shotwell_plugins_common_web_authentication_pane_on_page_load (self);
#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 247 "WebAuthenticationPane.c"
+#line 286 "WebAuthenticationPane.c"
}
default:
{
#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 253 "WebAuthenticationPane.c"
+#line 292 "WebAuthenticationPane.c"
}
}
}
-WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) {
+WebKitWebView*
+shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
WebKitWebView* result = NULL;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -269,11 +310,13 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
result = _tmp1_;
#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 273 "WebAuthenticationPane.c"
+#line 314 "WebAuthenticationPane.c"
}
-static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+static SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
@@ -285,11 +328,13 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe
result = _tmp0_;
#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 289 "WebAuthenticationPane.c"
+#line 332 "WebAuthenticationPane.c"
}
-static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+static GtkWidget*
+shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
GtkWidget* result = NULL;
WebKitWebView* _tmp0_;
@@ -304,11 +349,13 @@ static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widge
result = _tmp1_;
#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 308 "WebAuthenticationPane.c"
+#line 353 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
WebKitWebView* _tmp0_;
WebKitWebView* _tmp1_;
@@ -333,29 +380,35 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
_g_free0 (_tmp4_);
#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (_tmp1_);
-#line 337 "WebAuthenticationPane.c"
+#line 384 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+static void
+shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
#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 345 "WebAuthenticationPane.c"
+#line 394 "WebAuthenticationPane.c"
}
-ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type) {
+ShotwellPluginsCommonWebAuthenticationPane*
+shotwell_plugins_common_web_authentication_pane_construct (GType object_type)
+{
ShotwellPluginsCommonWebAuthenticationPane * self = NULL;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self;
-#line 355 "WebAuthenticationPane.c"
+#line 406 "WebAuthenticationPane.c"
}
-SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) {
+SpitPublishingDialogPaneGeometryOptions
+shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
SpitPublishingDialogPaneGeometryOptions result;
SpitPublishingDialogPaneGeometryOptions _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -366,29 +419,30 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati
result = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 370 "WebAuthenticationPane.c"
+#line 423 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+static void
+shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self,
+ SpitPublishingDialogPaneGeometryOptions value)
+{
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
if (shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self) != value) {
-#line 379 "WebAuthenticationPane.c"
- SpitPublishingDialogPaneGeometryOptions _tmp0_;
-#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- self->priv->_preferred_geometry = _tmp0_;
+ self->priv->_preferred_geometry = value;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_notify ((GObject *) self, "preferred-geometry");
-#line 387 "WebAuthenticationPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY]);
+#line 439 "WebAuthenticationPane.c"
}
}
-gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) {
+gchar*
+shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self)
+{
gchar* result;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -402,34 +456,36 @@ 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 406 "WebAuthenticationPane.c"
+#line 460 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) {
+static void
+shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self,
+ const gchar* value)
+{
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
if (g_strcmp0 (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self)) != 0) {
-#line 415 "WebAuthenticationPane.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = value;
+#line 472 "WebAuthenticationPane.c"
+ gchar* _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_free0 (self->priv->_login_uri);
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- self->priv->_login_uri = _tmp1_;
+ self->priv->_login_uri = _tmp0_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_notify ((GObject *) self, "login-uri");
-#line 428 "WebAuthenticationPane.c"
+ g_object_notify_by_pspec ((GObject *) self, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY]);
+#line 482 "WebAuthenticationPane.c"
}
}
-static void shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass) {
+static void
+shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -445,14 +501,16 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize;
#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_PREFERRED_GEOMETRY_PROPERTY, 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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY] = 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_STRINGS | 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_PROPERTY, 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 452 "WebAuthenticationPane.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY, shotwell_plugins_common_web_authentication_pane_properties[SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY] = g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 508 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+static void
+shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -463,20 +521,24 @@ 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 467 "WebAuthenticationPane.c"
+#line 525 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self) {
+static void
+shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self)
+{
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
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 476 "WebAuthenticationPane.c"
+#line 536 "WebAuthenticationPane.c"
}
-static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj) {
+static void
+shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
@@ -486,11 +548,13 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject *
_g_object_unref0 (self->priv->webview);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
-#line 490 "WebAuthenticationPane.c"
+#line 552 "WebAuthenticationPane.c"
}
-GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
+GType
+shotwell_plugins_common_web_authentication_pane_get_type (void)
+{
static volatile gsize shotwell_plugins_common_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&shotwell_plugins_common_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonWebAuthenticationPane), 0, (GInstanceInitFunc) shotwell_plugins_common_web_authentication_pane_instance_init, NULL };
@@ -504,7 +568,12 @@ GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
}
-static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -521,18 +590,23 @@ 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 525 "WebAuthenticationPane.c"
+#line 594 "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 531 "WebAuthenticationPane.c"
+#line 600 "WebAuthenticationPane.c"
}
}
-static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
ShotwellPluginsCommonWebAuthenticationPane * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -549,13 +623,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 553 "WebAuthenticationPane.c"
+#line 627 "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 559 "WebAuthenticationPane.c"
+#line 633 "WebAuthenticationPane.c"
}
}
diff --git a/plugins/common/meson.build b/plugins/common/meson.build
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/plugins/common/meson.build
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 00:03:08 +0000