summaryrefslogtreecommitdiff
path: root/plugins/common/RESTSupport.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
commit059a62ee3c820a42fbce980c3256049adecc9100 (patch)
treee51eab94fd7d65459640ca227fb2257bb41d2acb /plugins/common/RESTSupport.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plugins/common/RESTSupport.c')
-rw-r--r--plugins/common/RESTSupport.c4673
1 files changed, 2525 insertions, 2148 deletions
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index dcae2ed..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 ())
@@ -79,9 +80,9 @@ 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,131 +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);
-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);
+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);
@@ -548,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);
@@ -574,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;
@@ -607,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 638 "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 644 "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"
@@ -670,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;
-#line 18 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = string_get_data (_tmp0_, &_tmp1__length1);
+ _tmp0_ = string_get_data (key, &_tmp0__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 706 "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 738 "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 752 "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 761 "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 773 "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 783 "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 792 "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_;
@@ -807,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 810 "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));
@@ -821,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 824 "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"
@@ -836,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 839 "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 846 "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 867 "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);
-#line 72 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = self->priv->soup_session;
+ 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"
- _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 885 "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"
@@ -899,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 902 "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 909 "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 918 "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 928 "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 932 "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 940 "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 947 "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 954 "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 958 "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 962 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 966 "RESTSupport.c"
+#line 1115 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 970 "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 981 "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 987 "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 991 "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 995 "RESTSupport.c"
+#line 1149 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 999 "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);
@@ -1010,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 1013 "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 1022 "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));
@@ -1039,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 1042 "RESTSupport.c"
+#line 1207 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1046 "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 1052 "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));
@@ -1068,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 1071 "RESTSupport.c"
+#line 1239 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1075 "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 1081 "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"
@@ -1098,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 1101 "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"
@@ -1113,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 1116 "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);
@@ -1127,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 1130 "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 };
@@ -1145,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 1155 "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"
@@ -1165,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 1168 "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 1179 "RESTSupport.c"
+#line 1361 "RESTSupport.c"
{
gchar* _tmp0_;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1185,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 1188 "RESTSupport.c"
+#line 1370 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1192 "RESTSupport.c"
+#line 1374 "RESTSupport.c"
{
gchar* _tmp1_;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1198,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 1201 "RESTSupport.c"
+#line 1383 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1205 "RESTSupport.c"
+#line 1387 "RESTSupport.c"
{
gchar* _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1211,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 1214 "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 1220 "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 1239 "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 1250 "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 1261 "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 1268 "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}};
@@ -1284,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"
@@ -1297,167 +1473,158 @@ 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 1317 "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 1324 "RESTSupport.c"
+#line 1499 "RESTSupport.c"
}
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+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 1331 "RESTSupport.c"
+#line 1508 "RESTSupport.c"
}
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator) {
+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_;
- PublishingRESTSupportArgument** _tmp1_;
- gint _tmp1__length1;
- GString* _tmp10_;
- gssize _tmp11_;
- GString* _tmp18_;
- const gchar* _tmp19_;
- gchar* _tmp20_;
+ 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 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = args;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = args_length1;
-#line 1354 "RESTSupport.c"
+#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 = _tmp1_;
+ arg_collection = args;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection_length1 = _tmp1__length1;
+ arg_collection_length1 = args_length1;
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1366 "RESTSupport.c"
- PublishingRESTSupportArgument* _tmp2_;
+ 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"
- _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg = _tmp2_;
-#line 1373 "RESTSupport.c"
+ arg = _tmp1_;
+#line 1549 "RESTSupport.c"
{
- GString* _tmp3_;
- PublishingRESTSupportArgument* _tmp4_;
- gboolean _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- GString* _tmp8_;
- const gchar* _tmp9_;
-#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = builder;
+ GString* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ GString* _tmp6_;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = arg;
+ _tmp2_ = builder;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = escape;
+ _tmp3_ = arg;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_argument_to_string (_tmp4_, _tmp5_);
+ _tmp4_ = publishing_rest_support_argument_to_string (_tmp3_, escape);
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp3_, _tmp7_);
+ g_string_append (_tmp2_, _tmp5_);
#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp5_);
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = builder;
+ _tmp6_ = builder;
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = separator;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp8_, _tmp9_);
+ g_string_append (_tmp6_, separator);
#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1404 "RESTSupport.c"
+#line 1574 "RESTSupport.c"
}
}
}
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = builder;
+ _tmp7_ = builder;
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_->len;
+ _tmp8_ = _tmp7_->len;
#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp11_ > ((gssize) 0)) {
-#line 1414 "RESTSupport.c"
- GString* _tmp12_;
- GString* _tmp13_;
- gssize _tmp14_;
- const gchar* _tmp15_;
- gint _tmp16_;
- gint _tmp17_;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = builder;
+ 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"
- _tmp13_ = builder;
+ _tmp9_ = builder;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = _tmp13_->len;
+ _tmp10_ = builder;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = separator;
+ _tmp11_ = _tmp10_->len;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = strlen (_tmp15_);
+ _tmp12_ = strlen (separator);
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = _tmp16_;
+ _tmp13_ = _tmp12_;
#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_truncate (_tmp12_, (gsize) (_tmp14_ - _tmp17_));
-#line 1435 "RESTSupport.c"
+ g_string_truncate (_tmp9_, (gsize) (_tmp11_ - _tmp13_));
+#line 1602 "RESTSupport.c"
}
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = builder;
+ _tmp14_ = builder;
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp18_->str;
+ _tmp15_ = _tmp14_->str;
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = g_strdup (_tmp19_);
+ _tmp16_ = g_strdup (_tmp15_);
#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp20_;
+ 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 1449 "RESTSupport.c"
+#line 1616 "RESTSupport.c"
}
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2) {
+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 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1465,257 +1632,275 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = arg1;
+ _tmp1_ = arg1->key;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->key;
+ _tmp2_ = arg2->key;
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = arg2;
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->key;
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
+ result = _tmp0_ (_tmp1_, _tmp2_);
#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1481 "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 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1490 "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;
+ 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 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
sorted_args = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = inputArray;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = inputArray_length1;
-#line 1513 "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 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection = _tmp1_;
+ arg_collection = inputArray;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg_collection_length1 = _tmp1__length1;
+ arg_collection_length1 = inputArray_length1;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1525 "RESTSupport.c"
- PublishingRESTSupportArgument* _tmp2_;
+ for (arg_it = 0; arg_it < inputArray_length1; arg_it = arg_it + 1) {
+#line 1688 "RESTSupport.c"
+ PublishingRESTSupportArgument* _tmp1_;
PublishingRESTSupportArgument* arg = NULL;
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+ _tmp1_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- arg = _tmp2_;
-#line 1532 "RESTSupport.c"
+ arg = _tmp1_;
+#line 1695 "RESTSupport.c"
{
- GeeTreeSet* _tmp3_;
- PublishingRESTSupportArgument* _tmp4_;
+ GeeTreeSet* _tmp2_;
+ PublishingRESTSupportArgument* _tmp3_;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = sorted_args;
+ _tmp2_ = sorted_args;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = arg;
+ _tmp3_ = arg;
#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
+ 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 1544 "RESTSupport.c"
+#line 1707 "RESTSupport.c"
}
}
}
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = sorted_args;
+ _tmp4_ = sorted_args;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
+ _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"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__length1 = _tmp6_;
+ _tmp7__length1 = _tmp5_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- *result_length1 = _tmp8__length1;
-#line 1560 "RESTSupport.c"
+ *result_length1 = _tmp7__length1;
+#line 1723 "RESTSupport.c"
}
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (sorted_args);
#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1568 "RESTSupport.c"
+#line 1731 "RESTSupport.c"
}
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape) {
+gchar*
+publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+ gboolean escape)
+{
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_;
- const gchar* _tmp4_;
- const gchar* _tmp5_;
- gchar* _tmp6_;
+ 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 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = escape;
-#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_) {
+ if (escape) {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = "\"";
-#line 1589 "RESTSupport.c"
+#line 1751 "RESTSupport.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = "";
-#line 1593 "RESTSupport.c"
+#line 1755 "RESTSupport.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = escape;
+ if (escape) {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_) {
-#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = "\"";
-#line 1601 "RESTSupport.c"
+ _tmp1_ = "\"";
+#line 1761 "RESTSupport.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = "";
-#line 1605 "RESTSupport.c"
+ _tmp1_ = "";
+#line 1765 "RESTSupport.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->key;
+ _tmp2_ = self->key;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = self->value;
+ _tmp3_ = self->value;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_strdup_printf ("%s=%s%s%s", _tmp4_, _tmp0_, _tmp5_, _tmp2_);
+ _tmp4_ = g_strdup_printf ("%s=%s%s%s", _tmp2_, _tmp0_, _tmp3_, _tmp1_);
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp6_;
+ result = _tmp4_;
#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1617 "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 1624 "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 1633 "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 1643 "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 1647 "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 1655 "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 1662 "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 1669 "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 1673 "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 1677 "RESTSupport.c"
+#line 1851 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1681 "RESTSupport.c"
+#line 1855 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1685 "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 1696 "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 1702 "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 1706 "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 1710 "RESTSupport.c"
+#line 1889 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1714 "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);
@@ -1725,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 1728 "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 1737 "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));
@@ -1754,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 1757 "RESTSupport.c"
+#line 1947 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1761 "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 1767 "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));
@@ -1783,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 1786 "RESTSupport.c"
+#line 1979 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1790 "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 1796 "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 1806 "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 1813 "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);
@@ -1824,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 1827 "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 };
@@ -1842,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 1852 "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"
@@ -1862,99 +2067,99 @@ 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 1865 "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) {
+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 1873 "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_;
+ 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 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
+ _tmp0_ = publishing_rest_support_session_get_endpoint_url (parent_session);
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
+ _vala_assert (_tmp1_ != NULL, "parent_session.get_endpoint_url() != null");
#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = parent_session;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp3_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = method;
+ self->priv->parent_session = parent_session;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
+ _tmp2_ = publishing_rest_support_http_method_to_string (method);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = parent_session;
+ _tmp3_ = _tmp2_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
+ _tmp4_ = publishing_rest_support_session_get_endpoint_url (parent_session);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = _tmp4_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = soup_message_new (_tmp6_, _tmp9_);
+ _tmp6_ = soup_message_new (_tmp3_, _tmp5_);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp10_;
+ self->priv->message = _tmp6_;
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp5_);
#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp3_);
#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = self->priv->message;
+ _tmp7_ = self->priv->message;
#line 181 "/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);
+ 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 1937 "RESTSupport.c"
+#line 2138 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
+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 1944 "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_;
+ 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 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1962,54 +2167,52 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent_session;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->parent_session = _tmp0_;
+ self->priv->parent_session = parent_session;
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (endpoint_url);
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->endpoint_url = _tmp2_;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = method;
+ self->priv->endpoint_url = _tmp0_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
+ _tmp1_ = publishing_rest_support_http_method_to_string (method);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = endpoint_url;
+ _tmp2_ = _tmp1_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = soup_message_new (_tmp5_, _tmp6_);
+ _tmp3_ = soup_message_new (_tmp2_, endpoint_url);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp7_;
+ self->priv->message = _tmp3_;
#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp2_);
#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1994 "RESTSupport.c"
+#line 2191 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
+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 2001 "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_;
+ 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 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2017,35 +2220,37 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->bytes_written;
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = written_data;
+ _tmp1_ = written_data->length;
#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->length;
-#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
+ self->priv->bytes_written = _tmp0_ + ((gint) _tmp1_);
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->bytes_written;
+ _tmp2_ = self->priv->bytes_written;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->message;
+ _tmp3_ = self->priv->message;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_->request_body;
+ _tmp4_ = _tmp3_->request_body;
#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->length;
+ _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, _tmp3_, (gint) _tmp6_);
-#line 2035 "RESTSupport.c"
+ 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) {
+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 2042 "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 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
@@ -2054,24 +2259,19 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = message;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ != _tmp1_) {
+ if (_tmp0_ != message) {
#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2062 "RESTSupport.c"
+#line 2265 "RESTSupport.c"
}
{
- SoupMessage* _tmp2_;
-#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = message;
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
+ 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 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2074 "RESTSupport.c"
+#line 2274 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2080,48 +2280,48 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2083 "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_;
+ 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 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = err;
+ _tmp1_ = err;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->message;
+ _tmp2_ = _tmp1_->message;
#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp4_);
+ g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp2_);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_transaction_get_response (self);
+ _tmp3_ = publishing_rest_support_transaction_get_response (self);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp6_);
+ g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp4_);
#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp4_);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = err;
+ _tmp5_ = err;
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _g_error_copy0 (_tmp7_);
+ _tmp6_ = _g_error_copy0 (_tmp5_);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->err = _tmp8_;
+ self->priv->err = _tmp6_;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 2124 "RESTSupport.c"
+#line 2324 "RESTSupport.c"
}
__finally0:
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2132,19 +2332,24 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2135 "RESTSupport.c"
+#line 2335 "RESTSupport.c"
}
}
-static gpointer _g_object_ref0 (gpointer self) {
+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 2143 "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;
@@ -2191,92 +2396,92 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp5_ = tls_errors;
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2194 "RESTSupport.c"
+#line 2399 "RESTSupport.c"
GeeArrayList* _tmp6_;
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = list;
#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 2200 "RESTSupport.c"
+#line 2405 "RESTSupport.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = tls_errors;
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2206 "RESTSupport.c"
+#line 2411 "RESTSupport.c"
GeeArrayList* _tmp8_;
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = list;
#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 2212 "RESTSupport.c"
+#line 2417 "RESTSupport.c"
}
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = tls_errors;
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2218 "RESTSupport.c"
+#line 2423 "RESTSupport.c"
GeeArrayList* _tmp10_;
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = list;
#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 2224 "RESTSupport.c"
+#line 2429 "RESTSupport.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = tls_errors;
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2230 "RESTSupport.c"
+#line 2435 "RESTSupport.c"
GeeArrayList* _tmp12_;
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = list;
#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 2236 "RESTSupport.c"
+#line 2441 "RESTSupport.c"
}
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = tls_errors;
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2242 "RESTSupport.c"
+#line 2447 "RESTSupport.c"
GeeArrayList* _tmp14_;
#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = list;
#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 2248 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
}
#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = tls_errors;
#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2254 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
GeeArrayList* _tmp16_;
#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = list;
#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 2260 "RESTSupport.c"
+#line 2465 "RESTSupport.c"
}
#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = tls_errors;
#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2266 "RESTSupport.c"
+#line 2471 "RESTSupport.c"
GeeArrayList* _tmp18_;
#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = list;
#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 2272 "RESTSupport.c"
+#line 2477 "RESTSupport.c"
}
#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_string_new ("");
@@ -2290,7 +2495,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp22_ = _tmp21_;
#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp22_ == 1) {
-#line 2286 "RESTSupport.c"
+#line 2491 "RESTSupport.c"
GString* _tmp23_;
GeeArrayList* _tmp24_;
gpointer _tmp25_;
@@ -2307,7 +2512,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append (_tmp23_, _tmp26_);
#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
-#line 2303 "RESTSupport.c"
+#line 2508 "RESTSupport.c"
} else {
{
GeeArrayList* _entry_list = NULL;
@@ -2336,7 +2541,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_entry_index = -1;
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2332 "RESTSupport.c"
+#line 2537 "RESTSupport.c"
gint _tmp32_;
gint _tmp33_;
gint _tmp34_;
@@ -2358,7 +2563,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (!(_tmp33_ < _tmp34_)) {
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2354 "RESTSupport.c"
+#line 2559 "RESTSupport.c"
}
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = _entry_list;
@@ -2376,11 +2581,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append_printf (_tmp38_, "%s\n", _tmp39_);
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (entry);
-#line 2372 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
}
#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_entry_list);
-#line 2376 "RESTSupport.c"
+#line 2581 "RESTSupport.c"
}
}
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2399,88 +2604,85 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (cert) {
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*cert = _vala_cert;
-#line 2395 "RESTSupport.c"
+#line 2600 "RESTSupport.c"
} else {
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 2399 "RESTSupport.c"
+#line 2604 "RESTSupport.c"
}
#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2403 "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 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
+ g_object_get (message, "status-code", &_tmp0_, NULL);
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- switch (_tmp2_) {
+ switch (_tmp1_) {
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_OK:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2433 "RESTSupport.c"
+#line 2638 "RESTSupport.c"
{
#line 267 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2437 "RESTSupport.c"
+#line 2642 "RESTSupport.c"
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2443 "RESTSupport.c"
+#line 2648 "RESTSupport.c"
{
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- SoupMessage* _tmp5_;
- guint _tmp6_;
- guint _tmp7_;
- GError* _tmp8_;
- GError* _tmp9_;
+ guint _tmp4_;
+ guint _tmp5_;
+ GError* _tmp6_;
+ GError* _tmp7_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp2_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = message;
+ g_object_get (message, "status-code", &_tmp4_, NULL);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
+ _tmp5_ = _tmp4_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _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"
- _tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = _tmp6_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp9_;
+ _inner_error_ = _tmp7_;
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2476 "RESTSupport.c"
+#line 2678 "RESTSupport.c"
} else {
#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);
@@ -2488,47 +2690,44 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2484 "RESTSupport.c"
+#line 2686 "RESTSupport.c"
}
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2491 "RESTSupport.c"
+#line 2693 "RESTSupport.c"
{
- gchar* _tmp10_;
- gchar* _tmp11_;
- SoupMessage* _tmp12_;
- guint _tmp13_;
- guint _tmp14_;
- GError* _tmp15_;
- GError* _tmp16_;
-#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ guint _tmp10_;
+ guint _tmp11_;
+ GError* _tmp12_;
+ GError* _tmp13_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = message;
+ _tmp9_ = _tmp8_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
+ g_object_get (message, "status-code", &_tmp10_, NULL);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 276 "/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_);
+ _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"
- _tmp16_ = _tmp15_;
+ _tmp13_ = _tmp12_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp9_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp16_;
+ _inner_error_ = _tmp13_;
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2524 "RESTSupport.c"
+#line 2723 "RESTSupport.c"
} else {
#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);
@@ -2536,36 +2735,36 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2532 "RESTSupport.c"
+#line 2731 "RESTSupport.c"
}
}
#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2537 "RESTSupport.c"
+#line 2736 "RESTSupport.c"
{
- gchar* _tmp17_;
- gchar* _tmp18_;
- GError* _tmp19_;
- GError* _tmp20_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GError* _tmp16_;
+ GError* _tmp17_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp14_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = _tmp14_;
#line 279 "/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_);
+ _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"
- _tmp20_ = _tmp19_;
+ _tmp17_ = _tmp16_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp15_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp20_;
+ _inner_error_ = _tmp17_;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2561 "RESTSupport.c"
+#line 2760 "RESTSupport.c"
} else {
#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);
@@ -2573,69 +2772,60 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2569 "RESTSupport.c"
+#line 2768 "RESTSupport.c"
}
}
default:
{
- SoupMessage* _tmp21_;
- guint _tmp22_;
- guint _tmp23_;
+ guint _tmp18_;
+ guint _tmp19_;
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = message;
+ g_object_get (message, "status-code", &_tmp18_, NULL);
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = _tmp18_;
#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp23_ >= ((guint) 100)) {
-#line 2585 "RESTSupport.c"
+ 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 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = _tmp24_;
+ gchar* _tmp26_;
+ GError* _tmp27_;
+ GError* _tmp28_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message;
+ _tmp20_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
+ _tmp21_ = _tmp20_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = _tmp27_;
+ g_object_get (message, "status-code", &_tmp22_, NULL);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = message;
+ _tmp23_ = _tmp22_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
+ g_object_get (message, "reason-phrase", &_tmp24_, NULL);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
+ _tmp25_ = _tmp24_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = _tmp31_;
+ _tmp26_ = _tmp25_;
#line 285 "/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_);
+ _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"
- _tmp34_ = _tmp33_;
+ _tmp28_ = _tmp27_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp26_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp25_);
+ _g_free0 (_tmp21_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp34_;
+ _inner_error_ = _tmp28_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2631 "RESTSupport.c"
+#line 2821 "RESTSupport.c"
} else {
#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);
@@ -2643,41 +2833,38 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2639 "RESTSupport.c"
+#line 2829 "RESTSupport.c"
}
} else {
- gchar* _tmp35_;
- gchar* _tmp36_;
- SoupMessage* _tmp37_;
- guint _tmp38_;
- guint _tmp39_;
- GError* _tmp40_;
- GError* _tmp41_;
-#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ guint _tmp31_;
+ guint _tmp32_;
+ GError* _tmp33_;
+ GError* _tmp34_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _tmp35_;
+ _tmp29_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = message;
+ _tmp30_ = _tmp29_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
+ g_object_get (message, "status-code", &_tmp31_, NULL);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = _tmp38_;
+ _tmp32_ = _tmp31_;
#line 288 "/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_);
+ _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"
- _tmp41_ = _tmp40_;
+ _tmp34_ = _tmp33_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp36_);
+ _g_free0 (_tmp30_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp41_;
+ _inner_error_ = _tmp34_;
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2673 "RESTSupport.c"
+#line 2860 "RESTSupport.c"
} else {
#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);
@@ -2685,67 +2872,62 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2681 "RESTSupport.c"
+#line 2868 "RESTSupport.c"
}
}
}
}
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = message;
+ _tmp36_ = message->response_body;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_->response_body;
+ _tmp37_ = _tmp36_->data;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = _tmp44_->data;
+ _tmp37__length1 = (gint) _tmp36_->length;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45__length1 = (gint) _tmp44_->length;
+ if (_tmp37_ == NULL) {
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp45_ == NULL) {
-#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = TRUE;
-#line 2698 "RESTSupport.c"
+ _tmp35_ = TRUE;
+#line 2883 "RESTSupport.c"
} else {
- SoupMessage* _tmp46_;
- SoupMessageBody* _tmp47_;
- guint8* _tmp48_;
- gint _tmp48__length1;
-#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = message;
+ SoupMessageBody* _tmp38_;
+ guint8* _tmp39_;
+ gint _tmp39__length1;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_->response_body;
+ _tmp38_ = message->response_body;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = _tmp47_->data;
+ _tmp39_ = _tmp38_->data;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48__length1 = (gint) _tmp47_->length;
+ _tmp39__length1 = (gint) _tmp38_->length;
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp48__length1 == 0;
-#line 2714 "RESTSupport.c"
+ _tmp35_ = _tmp39__length1 == 0;
+#line 2896 "RESTSupport.c"
}
#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp42_) {
-#line 2718 "RESTSupport.c"
- gchar* _tmp49_;
- gchar* _tmp50_;
- GError* _tmp51_;
- GError* _tmp52_;
+ if (_tmp35_) {
+#line 2900 "RESTSupport.c"
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+ GError* _tmp42_;
+ GError* _tmp43_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp40_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = _tmp49_;
+ _tmp41_ = _tmp40_;
#line 295 "/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_);
+ _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"
- _tmp52_ = _tmp51_;
+ _tmp43_ = _tmp42_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp50_);
+ _g_free0 (_tmp41_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp52_;
+ _inner_error_ = _tmp43_;
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2741 "RESTSupport.c"
+#line 2923 "RESTSupport.c"
} else {
#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);
@@ -2753,34 +2935,40 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2749 "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 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2762 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_;
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2768 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
}
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2772 "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;
@@ -2806,17 +2994,20 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
if (result_length1) {
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2802 "RESTSupport.c"
+#line 2990 "RESTSupport.c"
}
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2808 "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_;
@@ -2852,36 +3043,43 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
if (result_length1) {
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2848 "RESTSupport.c"
+#line 3039 "RESTSupport.c"
}
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2854 "RESTSupport.c"
+#line 3045 "RESTSupport.c"
}
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
- gboolean _tmp0_;
+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 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = is_executed;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->is_executed = _tmp0_;
-#line 2866 "RESTSupport.c"
+ 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) {
+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 2873 "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_;
@@ -2925,23 +3123,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
_tmp8_ = self->priv->err;
#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2921 "RESTSupport.c"
+#line 3119 "RESTSupport.c"
GError* _tmp9_;
#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
#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 2927 "RESTSupport.c"
+#line 3125 "RESTSupport.c"
} else {
#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 2931 "RESTSupport.c"
+#line 3129 "RESTSupport.c"
}
#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2937 "RESTSupport.c"
+#line 3135 "RESTSupport.c"
GError* _tmp11_;
GError* _tmp12_;
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2956,7 +3154,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_propagate_error (error, _inner_error_);
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2952 "RESTSupport.c"
+#line 3150 "RESTSupport.c"
} else {
#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);
@@ -2964,20 +3162,21 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_clear_error (&_inner_error_);
#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2960 "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 328 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2991,22 +3190,22 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2994 "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 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3016,125 +3215,110 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_->request_headers;
#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = key;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3017 "RESTSupport.c"
+ 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) {
+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 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3026 "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_;
+ 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 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (payload_content_type != NULL);
#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = custom_payload;
+ _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 (_tmp1_ == NULL) {
+ if (custom_payload == NULL) {
#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = FALSE;
#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3060 "RESTSupport.c"
+#line 3255 "RESTSupport.c"
}
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = payload_length;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_ > ((gulong) 0)) {
-#line 3066 "RESTSupport.c"
- gulong _tmp4_;
+ if (payload_length > ((gulong) 0)) {
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = payload_length;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp4_;
-#line 3072 "RESTSupport.c"
+ _tmp0_ = payload_length;
+#line 3261 "RESTSupport.c"
} else {
- const gchar* _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = custom_payload;
+ gint _tmp1_;
+ gint _tmp2_;
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = strlen (_tmp5_);
+ _tmp1_ = strlen (custom_payload);
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp2_ = _tmp1_;
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gulong) _tmp7_;
-#line 3085 "RESTSupport.c"
+ _tmp0_ = (gulong) _tmp2_;
+#line 3271 "RESTSupport.c"
}
#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- length = _tmp2_;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->message;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = payload_content_type;
+ length = _tmp0_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = custom_payload;
+ _tmp3_ = self->priv->message;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
+ _tmp4_ = string_get_data (custom_payload, &_tmp4__length1);
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = _tmp11_;
+ _tmp5_ = _tmp4_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12__length1 = _tmp11__length1;
+ _tmp5__length1 = _tmp4__length1;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = length;
+ _tmp6_ = length;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
+ 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 3107 "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 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = message;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (message);
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->message = _tmp1_;
-#line 3126 "RESTSupport.c"
+ 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 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3145,52 +3329,54 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
result = _tmp0_;
#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3141 "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 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
+ g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3167 "RESTSupport.c"
+#line 3350 "RESTSupport.c"
}
-static void _vala_SoupURI_free (SoupURI* self) {
+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 3174 "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 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->use_custom_payload;
@@ -3208,7 +3394,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_propagate_error (error, _inner_error_);
#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3204 "RESTSupport.c"
+#line 3390 "RESTSupport.c"
} else {
#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);
@@ -3216,125 +3402,123 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3212 "RESTSupport.c"
+#line 3398 "RESTSupport.c"
}
}
#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3217 "RESTSupport.c"
+#line 3403 "RESTSupport.c"
}
#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishing_rest_support_transaction_get_method (self);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3223 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp2_;
- gint _tmp2__length1;
+ 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"
- _tmp2_ = self->priv->arguments;
+ _tmp1_ = self->priv->arguments;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2__length1 = self->priv->arguments_length1;
+ _tmp1__length1 = self->priv->arguments_length1;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3232 "RESTSupport.c"
+ _vala_assert (_tmp1__length1 > 0, "arguments.length > 0");
+#line 3416 "RESTSupport.c"
}
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = g_strdup ("");
+ _tmp2_ = g_strdup ("");
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp3_;
-#line 3238 "RESTSupport.c"
+ formdata_string = _tmp2_;
+#line 3422 "RESTSupport.c"
{
gint i = 0;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 3243 "RESTSupport.c"
+#line 3427 "RESTSupport.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 3250 "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;
+ gint _tmp14_;
+ PublishingRESTSupportArgument** _tmp15_;
+ gint _tmp15__length1;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 3267 "RESTSupport.c"
- gint _tmp5_;
+ if (!_tmp3_) {
+#line 3451 "RESTSupport.c"
+ gint _tmp4_;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = i;
+ _tmp4_ = i;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- i = _tmp5_ + 1;
-#line 3273 "RESTSupport.c"
+ i = _tmp4_ + 1;
+#line 3457 "RESTSupport.c"
}
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
+ _tmp3_ = FALSE;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = i;
+ _tmp5_ = i;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->arguments;
+ _tmp6_ = self->priv->arguments;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__length1 = self->priv->arguments_length1;
+ _tmp6__length1 = self->priv->arguments_length1;
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp6_ < _tmp7__length1)) {
+ if (!(_tmp5_ < _tmp6__length1)) {
#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 3287 "RESTSupport.c"
+#line 3471 "RESTSupport.c"
}
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = formdata_string;
+ _tmp7_ = formdata_string;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->arguments;
+ _tmp8_ = self->priv->arguments;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9__length1 = self->priv->arguments_length1;
+ _tmp8__length1 = self->priv->arguments_length1;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = i;
+ _tmp9_ = i;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp9_[_tmp10_];
+ _tmp10_ = _tmp8_[_tmp9_];
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = publishing_rest_support_argument_to_string (_tmp11_, FALSE);
+ _tmp11_ = publishing_rest_support_argument_to_string (_tmp10_, FALSE);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
+ _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp14_;
+ formdata_string = _tmp13_;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp12_);
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = i;
+ _tmp14_ = i;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = self->priv->arguments;
+ _tmp15_ = self->priv->arguments;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16__length1 = self->priv->arguments_length1;
+ _tmp15__length1 = self->priv->arguments_length1;
#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3319 "RESTSupport.c"
- const gchar* _tmp17_;
- gchar* _tmp18_;
+ if (_tmp14_ < (_tmp15__length1 - 1)) {
+#line 3503 "RESTSupport.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = formdata_string;
+ _tmp16_ = formdata_string;
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strconcat (_tmp17_, "&", NULL);
+ _tmp17_ = g_strconcat (_tmp16_, "&", NULL);
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- formdata_string = _tmp18_;
-#line 3330 "RESTSupport.c"
+ formdata_string = _tmp17_;
+#line 3514 "RESTSupport.c"
}
}
}
@@ -3344,157 +3528,155 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
#line 404 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
url_with_query = NULL;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = publishing_rest_support_transaction_get_method (self);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3343 "RESTSupport.c"
- PublishingRESTSupportArgument** _tmp21_;
- gint _tmp21__length1;
+ 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"
- _tmp21_ = self->priv->arguments;
+ _tmp19_ = self->priv->arguments;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21__length1 = self->priv->arguments_length1;
+ _tmp19__length1 = self->priv->arguments_length1;
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp21__length1 > 0;
-#line 3352 "RESTSupport.c"
+ _tmp18_ = _tmp19__length1 > 0;
+#line 3534 "RESTSupport.c"
} else {
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = FALSE;
-#line 3356 "RESTSupport.c"
+ _tmp18_ = FALSE;
+#line 3538 "RESTSupport.c"
}
#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp19_) {
-#line 3360 "RESTSupport.c"
- SoupMessage* _tmp22_;
- SoupURI* _tmp23_;
+ 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_;
+ SoupMessage* _tmp29_;
+ const gchar* _tmp30_;
+ SoupURI* _tmp31_;
+ SoupURI* _tmp32_;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = self->priv->message;
+ _tmp20_ = self->priv->message;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = soup_message_get_uri (_tmp22_);
+ _tmp21_ = soup_message_get_uri (_tmp20_);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
+ _tmp22_ = soup_uri_to_string (_tmp21_, FALSE);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- old_url = _tmp24_;
+ old_url = _tmp22_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
+ _tmp23_ = publishing_rest_support_transaction_get_endpoint_url (self);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = _tmp25_;
+ _tmp24_ = _tmp23_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = g_strconcat (_tmp26_, "?", NULL);
+ _tmp25_ = g_strconcat (_tmp24_, "?", NULL);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = _tmp27_;
+ _tmp26_ = _tmp25_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = formdata_string;
+ _tmp27_ = formdata_string;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+ _tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- url_with_query = _tmp30_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp28_);
+ url_with_query = _tmp28_;
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp24_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = self->priv->message;
+ _tmp29_ = self->priv->message;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = url_with_query;
+ _tmp30_ = url_with_query;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = soup_uri_new (_tmp32_);
+ _tmp31_ = soup_uri_new (_tmp30_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = _tmp33_;
+ _tmp32_ = _tmp31_;
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp31_, _tmp34_);
+ soup_message_set_uri (_tmp29_, _tmp32_);
#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp34_);
-#line 3416 "RESTSupport.c"
+ __vala_SoupURI_free0 (_tmp32_);
+#line 3598 "RESTSupport.c"
} else {
- SoupMessage* _tmp35_;
- const gchar* _tmp36_;
- guint8* _tmp37_;
- gint _tmp37__length1;
- guint8* _tmp38_;
- gint _tmp38__length1;
+ 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"
- _tmp35_ = self->priv->message;
+ _tmp33_ = self->priv->message;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = formdata_string;
+ _tmp34_ = formdata_string;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
+ _tmp35_ = string_get_data (_tmp34_, &_tmp35__length1);
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = _tmp37_;
+ _tmp36_ = _tmp35_;
#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38__length1 = _tmp37__length1;
+ _tmp36__length1 = _tmp35__length1;
#line 410 "/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 3436 "RESTSupport.c"
+ soup_message_set_request (_tmp33_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp36_, (gsize) _tmp36__length1);
+#line 3618 "RESTSupport.c"
}
#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3440 "RESTSupport.c"
+#line 3622 "RESTSupport.c"
{
- SoupMessage* _tmp39_;
- SoupURI* _tmp40_;
- gchar* _tmp41_;
- gchar* _tmp42_;
+ SoupMessage* _tmp37_;
+ SoupURI* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->priv->message;
+ _tmp37_ = self->priv->message;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp40_ = soup_message_get_uri (_tmp39_);
+ _tmp38_ = soup_message_get_uri (_tmp37_);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
+ _tmp39_ = soup_uri_to_string (_tmp38_, FALSE);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = _tmp41_;
+ _tmp40_ = _tmp39_;
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp42_);
+ g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp40_);
#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp42_);
+ _g_free0 (_tmp40_);
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3462 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
goto __finally1;
}
}
__finally1:
{
- const gchar* _tmp43_;
+ const gchar* _tmp41_;
#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = old_url;
+ _tmp41_ = old_url;
#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp43_ != NULL) {
-#line 3473 "RESTSupport.c"
- SoupMessage* _tmp44_;
- const gchar* _tmp45_;
- SoupURI* _tmp46_;
- SoupURI* _tmp47_;
+ 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"
- _tmp44_ = self->priv->message;
+ _tmp42_ = self->priv->message;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = old_url;
+ _tmp43_ = old_url;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp46_ = soup_uri_new (_tmp45_);
+ _tmp44_ = soup_uri_new (_tmp43_);
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = _tmp46_;
+ _tmp45_ = _tmp44_;
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_set_uri (_tmp44_, _tmp47_);
+ soup_message_set_uri (_tmp42_, _tmp45_);
#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- __vala_SoupURI_free0 (_tmp47_);
-#line 3490 "RESTSupport.c"
+ __vala_SoupURI_free0 (_tmp45_);
+#line 3672 "RESTSupport.c"
}
}
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3511,7 +3693,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3507 "RESTSupport.c"
+#line 3689 "RESTSupport.c"
} else {
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
@@ -3525,7 +3707,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3521 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
}
}
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3534,120 +3716,127 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (old_url);
#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3530 "RESTSupport.c"
+#line 3712 "RESTSupport.c"
}
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
+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 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3539 "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_;
+ 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 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_body;
+ _tmp1_ = _tmp0_->response_body;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_->data;
+ _tmp2_ = _tmp1_->data;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3__length1 = (gint) _tmp2_->length;
+ _tmp2__length1 = (gint) _tmp1_->length;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_strdup ((const gchar*) _tmp3_);
+ _tmp3_ = g_strdup ((const gchar*) _tmp2_);
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3571 "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_;
+ 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 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _tmp1_->response_headers;
+ _tmp1_ = _tmp0_->response_headers;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3594 "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 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "get_is_executed()");
+ _vala_assert (publishing_rest_support_transaction_get_is_executed (self), "get_is_executed()");
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->message;
+ _tmp0_ = self->priv->message;
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (_tmp0_);
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3617 "RESTSupport.c"
+#line 3799 "RESTSupport.c"
}
-static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+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 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3628 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
}
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3634 "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_;
+ PublishingRESTSupportArgument* _tmp1_;
#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3659,18 +3848,16 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = name;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
+ _tmp1_ = publishing_rest_support_argument_new (name, value);
#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3662 "RESTSupport.c"
+ _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_;
@@ -3680,7 +3867,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_tmp1_ = self->priv->endpoint_url;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3676 "RESTSupport.c"
+#line 3863 "RESTSupport.c"
const gchar* _tmp2_;
gchar* _tmp3_;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3691,7 +3878,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3687 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_;
gchar* _tmp5_;
@@ -3703,24 +3890,28 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3699 "RESTSupport.c"
+#line 3886 "RESTSupport.c"
}
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3705 "RESTSupport.c"
+#line 3892 "RESTSupport.c"
}
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+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 3712 "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_;
@@ -3734,11 +3925,18 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
result = _tmp1_;
#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3730 "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;
@@ -3753,120 +3951,145 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
data1 = closure->data;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3749 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = param_values->data[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3755 "RESTSupport.c"
+#line 3953 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
#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 3761 "RESTSupport.c"
+#line 3959 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_init (GValue* value) {
+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 3768 "RESTSupport.c"
+#line 3968 "RESTSupport.c"
}
-static void publishing_rest_support_value_transaction_free_value (GValue* value) {
+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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3777 "RESTSupport.c"
+#line 3979 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
+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 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 3787 "RESTSupport.c"
+#line 3992 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3791 "RESTSupport.c"
+#line 3996 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
+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 3799 "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) {
+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 3806 "RESTSupport.c"
+#line 4018 "RESTSupport.c"
PublishingRESTSupportTransaction * object;
object = collect_values[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#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 3813 "RESTSupport.c"
+#line 4025 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#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 3817 "RESTSupport.c"
+#line 4029 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3821 "RESTSupport.c"
+#line 4033 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3825 "RESTSupport.c"
+#line 4037 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3829 "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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#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 3840 "RESTSupport.c"
+#line 4057 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3846 "RESTSupport.c"
+#line 4063 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3850 "RESTSupport.c"
+#line 4067 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3854 "RESTSupport.c"
+#line 4071 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3858 "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 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);
@@ -3876,20 +4099,25 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3872 "RESTSupport.c"
+#line 4095 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
+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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3881 "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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
@@ -3905,22 +4133,25 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
value->data[0].v_pointer = v_object;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3901 "RESTSupport.c"
+#line 4129 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3905 "RESTSupport.c"
+#line 4133 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3911 "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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
@@ -3934,22 +4165,24 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3930 "RESTSupport.c"
+#line 4161 "RESTSupport.c"
} else {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3934 "RESTSupport.c"
+#line 4165 "RESTSupport.c"
}
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3940 "RESTSupport.c"
+#line 4171 "RESTSupport.c"
}
}
-static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
+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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3966,11 +4199,13 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
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 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 3962 "RESTSupport.c"
+#line 4195 "RESTSupport.c"
}
-static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
+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 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3987,11 +4222,13 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
self->priv->endpoint_url = NULL;
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 3983 "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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
@@ -4005,11 +4242,13 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
_g_error_free0 (self->priv->err);
#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 4001 "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 };
@@ -4023,18 +4262,22 @@ 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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 4026 "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 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4043,83 +4286,78 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4039 "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_;
+ 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 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 461 "/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 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = publishable;
+ 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"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp0_ = _g_object_ref0 (publishable);
#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp2_;
+ self->publishable = _tmp0_;
#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = publishable;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
+ _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 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp5_;
+ self->mime_type = _tmp1_;
#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+ _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 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp6_;
+ self->binary_disposition_table = _tmp2_;
#line 467 "/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);
+ _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 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp7_;
+ self->message_headers = _tmp3_;
#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4094 "RESTSupport.c"
+#line 4329 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
+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 4101 "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_;
+ 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 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4127,59 +4365,55 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 472 "/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);
+ 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"
- _tmp2_ = publishable;
-#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp0_ = _g_object_ref0 (publishable);
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->publishable = _tmp3_;
+ self->publishable = _tmp0_;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = publishable;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
+ _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 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->mime_type = _tmp6_;
+ self->mime_type = _tmp1_;
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
+ _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 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp7_;
+ self->binary_disposition_table = _tmp2_;
#line 478 "/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);
+ _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 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->message_headers = _tmp8_;
+ self->message_headers = _tmp3_;
#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4160 "RESTSupport.c"
+#line 4388 "RESTSupport.c"
}
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
+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 4167 "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 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4189,69 +4423,62 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->message_headers;
#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = key;
-#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = value;
-#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), _tmp1_, _tmp2_);
-#line 4190 "RESTSupport.c"
+ 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 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = media_type;
#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4201 "RESTSupport.c"
- gchar* _tmp1_;
+ 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"
- _tmp1_ = g_strdup ("image/jpeg");
+ _tmp0_ = g_strdup ("image/jpeg");
#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4209 "RESTSupport.c"
+#line 4438 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp2_;
-#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = media_type;
#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4216 "RESTSupport.c"
- gchar* _tmp3_;
+ 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"
- _tmp3_ = g_strdup ("video/mpeg");
+ _tmp1_ = g_strdup ("video/mpeg");
#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp3_;
+ result = _tmp1_;
#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4224 "RESTSupport.c"
+#line 4450 "RESTSupport.c"
} else {
- SpitPublishingPublisherMediaType _tmp4_;
- GEnumValue* _tmp5_;
+ GEnumValue* _tmp2_;
#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = media_type;
+ _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"
- _tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
-#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:491: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4234 "RESTSupport.c"
+ 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) {
+static void
+_g_free0_ (gpointer var)
+{
#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 4243 "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_;
@@ -4298,51 +4525,60 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
result = _result_;
#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4294 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
}
-static gpointer _g_hash_table_ref0 (gpointer self) {
+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 4301 "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 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (new_disp_table != NULL);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = new_disp_table;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_hash_table_ref0 (_tmp0_);
+ _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 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->binary_disposition_table = _tmp1_;
-#line 4320 "RESTSupport.c"
+ self->binary_disposition_table = _tmp0_;
+#line 4549 "RESTSupport.c"
}
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
+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 4327 "RESTSupport.c"
+#line 4558 "RESTSupport.c"
}
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
+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 4334 "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_;
@@ -4359,44 +4595,42 @@ 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 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4422,7 +4656,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp4_ = request_arguments;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4418 "RESTSupport.c"
+#line 4652 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -4434,14 +4668,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
arg_collection_length1 = _tmp4__length1;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4430 "RESTSupport.c"
+#line 4664 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_;
PublishingRESTSupportArgument* arg = NULL;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4437 "RESTSupport.c"
+#line 4671 "RESTSupport.c"
{
SoupMultipart* _tmp6_;
PublishingRESTSupportArgument* _tmp7_;
@@ -4462,7 +4696,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4458 "RESTSupport.c"
+#line 4692 "RESTSupport.c"
}
}
}
@@ -4500,7 +4734,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4496 "RESTSupport.c"
+#line 4730 "RESTSupport.c"
goto __catch2_g_file_error;
}
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4515,7 +4749,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4511 "RESTSupport.c"
+#line 4745 "RESTSupport.c"
}
}
goto __finally2;
@@ -4533,7 +4767,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_inner_error_ = _tmp18_;
#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4529 "RESTSupport.c"
+#line 4763 "RESTSupport.c"
goto __finally2;
}
__finally2:
@@ -4551,7 +4785,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4547 "RESTSupport.c"
+#line 4781 "RESTSupport.c"
} else {
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
@@ -4565,149 +4799,142 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4561 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
}
}
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = message_parts;
#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = soup_multipart_get_length (_tmp19_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- payload_part_num = _tmp20_;
+ payload_part_num = soup_multipart_get_length (_tmp19_);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = payload;
+ _tmp20_ = payload;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
+ _tmp21_ = string_get_data (_tmp20_, &_tmp21__length1);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = _tmp22_;
+ _tmp22_ = _tmp21_;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23__length1 = _tmp22__length1;
+ _tmp22__length1 = _tmp21__length1;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = payload_length;
+ _tmp23_ = payload_length;
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0);
+ _tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp22_ + 0, ((gint) _tmp23_) - 0);
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- bindable_data = _tmp25_;
+ bindable_data = _tmp24_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = message_parts;
+ _tmp25_ = message_parts;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp27_ = self->publishable;
+ _tmp26_ = self->publishable;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
+ _tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_;
+ _tmp28_ = _tmp27_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp30_ = g_file_get_path (_tmp29_);
+ _tmp29_ = g_file_get_path (_tmp28_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = _tmp30_;
+ _tmp30_ = _tmp29_;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = self->mime_type;
+ _tmp31_ = self->mime_type;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = bindable_data;
+ _tmp32_ = bindable_data;
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_);
+ soup_multipart_append_form_file (_tmp25_, "", _tmp30_, _tmp31_, _tmp32_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp30_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp28_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = message_parts;
+ _tmp33_ = message_parts;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = payload_part_num;
+ _tmp34_ = payload_part_num;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_);
+ soup_multipart_get_part (_tmp33_, _tmp34_, &_tmp35_, &_tmp36_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_header = _tmp36_;
+ image_part_header = _tmp35_;
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- image_part_body = _tmp37_;
+ image_part_body = _tmp36_;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = image_part_header;
+ _tmp37_ = image_part_header;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp39_ = self->binary_disposition_table;
+ _tmp38_ = self->binary_disposition_table;
#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_);
+ soup_message_headers_set_content_disposition (_tmp37_, "form-data", _tmp38_);
#line 538 "/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));
+ _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"
- _tmp41_ = _tmp40_;
+ _tmp40_ = _tmp39_;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp42_ = message_parts;
+ _tmp41_ = message_parts;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_);
+ _tmp42_ = soup_form_request_new_from_multipart (_tmp40_, _tmp41_);
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp44_ = _tmp43_;
+ _tmp43_ = _tmp42_;
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp41_);
+ _g_free0 (_tmp40_);
#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- outbound_message = _tmp44_;
+ outbound_message = _tmp43_;
#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp45_ = self->message_headers;
+ _tmp44_ = self->message_headers;
#line 541 "/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));
+ _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 = _tmp46_;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp47_ = i;
+ i = _tmp45_;
#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp48_ = gee_map_iterator_next (_tmp47_);
+ _tmp46_ = i;
#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp48_;
+ cont = gee_map_iterator_next (_tmp46_);
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4650 "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 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"
- _tmp49_ = cont;
+ _tmp47_ = cont;
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp49_) {
+ if (!_tmp47_) {
#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4668 "RESTSupport.c"
+#line 4897 "RESTSupport.c"
}
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp50_ = outbound_message;
+ _tmp48_ = outbound_message;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp51_ = _tmp50_->request_headers;
+ _tmp49_ = _tmp48_->request_headers;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp52_ = i;
+ _tmp50_ = i;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp53_ = gee_map_iterator_get_key (_tmp52_);
+ _tmp51_ = gee_map_iterator_get_key (_tmp50_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp54_ = (gchar*) _tmp53_;
+ _tmp52_ = (gchar*) _tmp51_;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp55_ = i;
+ _tmp53_ = i;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp56_ = gee_map_iterator_get_value (_tmp55_);
+ _tmp54_ = gee_map_iterator_get_value (_tmp53_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp57_ = (gchar*) _tmp56_;
+ _tmp55_ = (gchar*) _tmp54_;
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_);
+ soup_message_headers_append (_tmp49_, _tmp52_, _tmp55_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp57_);
+ _g_free0 (_tmp55_);
#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp54_);
+ _g_free0 (_tmp52_);
#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp58_ = i;
+ _tmp56_ = i;
#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp59_ = gee_map_iterator_next (_tmp58_);
-#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- cont = _tmp59_;
-#line 4698 "RESTSupport.c"
+ cont = gee_map_iterator_next (_tmp56_);
+#line 4925 "RESTSupport.c"
}
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp60_ = outbound_message;
+ _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), _tmp60_);
+ 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"
@@ -4732,7 +4959,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4728 "RESTSupport.c"
+#line 4955 "RESTSupport.c"
} else {
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
@@ -4752,7 +4979,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4748 "RESTSupport.c"
+#line 4975 "RESTSupport.c"
}
}
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4767,11 +4994,13 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
__vala_SoupMultipart_free0 (message_parts);
#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 4763 "RESTSupport.c"
+#line 4990 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
+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 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4780,22 +5009,26 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute;
-#line 4776 "RESTSupport.c"
+#line 5005 "RESTSupport.c"
}
-static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
+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 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = NULL;
#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4787 "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 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4809,11 +5042,13 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
_g_object_unref0 (self->message_headers);
#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 4805 "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 };
@@ -4825,29 +5060,33 @@ 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 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = doc;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->document = _tmp0_;
+ self->priv->document = doc;
#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4832 "RESTSupport.c"
+#line 5067 "RESTSupport.c"
}
-static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
+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 4839 "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_;
@@ -4861,96 +5100,92 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
result = _tmp1_;
#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4857 "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 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (child_name != NULL, NULL);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = parent;
+ _tmp0_ = parent->children;
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _tmp0_->children;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp1_;
-#line 4879 "RESTSupport.c"
+ doc_node_iter = _tmp0_;
+#line 5119 "RESTSupport.c"
{
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp1_ = FALSE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = TRUE;
+ _tmp1_ = TRUE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4886 "RESTSupport.c"
+#line 5126 "RESTSupport.c"
+ xmlNode* _tmp4_;
xmlNode* _tmp5_;
- xmlNode* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
+ const gchar* _tmp6_;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp2_) {
-#line 4893 "RESTSupport.c"
+ if (!_tmp1_) {
+#line 5132 "RESTSupport.c"
+ xmlNode* _tmp2_;
xmlNode* _tmp3_;
- xmlNode* _tmp4_;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = doc_node_iter;
+ _tmp2_ = doc_node_iter;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_->next;
+ _tmp3_ = _tmp2_->next;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc_node_iter = _tmp4_;
-#line 4902 "RESTSupport.c"
+ doc_node_iter = _tmp3_;
+#line 5141 "RESTSupport.c"
}
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = FALSE;
+ _tmp1_ = FALSE;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = doc_node_iter;
+ _tmp4_ = doc_node_iter;
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp5_ != NULL)) {
+ if (!(_tmp4_ != NULL)) {
#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4912 "RESTSupport.c"
+#line 5151 "RESTSupport.c"
}
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = doc_node_iter;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_->name;
+ _tmp5_ = doc_node_iter;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = child_name;
+ _tmp6_ = _tmp5_->name;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4922 "RESTSupport.c"
- xmlNode* _tmp9_;
+ if (g_strcmp0 (_tmp6_, child_name) == 0) {
+#line 5159 "RESTSupport.c"
+ xmlNode* _tmp7_;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = doc_node_iter;
+ _tmp7_ = doc_node_iter;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp9_;
+ result = _tmp7_;
#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4930 "RESTSupport.c"
+#line 5167 "RESTSupport.c"
}
}
}
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = child_name;
+ _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"
- _tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _inner_error_ = _tmp11_;
+ _inner_error_ = _tmp8_;
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4946 "RESTSupport.c"
+#line 5181 "RESTSupport.c"
} else {
#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);
@@ -4958,50 +5193,43 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4954 "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 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (property_key != NULL, NULL);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = node;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = property_key;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
+ _tmp0_ = (gchar*) xmlGetProp (node, (xmlChar*) property_key);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- value_string = _tmp2_;
+ value_string = _tmp0_;
#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = value_string;
+ _tmp1_ = value_string;
#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp3_ == NULL) {
-#line 4983 "RESTSupport.c"
- const gchar* _tmp4_;
- xmlNode* _tmp5_;
- const gchar* _tmp6_;
- GError* _tmp7_;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = property_key;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = node;
+ if (_tmp1_ == NULL) {
+#line 5217 "RESTSupport.c"
+ const gchar* _tmp2_;
+ GError* _tmp3_;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp5_->name;
+ _tmp2_ = node->name;
#line 591 "/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_);
+ _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_ = _tmp7_;
+ _inner_error_ = _tmp3_;
#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"
@@ -5010,7 +5238,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_g_free0 (value_string);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5006 "RESTSupport.c"
+#line 5234 "RESTSupport.c"
} else {
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
@@ -5020,130 +5248,127 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
g_clear_error (&_inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5016 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
}
}
#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5023 "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 5046 "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 5069 "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 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = input_string;
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1_ == NULL) {
+ if (input_string == NULL) {
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 5110 "RESTSupport.c"
+#line 5338 "RESTSupport.c"
} else {
- const gchar* _tmp2_;
- gint _tmp3_;
- gint _tmp4_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = input_string;
+ _tmp1_ = strlen (input_string);
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = strlen (_tmp2_);
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = _tmp4_ == 0;
-#line 5123 "RESTSupport.c"
+ _tmp0_ = _tmp2_ == 0;
+#line 5348 "RESTSupport.c"
}
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 5127 "RESTSupport.c"
- GError* _tmp5_;
+#line 5352 "RESTSupport.c"
+ GError* _tmp3_;
#line 600 "/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");
+ _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_ = _tmp5_;
+ _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 5139 "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);
@@ -5151,74 +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 5147 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
}
}
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = input_string;
-#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_chug (_tmp7_);
-#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _tmp5_ = string_chug (input_string);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_chomp (_tmp9_);
+ _tmp6_ = _tmp5_;
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = string_chomp (_tmp6_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = g_str_has_prefix (_tmp11_, "<");
+ _tmp8_ = _tmp7_;
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = !_tmp12_;
+ _tmp9_ = !g_str_has_prefix (_tmp8_, "<");
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp8_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp13_) {
+ if (_tmp9_) {
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = TRUE;
-#line 5172 "RESTSupport.c"
+ _tmp4_ = TRUE;
+#line 5393 "RESTSupport.c"
} else {
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- gboolean _tmp19_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = input_string;
+ _tmp10_ = string_chug (input_string);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = string_chug (_tmp14_);
+ _tmp11_ = _tmp10_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = _tmp15_;
+ _tmp12_ = string_chomp (_tmp11_);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = string_chomp (_tmp16_);
-#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = _tmp17_;
-#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = g_str_has_suffix (_tmp18_, ">");
+ _tmp13_ = _tmp12_;
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = !_tmp19_;
+ _tmp4_ = !g_str_has_suffix (_tmp13_, ">");
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp13_);
#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp16_);
-#line 5198 "RESTSupport.c"
+ _g_free0 (_tmp11_);
+#line 5413 "RESTSupport.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5202 "RESTSupport.c"
- GError* _tmp20_;
+ if (_tmp4_) {
+#line 5417 "RESTSupport.c"
+ GError* _tmp14_;
#line 606 "/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");
+ _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_ = _tmp20_;
+ _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 5214 "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);
@@ -5226,38 +5441,34 @@ 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 5222 "RESTSupport.c"
+#line 5437 "RESTSupport.c"
}
}
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = input_string;
+ _tmp15_ = strlen (input_string);
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = input_string;
+ _tmp16_ = _tmp15_;
#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = strlen (_tmp22_);
+ _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"
- _tmp24_ = _tmp23_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- doc = _tmp25_;
+ doc = _tmp17_;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = doc;
+ _tmp18_ = doc;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp26_ == NULL) {
-#line 5241 "RESTSupport.c"
- GError* _tmp27_;
+ if (_tmp18_ == NULL) {
+#line 5452 "RESTSupport.c"
+ GError* _tmp19_;
#line 615 "/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");
+ _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_ = _tmp27_;
+ _inner_error_ = _tmp19_;
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5253 "RESTSupport.c"
+#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);
@@ -5265,28 +5476,28 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5261 "RESTSupport.c"
+#line 5472 "RESTSupport.c"
}
}
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp28_ = doc;
+ _tmp20_ = doc;
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp29_ = _tmp28_->children;
+ _tmp21_ = _tmp20_->children;
#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp29_ == NULL) {
-#line 5270 "RESTSupport.c"
- GError* _tmp30_;
+ if (_tmp21_ == NULL) {
+#line 5481 "RESTSupport.c"
+ GError* _tmp22_;
#line 621 "/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");
+ _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_ = _tmp30_;
+ _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 5282 "RESTSupport.c"
+#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);
@@ -5294,38 +5505,34 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5290 "RESTSupport.c"
+#line 5501 "RESTSupport.c"
}
}
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp31_ = doc;
+ _tmp23_ = doc;
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
+ _tmp24_ = publishing_rest_support_xml_document_new (_tmp23_);
#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- rest_doc = _tmp32_;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33_ = check_for_error_response;
+ rest_doc = _tmp24_;
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp33__target = check_for_error_response_target;
+ _tmp25_ = rest_doc;
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp34_ = rest_doc;
+ _tmp26_ = check_for_error_response (_tmp25_, check_for_error_response_target);
#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _result_ = _tmp35_;
+ _result_ = _tmp26_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp36_ = _result_;
+ _tmp27_ = _result_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp36_ != NULL) {
-#line 5313 "RESTSupport.c"
- const gchar* _tmp37_;
- GError* _tmp38_;
+ if (_tmp27_ != NULL) {
+#line 5520 "RESTSupport.c"
+ const gchar* _tmp28_;
+ GError* _tmp29_;
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp37_ = _result_;
+ _tmp28_ = _result_;
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
+ _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_ = _tmp38_;
+ _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"
@@ -5336,7 +5543,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_publishing_rest_support_xml_document_unref0 (rest_doc);
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5332 "RESTSupport.c"
+#line 5539 "RESTSupport.c"
} else {
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
@@ -5348,7 +5555,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5344 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
}
}
#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5357,108 +5564,133 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_result_);
#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5353 "RESTSupport.c"
+#line 5560 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_init (GValue* value) {
+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 5360 "RESTSupport.c"
+#line 5569 "RESTSupport.c"
}
-static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
+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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5369 "RESTSupport.c"
+#line 5580 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
+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 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 5379 "RESTSupport.c"
+#line 5593 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5383 "RESTSupport.c"
+#line 5597 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
+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 5391 "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) {
+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 5398 "RESTSupport.c"
+#line 5619 "RESTSupport.c"
PublishingRESTSupportXmlDocument * object;
object = collect_values[0].v_pointer;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#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 5405 "RESTSupport.c"
+#line 5626 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#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 5409 "RESTSupport.c"
+#line 5630 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5413 "RESTSupport.c"
+#line 5634 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5417 "RESTSupport.c"
+#line 5638 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5421 "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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#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 5432 "RESTSupport.c"
+#line 5658 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5438 "RESTSupport.c"
+#line 5664 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5442 "RESTSupport.c"
+#line 5668 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5446 "RESTSupport.c"
+#line 5672 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5450 "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 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);
@@ -5468,20 +5700,25 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5464 "RESTSupport.c"
+#line 5696 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
+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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5473 "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 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));
@@ -5497,22 +5734,25 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5493 "RESTSupport.c"
+#line 5730 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5497 "RESTSupport.c"
+#line 5734 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5503 "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 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));
@@ -5526,42 +5766,48 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5522 "RESTSupport.c"
+#line 5762 "RESTSupport.c"
} else {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5526 "RESTSupport.c"
+#line 5766 "RESTSupport.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5532 "RESTSupport.c"
+#line 5772 "RESTSupport.c"
}
}
-static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
+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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5544 "RESTSupport.c"
+#line 5786 "RESTSupport.c"
}
-static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
+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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5553 "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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5572,11 +5818,13 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
_tmp0_ = self->priv->document;
#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5568 "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 };
@@ -5590,18 +5838,22 @@ 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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5593 "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 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5610,21 +5862,22 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5606 "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_;
+ 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 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5632,218 +5885,216 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
encoded_str_builder = _tmp0_;
#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = source;
+ _tmp1_ = g_strdup (source);
#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
-#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp2_;
+ current_char = _tmp1_;
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5635 "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 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = current_char;
+ gint _tmp7_;
+ const gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
+ _tmp2_ = current_char;
#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char_value = (gint) _tmp4_;
+ current_char_value = (gint) g_utf8_get_char_validated (_tmp2_, (gssize) -1);
#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = current_char_value;
+ _tmp3_ = current_char_value;
#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp5_ < 1) {
+ if (_tmp3_ < 1) {
#line 648 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5659 "RESTSupport.c"
+#line 5907 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = current_char_value;
+ _tmp7_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp9_ < 128) {
-#line 5665 "RESTSupport.c"
- gint _tmp10_;
+ if (_tmp7_ < 128) {
+#line 5913 "RESTSupport.c"
+ gint _tmp8_;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = current_char_value;
+ _tmp8_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = _tmp10_ != ((gint) '&');
-#line 5671 "RESTSupport.c"
+ _tmp6_ = _tmp8_ != ((gint) '&');
+#line 5919 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = FALSE;
-#line 5675 "RESTSupport.c"
+ _tmp6_ = FALSE;
+#line 5923 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp8_) {
-#line 5679 "RESTSupport.c"
- gint _tmp11_;
+ if (_tmp6_) {
+#line 5927 "RESTSupport.c"
+ gint _tmp9_;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = current_char_value;
+ _tmp9_ = current_char_value;
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp11_ != ((gint) '<');
-#line 5685 "RESTSupport.c"
+ _tmp5_ = _tmp9_ != ((gint) '<');
+#line 5933 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = FALSE;
-#line 5689 "RESTSupport.c"
+ _tmp5_ = FALSE;
+#line 5937 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_) {
-#line 5693 "RESTSupport.c"
- gint _tmp12_;
+ if (_tmp5_) {
+#line 5941 "RESTSupport.c"
+ gint _tmp10_;
#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = current_char_value;
+ _tmp10_ = current_char_value;
#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = _tmp12_ != ((gint) '>');
-#line 5699 "RESTSupport.c"
+ _tmp4_ = _tmp10_ != ((gint) '>');
+#line 5947 "RESTSupport.c"
} else {
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = FALSE;
-#line 5703 "RESTSupport.c"
+ _tmp4_ = FALSE;
+#line 5951 "RESTSupport.c"
}
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp6_) {
-#line 5707 "RESTSupport.c"
- GString* _tmp13_;
- const gchar* _tmp14_;
- gunichar _tmp15_;
+ if (_tmp4_) {
+#line 5955 "RESTSupport.c"
+ GString* _tmp11_;
+ const gchar* _tmp12_;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = encoded_str_builder;
-#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = current_char;
+ _tmp11_ = encoded_str_builder;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
+ _tmp12_ = current_char;
#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5719 "RESTSupport.c"
+ g_string_append_unichar (_tmp11_, g_utf8_get_char_validated (_tmp12_, (gssize) -1));
+#line 5964 "RESTSupport.c"
} else {
- GString* _tmp16_;
- gint _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
+ GString* _tmp13_;
+ gint _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = encoded_str_builder;
+ _tmp13_ = encoded_str_builder;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp17_ = current_char_value;
+ _tmp14_ = current_char_value;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp18_ = g_strdup_printf ("&#%d;", _tmp17_);
+ _tmp15_ = g_strdup_printf ("&#%d;", _tmp14_);
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp19_ = _tmp18_;
+ _tmp16_ = _tmp15_;
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append (_tmp16_, _tmp19_);
+ g_string_append (_tmp13_, _tmp16_);
#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp19_);
-#line 5737 "RESTSupport.c"
+ _g_free0 (_tmp16_);
+#line 5982 "RESTSupport.c"
}
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp20_ = current_char;
+ _tmp17_ = current_char;
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp21_ = g_utf8_next_char (_tmp20_);
+ _tmp18_ = g_utf8_next_char (_tmp17_);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp19_ = g_strdup (_tmp18_);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- current_char = _tmp22_;
-#line 5749 "RESTSupport.c"
+ current_char = _tmp19_;
+#line 5994 "RESTSupport.c"
}
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp23_ = encoded_str_builder;
+ _tmp20_ = encoded_str_builder;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp24_ = _tmp23_->str;
+ _tmp21_ = _tmp20_->str;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = g_strdup (_tmp24_);
+ _tmp22_ = g_strdup (_tmp21_);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp25_;
+ result = _tmp22_;
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (encoded_str_builder);
#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5765 "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 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5776 "RESTSupport.c"
+#line 6024 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5782 "RESTSupport.c"
+#line 6030 "RESTSupport.c"
}
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5786 "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_;
+ 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 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = publishables;
+ _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 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = _tmp0__length1;
-#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 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables = _tmp1_;
+ self->priv->publishables = _tmp0_;
#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->publishables_length1 = _tmp1__length1;
+ 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 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = session;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
+ _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 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp3_;
+ self->priv->session = _tmp1_;
#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5828 "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) {
+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 5835 "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;
@@ -5859,7 +6110,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp0_ = self->priv->publishables;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5855 "RESTSupport.c"
+#line 6106 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -5871,14 +6122,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
publishable_collection_length1 = _tmp0__length1;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5867 "RESTSupport.c"
+#line 6118 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_;
SpitPublishingPublishable* publishable = NULL;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5874 "RESTSupport.c"
+#line 6125 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_;
@@ -5911,7 +6162,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp4_ = file;
#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5907 "RESTSupport.c"
+#line 6158 "RESTSupport.c"
gint _tmp5_;
#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
@@ -5923,7 +6174,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5919 "RESTSupport.c"
+#line 6170 "RESTSupport.c"
}
#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
@@ -5939,7 +6190,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp8__target = self->priv->status_updated_target;
#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5935 "RESTSupport.c"
+#line 6186 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_;
void* _tmp9__target;
gint _tmp10_;
@@ -5954,7 +6205,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp11_ = fraction_complete;
#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5950 "RESTSupport.c"
+#line 6201 "RESTSupport.c"
}
#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
@@ -5972,7 +6223,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp16_ = txn;
#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 5968 "RESTSupport.c"
+#line 6219 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5983,7 +6234,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5979 "RESTSupport.c"
+#line 6230 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5998,7 +6249,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5994 "RESTSupport.c"
+#line 6245 "RESTSupport.c"
}
}
goto __finally3;
@@ -6018,7 +6269,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
stop = TRUE;
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 6014 "RESTSupport.c"
+#line 6265 "RESTSupport.c"
}
__finally3:
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6035,7 +6286,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6031 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
}
#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
@@ -6055,7 +6306,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6051 "RESTSupport.c"
+#line 6302 "RESTSupport.c"
}
#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
@@ -6067,7 +6318,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (file);
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 6063 "RESTSupport.c"
+#line 6314 "RESTSupport.c"
}
}
}
@@ -6075,31 +6326,33 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp23_ = stop;
#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 6071 "RESTSupport.c"
+#line 6322 "RESTSupport.c"
gint _tmp24_;
#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
#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 6077 "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;
+ 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 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6109,48 +6362,46 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file_span = 1.0 / _tmp0__length1;
#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = bytes_written_so_far;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = total_bytes;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
+ this_file_fraction_complete = ((gdouble) bytes_written_so_far) / total_bytes;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = self->priv->current_file;
+ _tmp1_ = self->priv->current_file;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = file_span;
+ _tmp2_ = file_span;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = this_file_fraction_complete;
+ _tmp3_ = this_file_fraction_complete;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = file_span;
+ _tmp4_ = file_span;
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
+ fraction_complete = (_tmp1_ * _tmp2_) + (_tmp3_ * _tmp4_);
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->status_updated;
+ _tmp5_ = self->priv->status_updated;
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7__target = self->priv->status_updated_target;
+ _tmp5__target = self->priv->status_updated_target;
#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp7_ != NULL) {
-#line 6126 "RESTSupport.c"
- SpitPublishingProgressCallback _tmp8_;
- void* _tmp8__target;
- gint _tmp9_;
- gdouble _tmp10_;
+ 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"
- _tmp8_ = self->priv->status_updated;
+ _tmp6_ = self->priv->status_updated;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8__target = self->priv->status_updated_target;
+ _tmp6__target = self->priv->status_updated_target;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->current_file;
+ _tmp7_ = self->priv->current_file;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = fraction_complete;
+ _tmp8_ = fraction_complete;
#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6141 "RESTSupport.c"
+ _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_;
@@ -6164,11 +6415,13 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
result = _tmp1_;
#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6160 "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;
@@ -6191,154 +6444,183 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
result = _tmp3_;
#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6187 "RESTSupport.c"
+#line 6440 "RESTSupport.c"
}
-static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
+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 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6196 "RESTSupport.c"
+#line 6452 "RESTSupport.c"
}
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
+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 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6205 "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;
+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 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = status_updated;
+ self->priv->status_updated = status_updated;
#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0__target = status_updated_target;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated = _tmp0_;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->status_updated_target = _tmp0__target;
+ self->priv->status_updated_target = status_updated_target;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->publishables;
+ _tmp0_ = self->priv->publishables;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1__length1 = self->priv->publishables_length1;
+ _tmp0__length1 = self->priv->publishables_length1;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp1__length1 > 0) {
+ if (_tmp0__length1 > 0) {
#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 6232 "RESTSupport.c"
+#line 6489 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
+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 6240 "RESTSupport.c"
+#line 6499 "RESTSupport.c"
}
-static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
+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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6249 "RESTSupport.c"
+#line 6510 "RESTSupport.c"
}
}
-static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
+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 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 6259 "RESTSupport.c"
+#line 6523 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6263 "RESTSupport.c"
+#line 6527 "RESTSupport.c"
}
}
-static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
+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 6271 "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) {
+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 6278 "RESTSupport.c"
+#line 6549 "RESTSupport.c"
PublishingRESTSupportBatchUploader * object;
object = collect_values[0].v_pointer;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#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 6285 "RESTSupport.c"
+#line 6556 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#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 6289 "RESTSupport.c"
+#line 6560 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6293 "RESTSupport.c"
+#line 6564 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6297 "RESTSupport.c"
+#line 6568 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6301 "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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
#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 6312 "RESTSupport.c"
+#line 6588 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6318 "RESTSupport.c"
+#line 6594 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6322 "RESTSupport.c"
+#line 6598 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6326 "RESTSupport.c"
+#line 6602 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6330 "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 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);
@@ -6348,20 +6630,25 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
G_PARAM_SPEC (spec)->value_type = object_type;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6344 "RESTSupport.c"
+#line 6626 "RESTSupport.c"
}
-gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
+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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6353 "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 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));
@@ -6377,22 +6664,25 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
value->data[0].v_pointer = v_object;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6373 "RESTSupport.c"
+#line 6660 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6377 "RESTSupport.c"
+#line 6664 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6383 "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 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));
@@ -6406,22 +6696,24 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6402 "RESTSupport.c"
+#line 6692 "RESTSupport.c"
} else {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6406 "RESTSupport.c"
+#line 6696 "RESTSupport.c"
}
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6412 "RESTSupport.c"
+#line 6702 "RESTSupport.c"
}
}
-static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
+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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6434,11 +6726,13 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
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 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 6430 "RESTSupport.c"
+#line 6722 "RESTSupport.c"
}
-static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
+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 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6457,11 +6751,13 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
self->priv->status_updated_target = self;
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6453 "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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
@@ -6471,11 +6767,13 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6467 "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 };
@@ -6489,18 +6787,22 @@ 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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6492 "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 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6509,205 +6811,211 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6505 "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 6524 "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_;
+ 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 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = s;
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
+ _tmp0_ = g_utf8_normalize (s, (gssize) -1, G_NORMALIZE_DEFAULT);
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- t = _tmp1_;
+ t = _tmp0_;
#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_string_new ("");
+ _tmp1_ = g_string_new ("");
#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- b = _tmp2_;
-#line 6550 "RESTSupport.c"
+ b = _tmp1_;
+#line 6848 "RESTSupport.c"
{
const gchar* u = NULL;
- const gchar* _tmp3_;
+ const gchar* _tmp2_;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = t;
+ _tmp2_ = t;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp3_;
-#line 6558 "RESTSupport.c"
+ u = _tmp2_;
+#line 6856 "RESTSupport.c"
{
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_ = FALSE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = TRUE;
+ _tmp3_ = TRUE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6565 "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 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!_tmp4_) {
-#line 6574 "RESTSupport.c"
+ if (!_tmp3_) {
+#line 6870 "RESTSupport.c"
+ const gchar* _tmp4_;
const gchar* _tmp5_;
- const gchar* _tmp6_;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = u;
+ _tmp4_ = u;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_utf8_next_char (_tmp5_);
+ _tmp5_ = g_utf8_next_char (_tmp4_);
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- u = _tmp6_;
-#line 6583 "RESTSupport.c"
+ u = _tmp5_;
+#line 6879 "RESTSupport.c"
}
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = FALSE;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = u;
+ _tmp3_ = FALSE;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_get_char (_tmp7_, (glong) 0);
+ _tmp6_ = u;
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (!(_tmp8_ != ((gunichar) 0))) {
+ if (!(string_get_char (_tmp6_, (glong) 0) != ((gunichar) 0))) {
#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6595 "RESTSupport.c"
+#line 6889 "RESTSupport.c"
}
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = u;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_get_char (_tmp9_, (glong) 0);
+ _tmp7_ = u;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- c = _tmp10_;
+ c = string_get_char (_tmp7_, (glong) 0);
#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = c;
+ _tmp8_ = c;
#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (((gint) _tmp11_) < 128) {
-#line 6607 "RESTSupport.c"
- GString* _tmp12_;
- gunichar _tmp13_;
+ if (((gint) _tmp8_) < 128) {
+#line 6899 "RESTSupport.c"
+ GString* _tmp9_;
+ gunichar _tmp10_;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = b;
+ _tmp9_ = b;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = c;
+ _tmp10_ = c;
#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6616 "RESTSupport.c"
+ g_string_append_unichar (_tmp9_, _tmp10_);
+#line 6908 "RESTSupport.c"
}
}
}
}
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = b;
+ _tmp11_ = b;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = _tmp14_->str;
+ _tmp12_ = _tmp11_->str;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp16_ = g_strdup (_tmp15_);
+ _tmp13_ = g_strdup (_tmp12_);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp16_;
+ result = _tmp13_;
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (b);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (t);
#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6635 "RESTSupport.c"
+#line 6927 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
+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 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6644 "RESTSupport.c"
+#line 6938 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
+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 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6653 "RESTSupport.c"
+#line 6949 "RESTSupport.c"
}
-static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
+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 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6662 "RESTSupport.c"
+#line 6960 "RESTSupport.c"
}
-gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
+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 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6671 "RESTSupport.c"
+#line 6971 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
+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 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6680 "RESTSupport.c"
+#line 6982 "RESTSupport.c"
}
-void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
+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 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6689 "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 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6699 "RESTSupport.c"
+#line 7005 "RESTSupport.c"
}
-static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
+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 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6716,15 +7024,19 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token;
#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate;
-#line 6712 "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 };
@@ -6736,22 +7048,27 @@ 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) {
+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 6735 "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_;
+ 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 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6761,62 +7078,62 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = scope;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (scope);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->scope = _tmp1_;
+ self->priv->scope = _tmp0_;
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
+ _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 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->session = _tmp2_;
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = service;
+ self->priv->session = _tmp1_;
#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->service = _tmp3_;
+ self->priv->service = service;
#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = host;
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->host = _tmp4_;
+ self->priv->host = host;
#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = publishing_rest_support_google_publisher_get_authenticator (self);
+ _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 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->authenticator = _tmp5_;
+ self->priv->authenticator = _tmp2_;
#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = self->priv->authenticator;
+ _tmp3_ = self->priv->authenticator;
#line 831 "/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);
+ 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 6790 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
}
-static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+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 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6799 "RESTSupport.c"
+#line 7112 "RESTSupport.c"
}
-SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+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 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
-#line 6808 "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 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6827,11 +7144,13 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
result = _tmp0_;
#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6823 "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_;
@@ -6845,102 +7164,124 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
result = _tmp1_;
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6841 "RESTSupport.c"
+#line 7160 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
+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 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6850 "RESTSupport.c"
+#line 7171 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
+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 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 6859 "RESTSupport.c"
+#line 7182 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
+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 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6868 "RESTSupport.c"
+#line 7193 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
+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 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 6877 "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 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 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return _tmp0_;
-#line 6887 "RESTSupport.c"
+#line 7216 "RESTSupport.c"
}
-gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
+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 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 6896 "RESTSupport.c"
+#line 7227 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
+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 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6905 "RESTSupport.c"
+#line 7238 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
+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 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 6914 "RESTSupport.c"
+#line 7249 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
+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 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6923 "RESTSupport.c"
+#line 7260 "RESTSupport.c"
}
-void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
+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 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 6932 "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_;
@@ -6955,18 +7296,22 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
result = _tmp1_;
#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6951 "RESTSupport.c"
+#line 7292 "RESTSupport.c"
}
-static gpointer _g_variant_ref0 (gpointer self) {
+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 6958 "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_;
@@ -7075,11 +7420,13 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica
_g_variant_unref0 (refresh_token);
#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (params);
-#line 7071 "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 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
@@ -7097,18 +7444,22 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
self->refresh_token = NULL;
#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7093 "RESTSupport.c"
+#line 7440 "RESTSupport.c"
}
-static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
+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 7100 "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_;
@@ -7120,11 +7471,13 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
result = _tmp0_ != NULL;
#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7116 "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_;
@@ -7144,35 +7497,36 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7140 "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_;
+ 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 792 "/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 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp0_, "is_authenticated()");
+ _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"
- _tmp1_ = self->access_token;
+ _tmp0_ = self->access_token;
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp1_ = g_strdup (_tmp0_);
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7164 "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 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);
@@ -7188,11 +7542,13 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
_g_free0 (self->refresh_token);
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 7184 "RESTSupport.c"
+#line 7538 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
+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 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7205,15 +7561,19 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
#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 7201 "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 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);
@@ -7225,11 +7585,13 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
_g_free0 (self->refresh_token);
#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 7221 "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 };
@@ -7241,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 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#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 (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+ 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 7256 "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) {
+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 7263 "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_;
+ 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 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = session;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = endpoint_url;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = method;
-#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 (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = session;
+ 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"
- _tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _vala_assert (_tmp4_, "session.is_authenticated()");
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = session;
+ _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"
- _tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
+ _tmp0_ = publishing_rest_support_google_session_get_access_token (session);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = _tmp6_;
+ _tmp1_ = _tmp0_;
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
+ _tmp2_ = g_strconcat ("Bearer ", _tmp1_, NULL);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = _tmp8_;
+ _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", _tmp9_);
+ 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 (_tmp9_);
+ _g_free0 (_tmp3_);
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp1_);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 7315 "RESTSupport.c"
+#line 7664 "RESTSupport.c"
}
-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_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 7322 "RESTSupport.c"
+#line 7675 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
+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 7329 "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 };
@@ -7353,7 +7712,9 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
}
-static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
+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 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7372,11 +7733,13 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop;
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 7368 "RESTSupport.c"
+#line 7729 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+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 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7387,18 +7750,22 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop;
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service;
-#line 7383 "RESTSupport.c"
+#line 7746 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
+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 7390 "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 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
@@ -7410,11 +7777,13 @@ static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
_g_object_unref0 (self->priv->authenticator);
#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 7406 "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 };
@@ -7428,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) {
@@ -7440,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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 14:38:28 +0000