summaryrefslogtreecommitdiff
path: root/plugins/common
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /plugins/common
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'plugins/common')
-rw-r--r--plugins/common/BuilderPane.c2
-rw-r--r--plugins/common/RESTSupport.c1423
-rw-r--r--plugins/common/RESTSupport.vala18
-rw-r--r--plugins/common/Resources.c2
-rw-r--r--plugins/common/WebAuthenticationPane.c2
5 files changed, 718 insertions, 729 deletions
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 10cb0ca..3e6201b 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.32.1, the Vala compiler
+/* BuilderPane.c generated by valac 0.34.4, the Vala compiler
* generated from BuilderPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index a603147..b3397f2 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -1,4 +1,4 @@
-/* RESTSupport.c generated by valac 0.32.1, the Vala compiler
+/* RESTSupport.c generated by valac 0.34.4, the Vala compiler
* generated from RESTSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -578,7 +578,6 @@ static void _g_free0_ (gpointer var);
void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
static void _vala_SoupMultipart_free (SoupMultipart* self);
-static guint8* _vala_array_dup2 (guint8* self, int length);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
gpointer publishing_rest_support_xml_document_ref (gpointer instance);
@@ -612,7 +611,7 @@ enum {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_DUMMY_PROPERTY
};
PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length);
+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);
@@ -750,41 +749,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1 = 0;
guint8* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 781 "RESTSupport.c"
+#line 780 "RESTSupport.c"
}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 787 "RESTSupport.c"
+#line 786 "RESTSupport.c"
}
@@ -846,7 +845,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
_g_hmac_unref0 (mac);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 849 "RESTSupport.c"
+#line 848 "RESTSupport.c"
}
@@ -878,7 +877,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 881 "RESTSupport.c"
+#line 880 "RESTSupport.c"
}
@@ -892,7 +891,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
_tmp0_ = message;
#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 895 "RESTSupport.c"
+#line 894 "RESTSupport.c"
}
@@ -901,7 +900,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authenticated");
-#line 904 "RESTSupport.c"
+#line 903 "RESTSupport.c"
}
@@ -913,7 +912,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
_tmp0_ = err;
#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 916 "RESTSupport.c"
+#line 915 "RESTSupport.c"
}
@@ -922,7 +921,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 925 "RESTSupport.c"
+#line 924 "RESTSupport.c"
}
@@ -931,7 +930,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 934 "RESTSupport.c"
+#line 933 "RESTSupport.c"
}
@@ -949,7 +948,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
result = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 952 "RESTSupport.c"
+#line 951 "RESTSupport.c"
}
@@ -963,7 +962,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
_tmp0_ = self->priv->soup_session;
#line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_session_abort (_tmp0_);
-#line 966 "RESTSupport.c"
+#line 965 "RESTSupport.c"
}
@@ -978,14 +977,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
result = _tmp0_;
#line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 981 "RESTSupport.c"
+#line 980 "RESTSupport.c"
}
static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 988 "RESTSupport.c"
+#line 987 "RESTSupport.c"
}
@@ -1006,7 +1005,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
if (_tmp0_) {
#line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1009 "RESTSupport.c"
+#line 1008 "RESTSupport.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->soup_session;
@@ -1024,7 +1023,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1027 "RESTSupport.c"
+#line 1026 "RESTSupport.c"
}
@@ -1041,14 +1040,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
_tmp1_ = self->priv->soup_session;
#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 1044 "RESTSupport.c"
+#line 1043 "RESTSupport.c"
}
static void publishing_rest_support_value_session_init (GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1051 "RESTSupport.c"
+#line 1050 "RESTSupport.c"
}
@@ -1057,7 +1056,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1060 "RESTSupport.c"
+#line 1059 "RESTSupport.c"
}
}
@@ -1067,11 +1066,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
if (src_value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1070 "RESTSupport.c"
+#line 1069 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1074 "RESTSupport.c"
+#line 1073 "RESTSupport.c"
}
}
@@ -1079,37 +1078,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1082 "RESTSupport.c"
+#line 1081 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1089 "RESTSupport.c"
+#line 1088 "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 1096 "RESTSupport.c"
+#line 1095 "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 1100 "RESTSupport.c"
+#line 1099 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1104 "RESTSupport.c"
+#line 1103 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1108 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1112 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
}
@@ -1120,25 +1119,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
if (!object_p) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1123 "RESTSupport.c"
+#line 1122 "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 1129 "RESTSupport.c"
+#line 1128 "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 1133 "RESTSupport.c"
+#line 1132 "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 1137 "RESTSupport.c"
+#line 1136 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1141 "RESTSupport.c"
+#line 1140 "RESTSupport.c"
}
@@ -1152,7 +1151,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1155 "RESTSupport.c"
+#line 1154 "RESTSupport.c"
}
@@ -1161,7 +1160,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1164 "RESTSupport.c"
+#line 1163 "RESTSupport.c"
}
@@ -1181,17 +1180,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
value->data[0].v_pointer = v_object;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1184 "RESTSupport.c"
+#line 1183 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1188 "RESTSupport.c"
+#line 1187 "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 1194 "RESTSupport.c"
+#line 1193 "RESTSupport.c"
}
}
@@ -1210,17 +1209,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1213 "RESTSupport.c"
+#line 1212 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1217 "RESTSupport.c"
+#line 1216 "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 1223 "RESTSupport.c"
+#line 1222 "RESTSupport.c"
}
}
@@ -1240,7 +1239,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1243 "RESTSupport.c"
+#line 1242 "RESTSupport.c"
}
@@ -1255,7 +1254,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
self->priv->transactions_stopped = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1258 "RESTSupport.c"
+#line 1257 "RESTSupport.c"
}
@@ -1269,7 +1268,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
_g_free0 (self->priv->endpoint_url);
#line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
-#line 1272 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
}
@@ -1294,7 +1293,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1297 "RESTSupport.c"
+#line 1296 "RESTSupport.c"
}
@@ -1307,7 +1306,7 @@ void publishing_rest_support_session_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1310 "RESTSupport.c"
+#line 1309 "RESTSupport.c"
}
}
@@ -1318,7 +1317,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
switch (self) {
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1321 "RESTSupport.c"
+#line 1320 "RESTSupport.c"
{
gchar* _tmp0_ = NULL;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1327,11 +1326,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 1330 "RESTSupport.c"
+#line 1329 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1334 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
{
gchar* _tmp1_ = NULL;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1340,11 +1339,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 1343 "RESTSupport.c"
+#line 1342 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1347 "RESTSupport.c"
+#line 1346 "RESTSupport.c"
{
gchar* _tmp2_ = NULL;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1353,13 +1352,13 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1356 "RESTSupport.c"
+#line 1355 "RESTSupport.c"
}
default:
{
#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1362 "RESTSupport.c"
+#line 1361 "RESTSupport.c"
}
}
}
@@ -1378,7 +1377,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1381 "RESTSupport.c"
+#line 1380 "RESTSupport.c"
} else {
const gchar* _tmp1_ = NULL;
#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1389,7 +1388,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1392 "RESTSupport.c"
+#line 1391 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1400,14 +1399,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1403 "RESTSupport.c"
+#line 1402 "RESTSupport.c"
} else {
const gchar* _tmp3_ = NULL;
#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = str;
#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1410 "RESTSupport.c"
+#line 1409 "RESTSupport.c"
}
}
}
@@ -1456,14 +1455,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
self->value = _tmp3_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1459 "RESTSupport.c"
+#line 1458 "RESTSupport.c"
}
PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1466 "RESTSupport.c"
+#line 1465 "RESTSupport.c"
}
@@ -1495,7 +1494,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
result = _tmp5_;
#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1498 "RESTSupport.c"
+#line 1497 "RESTSupport.c"
}
@@ -1504,14 +1503,14 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst
result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1507 "RESTSupport.c"
+#line 1506 "RESTSupport.c"
}
static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1514 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
}
@@ -1534,7 +1533,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
_tmp1_ = inputArray;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = inputArray_length1;
-#line 1537 "RESTSupport.c"
+#line 1536 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -1546,14 +1545,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
arg_collection_length1 = _tmp1__length1;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1549 "RESTSupport.c"
+#line 1548 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp2_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp2_;
-#line 1556 "RESTSupport.c"
+#line 1555 "RESTSupport.c"
{
GeeTreeSet* _tmp3_ = NULL;
PublishingRESTSupportArgument* _tmp4_ = NULL;
@@ -1565,7 +1564,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1568 "RESTSupport.c"
+#line 1567 "RESTSupport.c"
}
}
}
@@ -1581,7 +1580,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
if (result_length1) {
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp8__length1;
-#line 1584 "RESTSupport.c"
+#line 1583 "RESTSupport.c"
}
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp8_;
@@ -1589,7 +1588,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
_g_object_unref0 (sorted_args);
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1592 "RESTSupport.c"
+#line 1591 "RESTSupport.c"
}
@@ -1610,14 +1609,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
result = _tmp2_;
#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1613 "RESTSupport.c"
+#line 1612 "RESTSupport.c"
}
static void publishing_rest_support_value_argument_init (GValue* value) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1620 "RESTSupport.c"
+#line 1619 "RESTSupport.c"
}
@@ -1626,7 +1625,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1629 "RESTSupport.c"
+#line 1628 "RESTSupport.c"
}
}
@@ -1636,11 +1635,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
if (src_value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1639 "RESTSupport.c"
+#line 1638 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1643 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
}
}
@@ -1648,37 +1647,37 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1651 "RESTSupport.c"
+#line 1650 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1658 "RESTSupport.c"
+#line 1657 "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 1665 "RESTSupport.c"
+#line 1664 "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 1669 "RESTSupport.c"
+#line 1668 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1673 "RESTSupport.c"
+#line 1672 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1677 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1681 "RESTSupport.c"
+#line 1680 "RESTSupport.c"
}
@@ -1689,25 +1688,25 @@ static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue*
if (!object_p) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1692 "RESTSupport.c"
+#line 1691 "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 1698 "RESTSupport.c"
+#line 1697 "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 1702 "RESTSupport.c"
+#line 1701 "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 1706 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1710 "RESTSupport.c"
+#line 1709 "RESTSupport.c"
}
@@ -1721,7 +1720,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1724 "RESTSupport.c"
+#line 1723 "RESTSupport.c"
}
@@ -1730,7 +1729,7 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1733 "RESTSupport.c"
+#line 1732 "RESTSupport.c"
}
@@ -1750,17 +1749,17 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
value->data[0].v_pointer = v_object;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1753 "RESTSupport.c"
+#line 1752 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1757 "RESTSupport.c"
+#line 1756 "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 1763 "RESTSupport.c"
+#line 1762 "RESTSupport.c"
}
}
@@ -1779,17 +1778,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1782 "RESTSupport.c"
+#line 1781 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1786 "RESTSupport.c"
+#line 1785 "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 1792 "RESTSupport.c"
+#line 1791 "RESTSupport.c"
}
}
@@ -1799,14 +1798,14 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr
publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1802 "RESTSupport.c"
+#line 1801 "RESTSupport.c"
}
static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1809 "RESTSupport.c"
+#line 1808 "RESTSupport.c"
}
@@ -1820,7 +1819,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
_g_free0 (self->key);
#line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
-#line 1823 "RESTSupport.c"
+#line 1822 "RESTSupport.c"
}
@@ -1845,7 +1844,7 @@ gpointer publishing_rest_support_argument_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1848 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
}
@@ -1858,7 +1857,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1861 "RESTSupport.c"
+#line 1860 "RESTSupport.c"
}
}
@@ -1866,7 +1865,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1869 "RESTSupport.c"
+#line 1868 "RESTSupport.c"
}
@@ -1930,14 +1929,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1933 "RESTSupport.c"
+#line 1932 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1940 "RESTSupport.c"
+#line 1939 "RESTSupport.c"
}
@@ -1987,14 +1986,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
_g_free0 (_tmp5_);
#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1990 "RESTSupport.c"
+#line 1989 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1997 "RESTSupport.c"
+#line 1996 "RESTSupport.c"
}
@@ -2028,14 +2027,14 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
_tmp6_ = _tmp5_->length;
#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2031 "RESTSupport.c"
+#line 2030 "RESTSupport.c"
}
static gpointer _g_error_copy0 (gpointer self) {
#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 2038 "RESTSupport.c"
+#line 2037 "RESTSupport.c"
}
@@ -2055,7 +2054,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
if (_tmp0_ != _tmp1_) {
#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2058 "RESTSupport.c"
+#line 2057 "RESTSupport.c"
}
{
SoupMessage* _tmp2_ = NULL;
@@ -2067,7 +2066,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2070 "RESTSupport.c"
+#line 2069 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2076,7 +2075,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2079 "RESTSupport.c"
+#line 2078 "RESTSupport.c"
}
}
goto __finally0;
@@ -2117,7 +2116,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
self->priv->err = _tmp8_;
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 2120 "RESTSupport.c"
+#line 2119 "RESTSupport.c"
}
__finally0:
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2128,7 +2127,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2131 "RESTSupport.c"
+#line 2130 "RESTSupport.c"
}
}
@@ -2136,7 +2135,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
static gpointer _g_object_ref0 (gpointer self) {
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_object_ref (self) : NULL;
-#line 2139 "RESTSupport.c"
+#line 2138 "RESTSupport.c"
}
@@ -2187,7 +2186,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp5_ = tls_errors;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2190 "RESTSupport.c"
+#line 2189 "RESTSupport.c"
GeeArrayList* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2197,13 +2196,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"bsite.");
#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 2199 "RESTSupport.c"
+#line 2198 "RESTSupport.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = tls_errors;
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2205 "RESTSupport.c"
+#line 2204 "RESTSupport.c"
GeeArrayList* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2213,13 +2212,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
" your computer’s calendar.");
#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 2214 "RESTSupport.c"
+#line 2213 "RESTSupport.c"
}
#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = tls_errors;
#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2220 "RESTSupport.c"
+#line 2219 "RESTSupport.c"
GeeArrayList* _tmp12_ = NULL;
const gchar* _tmp13_ = NULL;
#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2229,13 +2228,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"on.");
#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 2229 "RESTSupport.c"
+#line 2228 "RESTSupport.c"
}
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = tls_errors;
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2235 "RESTSupport.c"
+#line 2234 "RESTSupport.c"
GeeArrayList* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2245,13 +2244,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"upted.");
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 2244 "RESTSupport.c"
+#line 2243 "RESTSupport.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = tls_errors;
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2250 "RESTSupport.c"
+#line 2249 "RESTSupport.c"
GeeArrayList* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2261,13 +2260,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"zation that issued it.");
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 2259 "RESTSupport.c"
+#line 2258 "RESTSupport.c"
}
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = tls_errors;
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2265 "RESTSupport.c"
+#line 2264 "RESTSupport.c"
GeeArrayList* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2277,13 +2276,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
" weak encryption.");
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2274 "RESTSupport.c"
+#line 2273 "RESTSupport.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = tls_errors;
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2280 "RESTSupport.c"
+#line 2279 "RESTSupport.c"
GeeArrayList* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2293,7 +2292,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"the date on your computer’s calendar.");
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 2289 "RESTSupport.c"
+#line 2288 "RESTSupport.c"
}
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = g_string_new ("");
@@ -2307,7 +2306,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp29_ = _tmp28_;
#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp29_ == 1) {
-#line 2303 "RESTSupport.c"
+#line 2302 "RESTSupport.c"
GString* _tmp30_ = NULL;
GeeArrayList* _tmp31_ = NULL;
gpointer _tmp32_ = NULL;
@@ -2324,7 +2323,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append (_tmp30_, _tmp33_);
#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp33_);
-#line 2320 "RESTSupport.c"
+#line 2319 "RESTSupport.c"
} else {
{
GeeArrayList* _entry_list = NULL;
@@ -2353,7 +2352,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_entry_index = -1;
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2349 "RESTSupport.c"
+#line 2348 "RESTSupport.c"
gint _tmp39_ = 0;
gint _tmp40_ = 0;
gint _tmp41_ = 0;
@@ -2375,7 +2374,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (!(_tmp40_ < _tmp41_)) {
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2371 "RESTSupport.c"
+#line 2370 "RESTSupport.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _entry_list;
@@ -2393,11 +2392,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (entry);
-#line 2389 "RESTSupport.c"
+#line 2388 "RESTSupport.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_entry_list);
-#line 2393 "RESTSupport.c"
+#line 2392 "RESTSupport.c"
}
}
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2416,15 +2415,15 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (cert) {
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*cert = _vala_cert;
-#line 2412 "RESTSupport.c"
+#line 2411 "RESTSupport.c"
} else {
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 2416 "RESTSupport.c"
+#line 2415 "RESTSupport.c"
}
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2420 "RESTSupport.c"
+#line 2419 "RESTSupport.c"
}
@@ -2454,17 +2453,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
case SOUP_STATUS_OK:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2450 "RESTSupport.c"
+#line 2449 "RESTSupport.c"
{
#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2454 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2460 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
{
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -2497,7 +2496,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2493 "RESTSupport.c"
+#line 2492 "RESTSupport.c"
} else {
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2505,14 +2504,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2501 "RESTSupport.c"
+#line 2500 "RESTSupport.c"
}
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2508 "RESTSupport.c"
+#line 2507 "RESTSupport.c"
{
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
@@ -2545,7 +2544,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2541 "RESTSupport.c"
+#line 2540 "RESTSupport.c"
} else {
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2553,12 +2552,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2549 "RESTSupport.c"
+#line 2548 "RESTSupport.c"
}
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2554 "RESTSupport.c"
+#line 2553 "RESTSupport.c"
{
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
@@ -2582,7 +2581,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2578 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
} else {
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2590,7 +2589,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2586 "RESTSupport.c"
+#line 2585 "RESTSupport.c"
}
}
default:
@@ -2606,7 +2605,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
_tmp23_ = _tmp22_;
#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_ >= ((guint) 100)) {
-#line 2602 "RESTSupport.c"
+#line 2601 "RESTSupport.c"
gchar* _tmp24_ = NULL;
gchar* _tmp25_ = NULL;
SoupMessage* _tmp26_ = NULL;
@@ -2652,7 +2651,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2648 "RESTSupport.c"
+#line 2647 "RESTSupport.c"
} else {
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2660,7 +2659,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2656 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
}
} else {
gchar* _tmp35_ = NULL;
@@ -2694,7 +2693,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2690 "RESTSupport.c"
+#line 2689 "RESTSupport.c"
} else {
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2702,7 +2701,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2698 "RESTSupport.c"
+#line 2697 "RESTSupport.c"
}
}
}
@@ -2719,7 +2718,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
if (_tmp45_ == NULL) {
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = TRUE;
-#line 2715 "RESTSupport.c"
+#line 2714 "RESTSupport.c"
} else {
SoupMessage* _tmp46_ = NULL;
SoupMessageBody* _tmp47_ = NULL;
@@ -2735,11 +2734,11 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
_tmp48__length1 = (gint) _tmp47_->length;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _tmp48__length1 == 0;
-#line 2731 "RESTSupport.c"
+#line 2730 "RESTSupport.c"
}
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp42_) {
-#line 2735 "RESTSupport.c"
+#line 2734 "RESTSupport.c"
gchar* _tmp49_ = NULL;
gchar* _tmp50_ = NULL;
GError* _tmp51_ = NULL;
@@ -2762,7 +2761,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2758 "RESTSupport.c"
+#line 2757 "RESTSupport.c"
} else {
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2770,7 +2769,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2766 "RESTSupport.c"
+#line 2765 "RESTSupport.c"
}
}
}
@@ -2783,17 +2782,17 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2779 "RESTSupport.c"
+#line 2778 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_ = NULL;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2785 "RESTSupport.c"
+#line 2784 "RESTSupport.c"
}
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2789 "RESTSupport.c"
+#line 2788 "RESTSupport.c"
}
@@ -2823,13 +2822,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
if (result_length1) {
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2819 "RESTSupport.c"
+#line 2818 "RESTSupport.c"
}
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2825 "RESTSupport.c"
+#line 2824 "RESTSupport.c"
}
@@ -2869,13 +2868,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
if (result_length1) {
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2865 "RESTSupport.c"
+#line 2864 "RESTSupport.c"
}
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2871 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
}
@@ -2887,14 +2886,14 @@ void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportT
_tmp0_ = is_executed;
#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = _tmp0_;
-#line 2883 "RESTSupport.c"
+#line 2882 "RESTSupport.c"
}
static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2890 "RESTSupport.c"
+#line 2889 "RESTSupport.c"
}
@@ -2942,23 +2941,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
_tmp8_ = self->priv->err;
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2938 "RESTSupport.c"
+#line 2937 "RESTSupport.c"
GError* _tmp9_ = NULL;
#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2944 "RESTSupport.c"
+#line 2943 "RESTSupport.c"
} else {
#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "completed");
-#line 2948 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
}
#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2954 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
GError* _tmp11_ = NULL;
GError* _tmp12_ = NULL;
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2973,7 +2972,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_propagate_error (error, _inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2969 "RESTSupport.c"
+#line 2968 "RESTSupport.c"
} else {
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2981,7 +2980,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_clear_error (&_inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2977 "RESTSupport.c"
+#line 2976 "RESTSupport.c"
}
}
}
@@ -3015,7 +3014,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
result = _tmp5_;
#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3011 "RESTSupport.c"
+#line 3010 "RESTSupport.c"
}
@@ -3038,7 +3037,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
_tmp3_ = value;
#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3034 "RESTSupport.c"
+#line 3033 "RESTSupport.c"
}
@@ -3047,7 +3046,7 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3043 "RESTSupport.c"
+#line 3042 "RESTSupport.c"
}
@@ -3081,19 +3080,19 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
self->priv->use_custom_payload = FALSE;
#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3077 "RESTSupport.c"
+#line 3076 "RESTSupport.c"
}
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = payload_length;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ > ((gulong) 0)) {
-#line 3083 "RESTSupport.c"
+#line 3082 "RESTSupport.c"
gulong _tmp4_ = 0UL;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = payload_length;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp4_;
-#line 3089 "RESTSupport.c"
+#line 3088 "RESTSupport.c"
} else {
const gchar* _tmp5_ = NULL;
gint _tmp6_ = 0;
@@ -3106,7 +3105,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
_tmp7_ = _tmp6_;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (gulong) _tmp7_;
-#line 3102 "RESTSupport.c"
+#line 3101 "RESTSupport.c"
}
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
length = _tmp2_;
@@ -3128,7 +3127,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = TRUE;
-#line 3124 "RESTSupport.c"
+#line 3123 "RESTSupport.c"
}
@@ -3147,7 +3146,7 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans
_g_object_unref0 (self->priv->message);
#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = _tmp1_;
-#line 3143 "RESTSupport.c"
+#line 3142 "RESTSupport.c"
}
@@ -3162,7 +3161,7 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
result = _tmp0_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3158 "RESTSupport.c"
+#line 3157 "RESTSupport.c"
}
@@ -3188,14 +3187,14 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
result = _tmp3_;
#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3184 "RESTSupport.c"
+#line 3183 "RESTSupport.c"
}
static void _vala_SoupURI_free (SoupURI* self) {
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3191 "RESTSupport.c"
+#line 3190 "RESTSupport.c"
}
@@ -3225,7 +3224,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_propagate_error (error, _inner_error_);
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3221 "RESTSupport.c"
+#line 3220 "RESTSupport.c"
} else {
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3233,18 +3232,18 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3229 "RESTSupport.c"
+#line 3228 "RESTSupport.c"
}
}
#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3234 "RESTSupport.c"
+#line 3233 "RESTSupport.c"
}
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_method (self);
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3240 "RESTSupport.c"
+#line 3239 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3253,25 +3252,25 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp2__length1 = self->priv->arguments_length1;
#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3249 "RESTSupport.c"
+#line 3248 "RESTSupport.c"
}
#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("");
#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp3_;
-#line 3255 "RESTSupport.c"
+#line 3254 "RESTSupport.c"
{
gint i = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 3260 "RESTSupport.c"
+#line 3259 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 3267 "RESTSupport.c"
+#line 3266 "RESTSupport.c"
gint _tmp6_ = 0;
PublishingRESTSupportArgument** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
@@ -3288,13 +3287,13 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
gint _tmp16__length1 = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 3284 "RESTSupport.c"
+#line 3283 "RESTSupport.c"
gint _tmp5_ = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = i;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = _tmp5_ + 1;
-#line 3290 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
}
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
@@ -3308,7 +3307,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
if (!(_tmp6_ < _tmp7__length1)) {
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 3304 "RESTSupport.c"
+#line 3303 "RESTSupport.c"
}
#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = formdata_string;
@@ -3340,7 +3339,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp16__length1 = self->priv->arguments_length1;
#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3336 "RESTSupport.c"
+#line 3335 "RESTSupport.c"
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3351,7 +3350,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp18_;
-#line 3347 "RESTSupport.c"
+#line 3346 "RESTSupport.c"
}
}
}
@@ -3364,7 +3363,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp20_ = publishing_rest_support_transaction_get_method (self);
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3360 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3373,15 +3372,15 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp21__length1 = self->priv->arguments_length1;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = _tmp21__length1 > 0;
-#line 3369 "RESTSupport.c"
+#line 3368 "RESTSupport.c"
} else {
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = FALSE;
-#line 3373 "RESTSupport.c"
+#line 3372 "RESTSupport.c"
}
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp19_) {
-#line 3377 "RESTSupport.c"
+#line 3376 "RESTSupport.c"
SoupMessage* _tmp22_ = NULL;
SoupURI* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
@@ -3437,7 +3436,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
soup_message_set_uri (_tmp31_, _tmp34_);
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp34_);
-#line 3433 "RESTSupport.c"
+#line 3432 "RESTSupport.c"
} else {
SoupMessage* _tmp35_ = NULL;
const gchar* _tmp36_ = NULL;
@@ -3457,11 +3456,11 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp38__length1 = _tmp37__length1;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3453 "RESTSupport.c"
+#line 3452 "RESTSupport.c"
}
#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3457 "RESTSupport.c"
+#line 3456 "RESTSupport.c"
{
SoupMessage* _tmp39_ = NULL;
SoupURI* _tmp40_ = NULL;
@@ -3483,7 +3482,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
publishing_rest_support_transaction_send (self, &_inner_error_);
#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3479 "RESTSupport.c"
+#line 3478 "RESTSupport.c"
goto __finally1;
}
}
@@ -3494,7 +3493,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp43_ = old_url;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp43_ != NULL) {
-#line 3490 "RESTSupport.c"
+#line 3489 "RESTSupport.c"
SoupMessage* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
SoupURI* _tmp46_ = NULL;
@@ -3511,7 +3510,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
soup_message_set_uri (_tmp44_, _tmp47_);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp47_);
-#line 3507 "RESTSupport.c"
+#line 3506 "RESTSupport.c"
}
}
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3528,7 +3527,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3524 "RESTSupport.c"
+#line 3523 "RESTSupport.c"
} else {
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
@@ -3542,7 +3541,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3538 "RESTSupport.c"
+#line 3537 "RESTSupport.c"
}
}
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3551,7 +3550,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (old_url);
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3547 "RESTSupport.c"
+#line 3546 "RESTSupport.c"
}
@@ -3560,7 +3559,7 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3556 "RESTSupport.c"
+#line 3555 "RESTSupport.c"
}
@@ -3592,7 +3591,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
result = _tmp4_;
#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3588 "RESTSupport.c"
+#line 3587 "RESTSupport.c"
}
@@ -3615,7 +3614,7 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
result = _tmp2_;
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3611 "RESTSupport.c"
+#line 3610 "RESTSupport.c"
}
@@ -3638,7 +3637,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
result = _tmp2_;
#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3634 "RESTSupport.c"
+#line 3633 "RESTSupport.c"
}
@@ -3649,13 +3648,13 @@ static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* lengt
*size = (*size) ? (2 * (*size)) : 4;
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3645 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
}
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3651 "RESTSupport.c"
+#line 3650 "RESTSupport.c"
}
@@ -3683,7 +3682,7 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3679 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
}
@@ -3697,7 +3696,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_tmp1_ = self->priv->endpoint_url;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3693 "RESTSupport.c"
+#line 3692 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3708,7 +3707,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3704 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -3720,20 +3719,20 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3716 "RESTSupport.c"
+#line 3715 "RESTSupport.c"
}
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3722 "RESTSupport.c"
+#line 3721 "RESTSupport.c"
}
static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3729 "RESTSupport.c"
+#line 3728 "RESTSupport.c"
}
@@ -3751,7 +3750,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
result = _tmp1_;
#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3747 "RESTSupport.c"
+#line 3746 "RESTSupport.c"
}
@@ -3770,26 +3769,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
data1 = closure->data;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3766 "RESTSupport.c"
+#line 3765 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = param_values->data[0].v_pointer;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3772 "RESTSupport.c"
+#line 3771 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3778 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
}
static void publishing_rest_support_value_transaction_init (GValue* value) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3785 "RESTSupport.c"
+#line 3784 "RESTSupport.c"
}
@@ -3798,7 +3797,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value)
if (value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3794 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
}
}
@@ -3808,11 +3807,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3804 "RESTSupport.c"
+#line 3803 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3808 "RESTSupport.c"
+#line 3807 "RESTSupport.c"
}
}
@@ -3820,37 +3819,37 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3816 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 3823 "RESTSupport.c"
+#line 3822 "RESTSupport.c"
PublishingRESTSupportTransaction* object;
object = collect_values[0].v_pointer;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3830 "RESTSupport.c"
+#line 3829 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3834 "RESTSupport.c"
+#line 3833 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3838 "RESTSupport.c"
+#line 3837 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3842 "RESTSupport.c"
+#line 3841 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3846 "RESTSupport.c"
+#line 3845 "RESTSupport.c"
}
@@ -3861,25 +3860,25 @@ static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValu
if (!object_p) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3857 "RESTSupport.c"
+#line 3856 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3863 "RESTSupport.c"
+#line 3862 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3867 "RESTSupport.c"
+#line 3866 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3871 "RESTSupport.c"
+#line 3870 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3875 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
}
@@ -3893,7 +3892,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3889 "RESTSupport.c"
+#line 3888 "RESTSupport.c"
}
@@ -3902,7 +3901,7 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3898 "RESTSupport.c"
+#line 3897 "RESTSupport.c"
}
@@ -3922,17 +3921,17 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
value->data[0].v_pointer = v_object;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3918 "RESTSupport.c"
+#line 3917 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3922 "RESTSupport.c"
+#line 3921 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3928 "RESTSupport.c"
+#line 3927 "RESTSupport.c"
}
}
@@ -3951,17 +3950,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3947 "RESTSupport.c"
+#line 3946 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3951 "RESTSupport.c"
+#line 3950 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3957 "RESTSupport.c"
+#line 3956 "RESTSupport.c"
}
}
@@ -3983,7 +3982,7 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3979 "RESTSupport.c"
+#line 3978 "RESTSupport.c"
}
@@ -4004,7 +4003,7 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
self->priv->endpoint_url = NULL;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 4000 "RESTSupport.c"
+#line 3999 "RESTSupport.c"
}
@@ -4022,7 +4021,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
_g_error_free0 (self->priv->err);
#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 4018 "RESTSupport.c"
+#line 4017 "RESTSupport.c"
}
@@ -4047,7 +4046,7 @@ gpointer publishing_rest_support_transaction_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 4043 "RESTSupport.c"
+#line 4042 "RESTSupport.c"
}
@@ -4060,7 +4059,7 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4056 "RESTSupport.c"
+#line 4055 "RESTSupport.c"
}
}
@@ -4115,14 +4114,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
self->message_headers = _tmp7_;
#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4111 "RESTSupport.c"
+#line 4110 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 4118 "RESTSupport.c"
+#line 4117 "RESTSupport.c"
}
@@ -4181,14 +4180,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
self->message_headers = _tmp8_;
#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4177 "RESTSupport.c"
+#line 4176 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4184 "RESTSupport.c"
+#line 4183 "RESTSupport.c"
}
@@ -4211,7 +4210,7 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
_tmp2_ = value;
#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4207 "RESTSupport.c"
+#line 4206 "RESTSupport.c"
}
@@ -4222,7 +4221,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
_tmp0_ = media_type;
#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4218 "RESTSupport.c"
+#line 4217 "RESTSupport.c"
gchar* _tmp1_ = NULL;
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup ("image/jpeg");
@@ -4230,14 +4229,14 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
result = _tmp1_;
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4226 "RESTSupport.c"
+#line 4225 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp2_ = 0;
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = media_type;
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4233 "RESTSupport.c"
+#line 4232 "RESTSupport.c"
gchar* _tmp3_ = NULL;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("video/mpeg");
@@ -4245,7 +4244,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
result = _tmp3_;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4241 "RESTSupport.c"
+#line 4240 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp4_ = 0;
GEnumValue* _tmp5_;
@@ -4255,7 +4254,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4251 "RESTSupport.c"
+#line 4250 "RESTSupport.c"
}
}
}
@@ -4264,7 +4263,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
static void _g_free0_ (gpointer var) {
#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 4260 "RESTSupport.c"
+#line 4259 "RESTSupport.c"
}
@@ -4315,14 +4314,14 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
result = _result_;
#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4311 "RESTSupport.c"
+#line 4310 "RESTSupport.c"
}
static gpointer _g_hash_table_ref0 (gpointer self) {
#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 4318 "RESTSupport.c"
+#line 4317 "RESTSupport.c"
}
@@ -4341,28 +4340,21 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
_g_hash_table_unref0 (self->binary_disposition_table);
#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = _tmp1_;
-#line 4337 "RESTSupport.c"
+#line 4336 "RESTSupport.c"
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4344 "RESTSupport.c"
-}
-
-
-static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return g_memdup (self, length * sizeof (guint8));
-#line 4351 "RESTSupport.c"
+#line 4343 "RESTSupport.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4358 "RESTSupport.c"
+#line 4350 "RESTSupport.c"
}
@@ -4390,8 +4382,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gint _tmp23__length1 = 0;
guint8* _tmp24_ = NULL;
gint _tmp24__length1 = 0;
- guint8* _tmp25_ = NULL;
- gint _tmp25__length1 = 0;
+ gsize _tmp25_ = 0UL;
SoupBuffer* _tmp26_ = NULL;
SoupMultipart* _tmp27_ = NULL;
SpitPublishingPublishable* _tmp28_ = NULL;
@@ -4447,7 +4438,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp4_ = request_arguments;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4443 "RESTSupport.c"
+#line 4434 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -4459,14 +4450,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
arg_collection_length1 = _tmp4__length1;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4455 "RESTSupport.c"
+#line 4446 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4462 "RESTSupport.c"
+#line 4453 "RESTSupport.c"
{
SoupMultipart* _tmp6_ = NULL;
PublishingRESTSupportArgument* _tmp7_ = NULL;
@@ -4487,7 +4478,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4483 "RESTSupport.c"
+#line 4474 "RESTSupport.c"
}
}
}
@@ -4525,7 +4516,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4521 "RESTSupport.c"
+#line 4512 "RESTSupport.c"
goto __catch2_g_file_error;
}
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4540,7 +4531,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4536 "RESTSupport.c"
+#line 4527 "RESTSupport.c"
}
}
goto __finally2;
@@ -4561,7 +4552,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_inner_error_ = _tmp19_;
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4557 "RESTSupport.c"
+#line 4548 "RESTSupport.c"
goto __finally2;
}
__finally2:
@@ -4579,7 +4570,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4575 "RESTSupport.c"
+#line 4566 "RESTSupport.c"
} else {
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
@@ -4593,7 +4584,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4589 "RESTSupport.c"
+#line 4580 "RESTSupport.c"
}
}
#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4611,11 +4602,9 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24__length1 = _tmp23__length1;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup2 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
+ _tmp25_ = payload_length;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25__length1 = _tmp24__length1;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = soup_buffer_new_take (_tmp25_, _tmp25__length1);
+ _tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
bindable_data = _tmp26_;
#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4684,7 +4673,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
cont = _tmp49_;
#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4680 "RESTSupport.c"
+#line 4669 "RESTSupport.c"
gboolean _tmp50_ = FALSE;
SoupMessage* _tmp51_ = NULL;
SoupMessageHeaders* _tmp52_ = NULL;
@@ -4702,7 +4691,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (!_tmp50_) {
#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4698 "RESTSupport.c"
+#line 4687 "RESTSupport.c"
}
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp51_ = outbound_message;
@@ -4732,7 +4721,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp60_ = gee_map_iterator_next (_tmp59_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
cont = _tmp60_;
-#line 4728 "RESTSupport.c"
+#line 4717 "RESTSupport.c"
}
#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp61_ = outbound_message;
@@ -4762,7 +4751,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4758 "RESTSupport.c"
+#line 4747 "RESTSupport.c"
} else {
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
@@ -4782,7 +4771,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4778 "RESTSupport.c"
+#line 4767 "RESTSupport.c"
}
}
#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4797,7 +4786,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
__vala_SoupMultipart_free0 (message_parts);
#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4793 "RESTSupport.c"
+#line 4782 "RESTSupport.c"
}
@@ -4810,7 +4799,7 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4806 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
}
@@ -4821,7 +4810,7 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing
self->publishable = NULL;
#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4817 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
}
@@ -4839,7 +4828,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
_g_object_unref0 (self->message_headers);
#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4835 "RESTSupport.c"
+#line 4824 "RESTSupport.c"
}
@@ -4866,14 +4855,14 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co
self->priv->document = _tmp0_;
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4862 "RESTSupport.c"
+#line 4851 "RESTSupport.c"
}
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4869 "RESTSupport.c"
+#line 4858 "RESTSupport.c"
}
@@ -4891,7 +4880,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
result = _tmp1_;
#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4887 "RESTSupport.c"
+#line 4876 "RESTSupport.c"
}
@@ -4913,21 +4902,21 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp1_ = _tmp0_->children;
#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp1_;
-#line 4909 "RESTSupport.c"
+#line 4898 "RESTSupport.c"
{
gboolean _tmp2_ = FALSE;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = TRUE;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4916 "RESTSupport.c"
+#line 4905 "RESTSupport.c"
xmlNode* _tmp5_ = NULL;
xmlNode* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp2_) {
-#line 4923 "RESTSupport.c"
+#line 4912 "RESTSupport.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4936,7 +4925,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp4_ = _tmp3_->next;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp4_;
-#line 4932 "RESTSupport.c"
+#line 4921 "RESTSupport.c"
}
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = FALSE;
@@ -4946,7 +4935,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
if (!(_tmp5_ != NULL)) {
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4942 "RESTSupport.c"
+#line 4931 "RESTSupport.c"
}
#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = doc_node_iter;
@@ -4956,7 +4945,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp8_ = child_name;
#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4952 "RESTSupport.c"
+#line 4941 "RESTSupport.c"
xmlNode* _tmp9_ = NULL;
#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = doc_node_iter;
@@ -4964,7 +4953,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
result = _tmp9_;
#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4960 "RESTSupport.c"
+#line 4949 "RESTSupport.c"
}
}
}
@@ -4980,7 +4969,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_propagate_error (error, _inner_error_);
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4976 "RESTSupport.c"
+#line 4965 "RESTSupport.c"
} else {
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4988,7 +4977,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4984 "RESTSupport.c"
+#line 4973 "RESTSupport.c"
}
}
@@ -5017,7 +5006,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_tmp3_ = value_string;
#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ == NULL) {
-#line 5013 "RESTSupport.c"
+#line 5002 "RESTSupport.c"
const gchar* _tmp4_ = NULL;
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -5040,7 +5029,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_g_free0 (value_string);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5036 "RESTSupport.c"
+#line 5025 "RESTSupport.c"
} else {
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
@@ -5050,14 +5039,14 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
g_clear_error (&_inner_error_);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5046 "RESTSupport.c"
+#line 5035 "RESTSupport.c"
}
}
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5053 "RESTSupport.c"
+#line 5042 "RESTSupport.c"
}
@@ -5066,21 +5055,21 @@ static gchar* string_chug (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5076 "RESTSupport.c"
+#line 5065 "RESTSupport.c"
}
@@ -5089,21 +5078,21 @@ static gchar* string_chomp (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5099 "RESTSupport.c"
+#line 5088 "RESTSupport.c"
}
@@ -5144,7 +5133,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
if (_tmp1_ == NULL) {
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 5140 "RESTSupport.c"
+#line 5129 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
@@ -5157,11 +5146,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp4_ = _tmp3_;
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp4_ == 0;
-#line 5153 "RESTSupport.c"
+#line 5142 "RESTSupport.c"
}
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 5157 "RESTSupport.c"
+#line 5146 "RESTSupport.c"
GError* _tmp5_ = NULL;
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
@@ -5173,7 +5162,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5169 "RESTSupport.c"
+#line 5158 "RESTSupport.c"
} else {
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5181,7 +5170,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5177 "RESTSupport.c"
+#line 5166 "RESTSupport.c"
}
}
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5206,7 +5195,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
if (_tmp13_) {
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = TRUE;
-#line 5202 "RESTSupport.c"
+#line 5191 "RESTSupport.c"
} else {
const gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
@@ -5232,11 +5221,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_tmp18_);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp16_);
-#line 5228 "RESTSupport.c"
+#line 5217 "RESTSupport.c"
}
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 5232 "RESTSupport.c"
+#line 5221 "RESTSupport.c"
GError* _tmp20_ = NULL;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5248,7 +5237,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5244 "RESTSupport.c"
+#line 5233 "RESTSupport.c"
} else {
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5256,7 +5245,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5252 "RESTSupport.c"
+#line 5241 "RESTSupport.c"
}
}
#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5275,7 +5264,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp26_ = doc;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp26_ == NULL) {
-#line 5271 "RESTSupport.c"
+#line 5260 "RESTSupport.c"
GError* _tmp27_ = NULL;
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5287,7 +5276,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5283 "RESTSupport.c"
+#line 5272 "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);
@@ -5295,7 +5284,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5291 "RESTSupport.c"
+#line 5280 "RESTSupport.c"
}
}
#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5304,7 +5293,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp29_ = _tmp28_->children;
#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp29_ == NULL) {
-#line 5300 "RESTSupport.c"
+#line 5289 "RESTSupport.c"
GError* _tmp30_ = NULL;
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5316,7 +5305,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5312 "RESTSupport.c"
+#line 5301 "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);
@@ -5324,7 +5313,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5320 "RESTSupport.c"
+#line 5309 "RESTSupport.c"
}
}
#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5347,7 +5336,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp36_ = _result_;
#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp36_ != NULL) {
-#line 5343 "RESTSupport.c"
+#line 5332 "RESTSupport.c"
const gchar* _tmp37_ = NULL;
GError* _tmp38_ = NULL;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5366,7 +5355,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_publishing_rest_support_xml_document_unref0 (rest_doc);
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5362 "RESTSupport.c"
+#line 5351 "RESTSupport.c"
} else {
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
@@ -5378,7 +5367,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5374 "RESTSupport.c"
+#line 5363 "RESTSupport.c"
}
}
#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5387,14 +5376,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_result_);
#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5383 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
}
static void publishing_rest_support_value_xml_document_init (GValue* value) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5390 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
}
@@ -5403,7 +5392,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value
if (value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5399 "RESTSupport.c"
+#line 5388 "RESTSupport.c"
}
}
@@ -5413,11 +5402,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5409 "RESTSupport.c"
+#line 5398 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5413 "RESTSupport.c"
+#line 5402 "RESTSupport.c"
}
}
@@ -5425,37 +5414,37 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5421 "RESTSupport.c"
+#line 5410 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5428 "RESTSupport.c"
+#line 5417 "RESTSupport.c"
PublishingRESTSupportXmlDocument* object;
object = collect_values[0].v_pointer;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5435 "RESTSupport.c"
+#line 5424 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5439 "RESTSupport.c"
+#line 5428 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5443 "RESTSupport.c"
+#line 5432 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5447 "RESTSupport.c"
+#line 5436 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5451 "RESTSupport.c"
+#line 5440 "RESTSupport.c"
}
@@ -5466,25 +5455,25 @@ static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GVal
if (!object_p) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5462 "RESTSupport.c"
+#line 5451 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5468 "RESTSupport.c"
+#line 5457 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5472 "RESTSupport.c"
+#line 5461 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5476 "RESTSupport.c"
+#line 5465 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5480 "RESTSupport.c"
+#line 5469 "RESTSupport.c"
}
@@ -5498,7 +5487,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5494 "RESTSupport.c"
+#line 5483 "RESTSupport.c"
}
@@ -5507,7 +5496,7 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5503 "RESTSupport.c"
+#line 5492 "RESTSupport.c"
}
@@ -5527,17 +5516,17 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5523 "RESTSupport.c"
+#line 5512 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5527 "RESTSupport.c"
+#line 5516 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5533 "RESTSupport.c"
+#line 5522 "RESTSupport.c"
}
}
@@ -5556,17 +5545,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5552 "RESTSupport.c"
+#line 5541 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5556 "RESTSupport.c"
+#line 5545 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5562 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
}
}
@@ -5578,7 +5567,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5574 "RESTSupport.c"
+#line 5563 "RESTSupport.c"
}
@@ -5587,7 +5576,7 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu
self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5583 "RESTSupport.c"
+#line 5572 "RESTSupport.c"
}
@@ -5602,7 +5591,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
_tmp0_ = self->priv->document;
#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5598 "RESTSupport.c"
+#line 5587 "RESTSupport.c"
}
@@ -5627,7 +5616,7 @@ gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5623 "RESTSupport.c"
+#line 5612 "RESTSupport.c"
}
@@ -5640,7 +5629,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5636 "RESTSupport.c"
+#line 5625 "RESTSupport.c"
}
}
@@ -5669,7 +5658,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
current_char = _tmp2_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5665 "RESTSupport.c"
+#line 5654 "RESTSupport.c"
gint current_char_value = 0;
const gchar* _tmp3_ = NULL;
gunichar _tmp4_ = 0U;
@@ -5693,55 +5682,55 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
if (_tmp5_ < 1) {
#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5689 "RESTSupport.c"
+#line 5678 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp9_ < 128) {
-#line 5695 "RESTSupport.c"
+#line 5684 "RESTSupport.c"
gint _tmp10_ = 0;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5701 "RESTSupport.c"
+#line 5690 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = FALSE;
-#line 5705 "RESTSupport.c"
+#line 5694 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_) {
-#line 5709 "RESTSupport.c"
+#line 5698 "RESTSupport.c"
gint _tmp11_ = 0;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5715 "RESTSupport.c"
+#line 5704 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = FALSE;
-#line 5719 "RESTSupport.c"
+#line 5708 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_) {
-#line 5723 "RESTSupport.c"
+#line 5712 "RESTSupport.c"
gint _tmp12_ = 0;
#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = current_char_value;
#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5729 "RESTSupport.c"
+#line 5718 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = FALSE;
-#line 5733 "RESTSupport.c"
+#line 5722 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 5737 "RESTSupport.c"
+#line 5726 "RESTSupport.c"
GString* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
gunichar _tmp15_ = 0U;
@@ -5753,7 +5742,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5749 "RESTSupport.c"
+#line 5738 "RESTSupport.c"
} else {
GString* _tmp16_ = NULL;
gint _tmp17_ = 0;
@@ -5771,7 +5760,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
g_string_append (_tmp16_, _tmp19_);
#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp19_);
-#line 5767 "RESTSupport.c"
+#line 5756 "RESTSupport.c"
}
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = current_char;
@@ -5783,7 +5772,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_g_free0 (current_char);
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
current_char = _tmp22_;
-#line 5779 "RESTSupport.c"
+#line 5768 "RESTSupport.c"
}
#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = encoded_str_builder;
@@ -5799,28 +5788,28 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_g_string_free0 (encoded_str_builder);
#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5795 "RESTSupport.c"
+#line 5784 "RESTSupport.c"
}
-static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
SpitPublishingPublishable** result;
int i;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5806 "RESTSupport.c"
+#line 5795 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_ = NULL;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5812 "RESTSupport.c"
+#line 5801 "RESTSupport.c"
}
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5816 "RESTSupport.c"
+#line 5805 "RESTSupport.c"
}
@@ -5841,7 +5830,7 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = publishables_length1;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = _tmp0__length1;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5862,14 +5851,14 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
self->priv->session = _tmp3_;
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5858 "RESTSupport.c"
+#line 5847 "RESTSupport.c"
}
static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5865 "RESTSupport.c"
+#line 5854 "RESTSupport.c"
}
@@ -5889,7 +5878,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp0_ = self->priv->publishables;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5885 "RESTSupport.c"
+#line 5874 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -5901,14 +5890,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
publishable_collection_length1 = _tmp0__length1;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5897 "RESTSupport.c"
+#line 5886 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_ = NULL;
SpitPublishingPublishable* publishable = NULL;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5904 "RESTSupport.c"
+#line 5893 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5941,7 +5930,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp4_ = file;
#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5937 "RESTSupport.c"
+#line 5926 "RESTSupport.c"
gint _tmp5_ = 0;
#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
@@ -5953,7 +5942,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5949 "RESTSupport.c"
+#line 5938 "RESTSupport.c"
}
#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
@@ -5969,7 +5958,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp8__target = self->priv->status_updated_target;
#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5965 "RESTSupport.c"
+#line 5954 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_ = NULL;
void* _tmp9__target = NULL;
gint _tmp10_ = 0;
@@ -5984,7 +5973,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp11_ = fraction_complete;
#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5980 "RESTSupport.c"
+#line 5969 "RESTSupport.c"
}
#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
@@ -6002,7 +5991,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp16_ = txn;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5998 "RESTSupport.c"
+#line 5987 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_ = NULL;
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6013,7 +6002,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 6009 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6028,7 +6017,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6024 "RESTSupport.c"
+#line 6013 "RESTSupport.c"
}
}
goto __finally3;
@@ -6048,7 +6037,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
stop = TRUE;
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 6044 "RESTSupport.c"
+#line 6033 "RESTSupport.c"
}
__finally3:
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6065,7 +6054,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6061 "RESTSupport.c"
+#line 6050 "RESTSupport.c"
}
#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
@@ -6085,7 +6074,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6081 "RESTSupport.c"
+#line 6070 "RESTSupport.c"
}
#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
@@ -6097,7 +6086,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (file);
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 6093 "RESTSupport.c"
+#line 6082 "RESTSupport.c"
}
}
}
@@ -6105,13 +6094,13 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp23_ = stop;
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 6101 "RESTSupport.c"
+#line 6090 "RESTSupport.c"
gint _tmp24_ = 0;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 6107 "RESTSupport.c"
+#line 6096 "RESTSupport.c"
}
}
@@ -6160,7 +6149,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
_tmp7__target = self->priv->status_updated_target;
#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_ != NULL) {
-#line 6156 "RESTSupport.c"
+#line 6145 "RESTSupport.c"
SpitPublishingProgressCallback _tmp8_ = NULL;
void* _tmp8__target = NULL;
gint _tmp9_ = 0;
@@ -6175,7 +6164,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
_tmp10_ = fraction_complete;
#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6171 "RESTSupport.c"
+#line 6160 "RESTSupport.c"
}
}
@@ -6194,7 +6183,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
result = _tmp1_;
#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6190 "RESTSupport.c"
+#line 6179 "RESTSupport.c"
}
@@ -6221,7 +6210,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
result = _tmp3_;
#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6217 "RESTSupport.c"
+#line 6206 "RESTSupport.c"
}
@@ -6230,7 +6219,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6226 "RESTSupport.c"
+#line 6215 "RESTSupport.c"
}
@@ -6239,7 +6228,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6235 "RESTSupport.c"
+#line 6224 "RESTSupport.c"
}
@@ -6266,7 +6255,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
if (_tmp1__length1 > 0) {
#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 6262 "RESTSupport.c"
+#line 6251 "RESTSupport.c"
}
}
@@ -6274,7 +6263,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6270 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
}
@@ -6283,7 +6272,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val
if (value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6279 "RESTSupport.c"
+#line 6268 "RESTSupport.c"
}
}
@@ -6293,11 +6282,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
if (src_value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6289 "RESTSupport.c"
+#line 6278 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6293 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
}
}
@@ -6305,37 +6294,37 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6301 "RESTSupport.c"
+#line 6290 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 6308 "RESTSupport.c"
+#line 6297 "RESTSupport.c"
PublishingRESTSupportBatchUploader* object;
object = collect_values[0].v_pointer;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6315 "RESTSupport.c"
+#line 6304 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6319 "RESTSupport.c"
+#line 6308 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6323 "RESTSupport.c"
+#line 6312 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6327 "RESTSupport.c"
+#line 6316 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6331 "RESTSupport.c"
+#line 6320 "RESTSupport.c"
}
@@ -6346,25 +6335,25 @@ static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GV
if (!object_p) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6342 "RESTSupport.c"
+#line 6331 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6348 "RESTSupport.c"
+#line 6337 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6352 "RESTSupport.c"
+#line 6341 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6356 "RESTSupport.c"
+#line 6345 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6360 "RESTSupport.c"
+#line 6349 "RESTSupport.c"
}
@@ -6378,7 +6367,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
G_PARAM_SPEC (spec)->value_type = object_type;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6374 "RESTSupport.c"
+#line 6363 "RESTSupport.c"
}
@@ -6387,7 +6376,7 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value)
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6383 "RESTSupport.c"
+#line 6372 "RESTSupport.c"
}
@@ -6407,17 +6396,17 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
value->data[0].v_pointer = v_object;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6403 "RESTSupport.c"
+#line 6392 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6407 "RESTSupport.c"
+#line 6396 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6413 "RESTSupport.c"
+#line 6402 "RESTSupport.c"
}
}
@@ -6436,17 +6425,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6432 "RESTSupport.c"
+#line 6421 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6436 "RESTSupport.c"
+#line 6425 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6442 "RESTSupport.c"
+#line 6431 "RESTSupport.c"
}
}
@@ -6464,7 +6453,7 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6460 "RESTSupport.c"
+#line 6449 "RESTSupport.c"
}
@@ -6485,7 +6474,7 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
self->priv->status_updated = NULL;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6481 "RESTSupport.c"
+#line 6470 "RESTSupport.c"
}
@@ -6499,7 +6488,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6495 "RESTSupport.c"
+#line 6484 "RESTSupport.c"
}
@@ -6524,7 +6513,7 @@ gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6520 "RESTSupport.c"
+#line 6509 "RESTSupport.c"
}
@@ -6537,7 +6526,7 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6533 "RESTSupport.c"
+#line 6522 "RESTSupport.c"
}
}
@@ -6546,17 +6535,17 @@ static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
glong _tmp0_ = 0L;
gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6552 "RESTSupport.c"
+#line 6541 "RESTSupport.c"
}
@@ -6582,7 +6571,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp2_ = g_string_new ("");
#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
b = _tmp2_;
-#line 6578 "RESTSupport.c"
+#line 6567 "RESTSupport.c"
{
const gchar* u = NULL;
const gchar* _tmp3_ = NULL;
@@ -6590,14 +6579,14 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp3_ = t;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp3_;
-#line 6586 "RESTSupport.c"
+#line 6575 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6593 "RESTSupport.c"
+#line 6582 "RESTSupport.c"
const gchar* _tmp7_ = NULL;
gunichar _tmp8_ = 0U;
gunichar c = 0U;
@@ -6606,7 +6595,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
gunichar _tmp11_ = 0U;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 6602 "RESTSupport.c"
+#line 6591 "RESTSupport.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6615,7 +6604,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp6_ = g_utf8_next_char (_tmp5_);
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp6_;
-#line 6611 "RESTSupport.c"
+#line 6600 "RESTSupport.c"
}
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
@@ -6627,7 +6616,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
if (!(_tmp8_ != ((gunichar) 0))) {
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6623 "RESTSupport.c"
+#line 6612 "RESTSupport.c"
}
#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = u;
@@ -6639,7 +6628,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp11_ = c;
#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (((gint) _tmp11_) < 128) {
-#line 6635 "RESTSupport.c"
+#line 6624 "RESTSupport.c"
GString* _tmp12_ = NULL;
gunichar _tmp13_ = 0U;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6648,7 +6637,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp13_ = c;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6644 "RESTSupport.c"
+#line 6633 "RESTSupport.c"
}
}
}
@@ -6667,7 +6656,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_g_free0 (t);
#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6663 "RESTSupport.c"
+#line 6652 "RESTSupport.c"
}
@@ -6676,7 +6665,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6672 "RESTSupport.c"
+#line 6661 "RESTSupport.c"
}
@@ -6685,7 +6674,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6681 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
}
@@ -6694,7 +6683,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6690 "RESTSupport.c"
+#line 6679 "RESTSupport.c"
}
@@ -6703,7 +6692,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6699 "RESTSupport.c"
+#line 6688 "RESTSupport.c"
}
@@ -6712,7 +6701,7 @@ static gchar* publishing_rest_support_google_session_real_get_refresh_token (Pub
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6708 "RESTSupport.c"
+#line 6697 "RESTSupport.c"
}
@@ -6721,7 +6710,7 @@ gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTS
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6717 "RESTSupport.c"
+#line 6706 "RESTSupport.c"
}
@@ -6730,7 +6719,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6726 "RESTSupport.c"
+#line 6715 "RESTSupport.c"
}
@@ -6739,7 +6728,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6735 "RESTSupport.c"
+#line 6724 "RESTSupport.c"
}
@@ -6749,7 +6738,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6745 "RESTSupport.c"
+#line 6734 "RESTSupport.c"
}
@@ -6764,7 +6753,7 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6760 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
}
@@ -6827,14 +6816,14 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
self->priv->web_auth_pane = NULL;
#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6823 "RESTSupport.c"
+#line 6812 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6830 "RESTSupport.c"
+#line 6819 "RESTSupport.c"
}
@@ -6868,27 +6857,27 @@ static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized
if (!_tmp4_) {
#line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6863 "RESTSupport.c"
+#line 6852 "RESTSupport.c"
}
#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = auth_code;
#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6869 "RESTSupport.c"
+#line 6858 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6876 "RESTSupport.c"
+#line 6865 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6883 "RESTSupport.c"
+#line 6872 "RESTSupport.c"
}
@@ -6926,7 +6915,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
if (!_tmp4_) {
#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6920 "RESTSupport.c"
+#line 6909 "RESTSupport.c"
}
#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
@@ -6938,7 +6927,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 6932 "RESTSupport.c"
+#line 6921 "RESTSupport.c"
}
@@ -6986,7 +6975,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
if (!_tmp7_) {
#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6979 "RESTSupport.c"
+#line 6968 "RESTSupport.c"
}
#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->host;
@@ -6994,21 +6983,21 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
_tmp9_ = err;
#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6987 "RESTSupport.c"
+#line 6976 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6994 "RESTSupport.c"
+#line 6983 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 7001 "RESTSupport.c"
+#line 6990 "RESTSupport.c"
}
@@ -7048,7 +7037,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (!_tmp4_) {
#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7040 "RESTSupport.c"
+#line 7029 "RESTSupport.c"
}
#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
@@ -7058,7 +7047,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (_tmp6_) {
#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7050 "RESTSupport.c"
+#line 7039 "RESTSupport.c"
}
#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
@@ -7070,7 +7059,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 7062 "RESTSupport.c"
+#line 7051 "RESTSupport.c"
}
@@ -7111,7 +7100,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (!_tmp4_) {
#line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7102 "RESTSupport.c"
+#line 7091 "RESTSupport.c"
}
#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
@@ -7121,7 +7110,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (_tmp6_) {
#line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7112 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
}
#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
@@ -7133,7 +7122,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
publishing_rest_support_google_publisher_do_logout (self);
#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7124 "RESTSupport.c"
+#line 7113 "RESTSupport.c"
}
#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->host;
@@ -7141,7 +7130,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
_tmp10_ = err;
#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 7132 "RESTSupport.c"
+#line 7121 "RESTSupport.c"
}
@@ -7166,7 +7155,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
if (!_tmp1_) {
#line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7156 "RESTSupport.c"
+#line 7145 "RESTSupport.c"
}
#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
@@ -7178,7 +7167,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
_g_free0 (_tmp2_->refresh_token);
#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_->refresh_token = _tmp4_;
-#line 7168 "RESTSupport.c"
+#line 7157 "RESTSupport.c"
}
@@ -7203,7 +7192,7 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
if (!_tmp1_) {
#line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7192 "RESTSupport.c"
+#line 7181 "RESTSupport.c"
}
#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
@@ -7217,21 +7206,21 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
_tmp2_->access_token = _tmp4_;
#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 7206 "RESTSupport.c"
+#line 7195 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 7213 "RESTSupport.c"
+#line 7202 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 7220 "RESTSupport.c"
+#line 7209 "RESTSupport.c"
}
@@ -7269,7 +7258,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
if (!_tmp4_) {
#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7257 "RESTSupport.c"
+#line 7246 "RESTSupport.c"
}
#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
@@ -7281,7 +7270,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 7269 "RESTSupport.c"
+#line 7258 "RESTSupport.c"
}
@@ -7318,7 +7307,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
if (!_tmp4_) {
#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7305 "RESTSupport.c"
+#line 7294 "RESTSupport.c"
}
#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->host;
@@ -7326,7 +7315,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
_tmp6_ = err;
#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 7313 "RESTSupport.c"
+#line 7302 "RESTSupport.c"
}
@@ -7360,7 +7349,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7346 "RESTSupport.c"
+#line 7335 "RESTSupport.c"
{
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7368,7 +7357,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7354 "RESTSupport.c"
+#line 7343 "RESTSupport.c"
goto __catch4_spit_publishing_publishing_error;
}
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7379,7 +7368,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_clear_error (&_inner_error_);
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7365 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
}
}
goto __finally4;
@@ -7400,7 +7389,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7386 "RESTSupport.c"
+#line 7375 "RESTSupport.c"
}
__finally4:
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7413,11 +7402,11 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_clear_error (&_inner_error_);
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7399 "RESTSupport.c"
+#line 7388 "RESTSupport.c"
}
#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7403 "RESTSupport.c"
+#line 7392 "RESTSupport.c"
}
@@ -7557,7 +7546,7 @@ static void publishing_rest_support_google_publisher_do_hosted_web_authenticatio
spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (user_authorization_url);
-#line 7542 "RESTSupport.c"
+#line 7531 "RESTSupport.c"
}
@@ -7586,7 +7575,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7570 "RESTSupport.c"
+#line 7559 "RESTSupport.c"
{
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7594,7 +7583,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7578 "RESTSupport.c"
+#line 7567 "RESTSupport.c"
goto __catch5_spit_publishing_publishing_error;
}
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7605,7 +7594,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_clear_error (&_inner_error_);
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7589 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
}
}
goto __finally5;
@@ -7626,7 +7615,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7610 "RESTSupport.c"
+#line 7599 "RESTSupport.c"
}
__finally5:
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7639,18 +7628,18 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_clear_error (&_inner_error_);
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7623 "RESTSupport.c"
+#line 7612 "RESTSupport.c"
}
#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7627 "RESTSupport.c"
+#line 7616 "RESTSupport.c"
}
static gpointer _json_object_ref0 (gpointer self) {
#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? json_object_ref (self) : NULL;
-#line 7634 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
}
@@ -7681,7 +7670,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp0_ = json_parser_new ();
#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7664 "RESTSupport.c"
+#line 7653 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -7693,7 +7682,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7676 "RESTSupport.c"
+#line 7665 "RESTSupport.c"
goto __catch6_g_error;
}
}
@@ -7738,7 +7727,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_g_object_unref0 (parser);
#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7721 "RESTSupport.c"
+#line 7710 "RESTSupport.c"
}
__finally6:
#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7751,7 +7740,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
g_clear_error (&_inner_error_);
#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7734 "RESTSupport.c"
+#line 7723 "RESTSupport.c"
}
#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
@@ -7769,7 +7758,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp16_ = json_object_has_member (_tmp15_, "access_token");
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp16_) {
-#line 7752 "RESTSupport.c"
+#line 7741 "RESTSupport.c"
JsonObject* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7778,15 +7767,15 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = !_tmp18_;
-#line 7761 "RESTSupport.c"
+#line 7750 "RESTSupport.c"
} else {
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = FALSE;
-#line 7765 "RESTSupport.c"
+#line 7754 "RESTSupport.c"
}
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp14_) {
-#line 7769 "RESTSupport.c"
+#line 7758 "RESTSupport.c"
SpitPublishingPluginHost* _tmp19_ = NULL;
GError* _tmp20_ = NULL;
GError* _tmp21_ = NULL;
@@ -7806,7 +7795,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_g_object_unref0 (parser);
#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7789 "RESTSupport.c"
+#line 7778 "RESTSupport.c"
}
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = response_obj;
@@ -7814,7 +7803,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_) {
-#line 7797 "RESTSupport.c"
+#line 7786 "RESTSupport.c"
gchar* refresh_token = NULL;
JsonObject* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
@@ -7832,17 +7821,17 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp27_ = refresh_token;
#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7815 "RESTSupport.c"
+#line 7804 "RESTSupport.c"
const gchar* _tmp28_ = NULL;
#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = refresh_token;
#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7821 "RESTSupport.c"
+#line 7810 "RESTSupport.c"
}
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (refresh_token);
-#line 7825 "RESTSupport.c"
+#line 7814 "RESTSupport.c"
}
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = response_obj;
@@ -7850,7 +7839,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp30_ = json_object_has_member (_tmp29_, "access_token");
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp30_) {
-#line 7833 "RESTSupport.c"
+#line 7822 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp31_ = NULL;
const gchar* _tmp32_ = NULL;
@@ -7868,23 +7857,23 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp34_ = access_token;
#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7851 "RESTSupport.c"
+#line 7840 "RESTSupport.c"
const gchar* _tmp35_ = NULL;
#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = access_token;
#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7857 "RESTSupport.c"
+#line 7846 "RESTSupport.c"
}
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 7861 "RESTSupport.c"
+#line 7850 "RESTSupport.c"
}
#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_json_object_unref0 (response_obj);
#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 7867 "RESTSupport.c"
+#line 7856 "RESTSupport.c"
}
@@ -7918,13 +7907,13 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7900 "RESTSupport.c"
+#line 7889 "RESTSupport.c"
{
#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7906 "RESTSupport.c"
+#line 7895 "RESTSupport.c"
goto __catch7_g_error;
}
}
@@ -7946,7 +7935,7 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7928 "RESTSupport.c"
+#line 7917 "RESTSupport.c"
}
__finally7:
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7959,11 +7948,11 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
g_clear_error (&_inner_error_);
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7941 "RESTSupport.c"
+#line 7930 "RESTSupport.c"
}
#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7945 "RESTSupport.c"
+#line 7934 "RESTSupport.c"
}
@@ -7993,7 +7982,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp0_ = json_parser_new ();
#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7974 "RESTSupport.c"
+#line 7963 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -8005,7 +7994,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7986 "RESTSupport.c"
+#line 7975 "RESTSupport.c"
goto __catch8_g_error;
}
}
@@ -8050,7 +8039,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_object_unref0 (parser);
#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8031 "RESTSupport.c"
+#line 8020 "RESTSupport.c"
}
__finally8:
#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8063,7 +8052,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
g_clear_error (&_inner_error_);
#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8044 "RESTSupport.c"
+#line 8033 "RESTSupport.c"
}
#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
@@ -8081,7 +8070,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp15_ = json_object_has_member (_tmp14_, "name");
#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_) {
-#line 8062 "RESTSupport.c"
+#line 8051 "RESTSupport.c"
gchar* username = NULL;
JsonObject* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
@@ -8099,7 +8088,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp19_ = username;
#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 8080 "RESTSupport.c"
+#line 8069 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
@@ -8113,11 +8102,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_free0 (_tmp20_->user_name);
#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_->user_name = _tmp22_;
-#line 8094 "RESTSupport.c"
+#line 8083 "RESTSupport.c"
}
#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (username);
-#line 8098 "RESTSupport.c"
+#line 8087 "RESTSupport.c"
}
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = response_obj;
@@ -8125,7 +8114,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp24_ = json_object_has_member (_tmp23_, "access_token");
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp24_) {
-#line 8106 "RESTSupport.c"
+#line 8095 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
@@ -8143,7 +8132,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp28_ = access_token;
#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 8124 "RESTSupport.c"
+#line 8113 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
const gchar* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
@@ -8157,11 +8146,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_free0 (_tmp29_->access_token);
#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_->access_token = _tmp31_;
-#line 8138 "RESTSupport.c"
+#line 8127 "RESTSupport.c"
}
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 8142 "RESTSupport.c"
+#line 8131 "RESTSupport.c"
}
#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = self->priv->session;
@@ -8175,7 +8164,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_json_object_unref0 (response_obj);
#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 8156 "RESTSupport.c"
+#line 8145 "RESTSupport.c"
}
@@ -8190,7 +8179,7 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
result = _tmp0_;
#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8171 "RESTSupport.c"
+#line 8160 "RESTSupport.c"
}
@@ -8208,7 +8197,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
result = _tmp1_;
#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8189 "RESTSupport.c"
+#line 8178 "RESTSupport.c"
}
@@ -8221,21 +8210,21 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
_tmp1_ = refresh_token;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 8202 "RESTSupport.c"
+#line 8191 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = refresh_token;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 8208 "RESTSupport.c"
+#line 8197 "RESTSupport.c"
} else {
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = FALSE;
-#line 8212 "RESTSupport.c"
+#line 8201 "RESTSupport.c"
}
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 8216 "RESTSupport.c"
+#line 8205 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -8251,14 +8240,14 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
_tmp3_->refresh_token = _tmp5_;
#line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 8232 "RESTSupport.c"
+#line 8221 "RESTSupport.c"
} else {
gboolean _tmp6_ = FALSE;
#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 8239 "RESTSupport.c"
+#line 8228 "RESTSupport.c"
SpitPublishingPluginHost* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8273,11 +8262,11 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8250 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
}
#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 8254 "RESTSupport.c"
+#line 8243 "RESTSupport.c"
}
}
@@ -8287,7 +8276,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8264 "RESTSupport.c"
+#line 8253 "RESTSupport.c"
}
@@ -8296,7 +8285,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 8273 "RESTSupport.c"
+#line 8262 "RESTSupport.c"
}
@@ -8305,7 +8294,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8282 "RESTSupport.c"
+#line 8271 "RESTSupport.c"
}
@@ -8314,7 +8303,7 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 8291 "RESTSupport.c"
+#line 8280 "RESTSupport.c"
}
@@ -8323,7 +8312,7 @@ static gboolean publishing_rest_support_google_publisher_real_is_running (Publis
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 8300 "RESTSupport.c"
+#line 8289 "RESTSupport.c"
}
@@ -8332,7 +8321,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 8309 "RESTSupport.c"
+#line 8298 "RESTSupport.c"
}
@@ -8341,7 +8330,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8318 "RESTSupport.c"
+#line 8307 "RESTSupport.c"
}
@@ -8350,7 +8339,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8327 "RESTSupport.c"
+#line 8316 "RESTSupport.c"
}
@@ -8359,7 +8348,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8336 "RESTSupport.c"
+#line 8325 "RESTSupport.c"
}
@@ -8368,7 +8357,7 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8345 "RESTSupport.c"
+#line 8334 "RESTSupport.c"
}
@@ -8387,7 +8376,7 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
result = _tmp1_;
#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8364 "RESTSupport.c"
+#line 8353 "RESTSupport.c"
}
@@ -8409,14 +8398,14 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
self->refresh_token = NULL;
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8386 "RESTSupport.c"
+#line 8375 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8393 "RESTSupport.c"
+#line 8382 "RESTSupport.c"
}
@@ -8432,7 +8421,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
result = _tmp0_ != NULL;
#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8409 "RESTSupport.c"
+#line 8398 "RESTSupport.c"
}
@@ -8456,7 +8445,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8433 "RESTSupport.c"
+#line 8422 "RESTSupport.c"
}
@@ -8480,7 +8469,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8457 "RESTSupport.c"
+#line 8446 "RESTSupport.c"
}
@@ -8504,7 +8493,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8481 "RESTSupport.c"
+#line 8470 "RESTSupport.c"
}
@@ -8524,7 +8513,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
_g_free0 (self->refresh_token);
#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 8501 "RESTSupport.c"
+#line 8490 "RESTSupport.c"
}
@@ -8543,7 +8532,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8520 "RESTSupport.c"
+#line 8509 "RESTSupport.c"
}
@@ -8563,7 +8552,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
_g_free0 (self->refresh_token);
#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8540 "RESTSupport.c"
+#line 8529 "RESTSupport.c"
}
@@ -8590,14 +8579,14 @@ static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_res
self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8567 "RESTSupport.c"
+#line 8556 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8574 "RESTSupport.c"
+#line 8563 "RESTSupport.c"
}
@@ -8610,7 +8599,7 @@ static gboolean publishing_rest_support_google_publisher_web_authentication_pane
result = _tmp0_;
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8587 "RESTSupport.c"
+#line 8576 "RESTSupport.c"
}
@@ -8621,37 +8610,37 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 8614 "RESTSupport.c"
+#line 8603 "RESTSupport.c"
gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8622 "RESTSupport.c"
+#line 8611 "RESTSupport.c"
} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8628 "RESTSupport.c"
+#line 8617 "RESTSupport.c"
}
}
@@ -8663,39 +8652,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 8652 "RESTSupport.c"
+#line 8641 "RESTSupport.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8660 "RESTSupport.c"
+#line 8649 "RESTSupport.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8672 "RESTSupport.c"
+#line 8661 "RESTSupport.c"
}
}
@@ -8713,114 +8702,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 8696 "RESTSupport.c"
+#line 8685 "RESTSupport.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8702 "RESTSupport.c"
+#line 8691 "RESTSupport.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 8706 "RESTSupport.c"
+#line 8695 "RESTSupport.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 8710 "RESTSupport.c"
+#line 8699 "RESTSupport.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 8722 "RESTSupport.c"
+#line 8711 "RESTSupport.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 8732 "RESTSupport.c"
+#line 8721 "RESTSupport.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 8738 "RESTSupport.c"
+#line 8727 "RESTSupport.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8752 "RESTSupport.c"
+#line 8741 "RESTSupport.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8762 "RESTSupport.c"
+#line 8751 "RESTSupport.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 8768 "RESTSupport.c"
+#line 8757 "RESTSupport.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 8777 "RESTSupport.c"
+#line 8766 "RESTSupport.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8797 "RESTSupport.c"
+#line 8786 "RESTSupport.c"
}
@@ -8856,7 +8845,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_ > 0) {
-#line 8833 "RESTSupport.c"
+#line 8822 "RESTSupport.c"
gint auth_code_field_start = 0;
const gchar* _tmp7_ = NULL;
gint _tmp8_ = 0;
@@ -8880,7 +8869,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
_g_free0 (page_title);
#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8857 "RESTSupport.c"
+#line 8846 "RESTSupport.c"
}
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = page_title;
@@ -8898,11 +8887,11 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
g_signal_emit_by_name (self, "authorized", _tmp13_);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (auth_code);
-#line 8875 "RESTSupport.c"
+#line 8864 "RESTSupport.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (page_title);
-#line 8879 "RESTSupport.c"
+#line 8868 "RESTSupport.c"
}
@@ -8915,7 +8904,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_cla
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8892 "RESTSupport.c"
+#line 8881 "RESTSupport.c"
}
@@ -8929,7 +8918,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_fin
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8906 "RESTSupport.c"
+#line 8895 "RESTSupport.c"
}
@@ -8971,21 +8960,21 @@ static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishin
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8948 "RESTSupport.c"
+#line 8937 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8955 "RESTSupport.c"
+#line 8944 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8962 "RESTSupport.c"
+#line 8951 "RESTSupport.c"
}
@@ -9035,21 +9024,21 @@ static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publis
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9012 "RESTSupport.c"
+#line 9001 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 9019 "RESTSupport.c"
+#line 9008 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
#line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9026 "RESTSupport.c"
+#line 9015 "RESTSupport.c"
}
@@ -9088,14 +9077,14 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9065 "RESTSupport.c"
+#line 9054 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9072 "RESTSupport.c"
+#line 9061 "RESTSupport.c"
}
@@ -9147,21 +9136,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
_g_free0 (_tmp7_);
#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9124 "RESTSupport.c"
+#line 9113 "RESTSupport.c"
}
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9131 "RESTSupport.c"
+#line 9120 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9138 "RESTSupport.c"
+#line 9127 "RESTSupport.c"
}
@@ -9192,21 +9181,21 @@ static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_
self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9169 "RESTSupport.c"
+#line 9158 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9176 "RESTSupport.c"
+#line 9165 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9183 "RESTSupport.c"
+#line 9172 "RESTSupport.c"
}
@@ -9243,7 +9232,7 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9220 "RESTSupport.c"
+#line 9209 "RESTSupport.c"
}
@@ -9258,14 +9247,14 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9235 "RESTSupport.c"
+#line 9224 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9242 "RESTSupport.c"
+#line 9231 "RESTSupport.c"
}
@@ -9281,7 +9270,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
_g_object_unref0 (self->priv->web_auth_pane);
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9258 "RESTSupport.c"
+#line 9247 "RESTSupport.c"
}
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index b76bead..1a9052b 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -246,21 +246,21 @@ public class Transaction {
protected void check_response(Soup.Message message) throws Spit.Publishing.PublishingError {
switch (message.status_code) {
- case Soup.Status.OK:
- case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
- // resource was created in response to a PUT or POST
+ case Soup.KnownStatusCode.OK:
+ case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
+ // resource was created in response to a PUT or POST
break;
- case Soup.Status.CANT_RESOLVE:
- case Soup.Status.CANT_RESOLVE_PROXY:
+ case Soup.KnownStatusCode.CANT_RESOLVE:
+ case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to resolve %s (error code %u)",
get_endpoint_url(), message.status_code);
- case Soup.Status.CANT_CONNECT:
- case Soup.Status.CANT_CONNECT_PROXY:
+ case Soup.KnownStatusCode.CANT_CONNECT:
+ case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to connect to %s (error code %u)",
get_endpoint_url(), message.status_code);
- case Soup.Status.SSL_FAILED:
+ case Soup.KnownStatusCode.SSL_FAILED:
throw new Spit.Publishing.PublishingError.SSL_FAILED ("Unable to connect to %s: Secure connection failed",
get_endpoint_url ());
@@ -511,7 +511,7 @@ public class UploadTransaction : Transaction {
int payload_part_num = message_parts.get_length();
- Soup.Buffer bindable_data = new Soup.Buffer.take (payload.data);
+ Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, payload.data[0:payload_length]);
message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
bindable_data);
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index dc7428b..902db2b 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.32.1, the Vala compiler
+/* Resources.c generated by valac 0.34.4, the Vala compiler
* generated from Resources.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index c82e910..1490045 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -1,4 +1,4 @@
-/* WebAuthenticationPane.c generated by valac 0.32.1, the Vala compiler
+/* WebAuthenticationPane.c generated by valac 0.34.4, the Vala compiler
* generated from WebAuthenticationPane.vala, do not modify */
/* Copyright 2016 Jens Georg <mail@jensge.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:17:59 +0000