From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- plugins/common/BuilderPane.c | 2 +- plugins/common/RESTSupport.c | 1423 +++-- plugins/common/RESTSupport.vala | 18 +- plugins/common/Resources.c | 2 +- plugins/common/WebAuthenticationPane.c | 2 +- plugins/shotwell-data-imports/FSpotDatabase.c | 2 +- .../shotwell-data-imports/FSpotDatabaseBehavior.c | 2 +- plugins/shotwell-data-imports/FSpotDatabaseTable.c | 256 +- plugins/shotwell-data-imports/FSpotImporter.c | 212 +- plugins/shotwell-data-imports/FSpotMetaTable.c | 266 +- .../shotwell-data-imports/FSpotPhotoTagsTable.c | 2 +- .../FSpotPhotoVersionsTable.c | 2 +- plugins/shotwell-data-imports/FSpotPhotosTable.c | 2 +- plugins/shotwell-data-imports/FSpotRollsTable.c | 2 +- plugins/shotwell-data-imports/FSpotTableBehavior.c | 2 +- plugins/shotwell-data-imports/FSpotTagsTable.c | 2 +- plugins/shotwell-data-imports/SqliteSupport.c | 2 +- plugins/shotwell-data-imports/VersionNumber.c | 256 +- .../shotwell-data-imports/shotwell-data-imports.c | 2 +- plugins/shotwell-plugin-common.h | 2 +- plugins/shotwell-plugin-common.vapi | 2 +- plugins/shotwell-plugin-dev-1.0.h | 2 +- plugins/shotwell-plugin-dev-1.0.vapi | 2 +- .../shotwell-publishing-extras/GalleryConnector.c | 508 +- .../shotwell-publishing-extras/RajcePublishing.c | 16 +- .../shotwell-publishing-extras/TumblrPublishing.c | 470 +- .../shotwell-publishing-extras/YandexPublishing.c | 722 ++- .../YandexPublishing.vala | 2 +- .../gallery3_authentication_pane.ui | 33 +- .../gallery3_publishing_options_pane.ui | 82 +- .../rajce_authentication_pane.ui | 56 +- .../rajce_publishing_options_pane.ui | 41 +- .../shotwell-publishing-extras.c | 2 +- .../tumblr_authentication_pane.ui | 55 +- .../tumblr_publishing_options_pane.ui | 25 +- .../yandex_publish_model.ui | 53 +- plugins/shotwell-publishing/FacebookPublishing.c | 228 +- .../shotwell-publishing/FacebookPublishing.vala | 20 +- plugins/shotwell-publishing/FlickrPublishing.c | 5805 ++++++++++---------- plugins/shotwell-publishing/FlickrPublishing.vala | 52 +- plugins/shotwell-publishing/PicasaPublishing.c | 1630 +++--- plugins/shotwell-publishing/PicasaPublishing.vala | 4 +- plugins/shotwell-publishing/PiwigoPublishing.c | 554 +- plugins/shotwell-publishing/PiwigoPublishing.vala | 2 +- plugins/shotwell-publishing/YouTubePublishing.c | 951 ++-- plugins/shotwell-publishing/YouTubePublishing.vala | 5 +- .../facebook_publishing_options_pane.ui | 46 +- .../shotwell-publishing/flickr_pin_entry_pane.ui | 35 +- .../flickr_publishing_options_pane.ui | 28 +- .../picasa_publishing_options_pane.ui | 43 +- .../piwigo_authentication_pane.ui | 2 +- .../piwigo_publishing_options_pane.ui | 4 +- .../shotwell-publishing/piwigo_ssl_failure_pane.ui | 4 +- plugins/shotwell-publishing/shotwell-publishing.c | 2 +- plugins/shotwell-transitions/BlindsEffect.c | 2 +- plugins/shotwell-transitions/ChessEffect.c | 2 +- plugins/shotwell-transitions/CircleEffect.c | 2 +- plugins/shotwell-transitions/CirclesEffect.c | 2 +- plugins/shotwell-transitions/ClockEffect.c | 2 +- plugins/shotwell-transitions/CrumbleEffect.c | 2 +- plugins/shotwell-transitions/FadeEffect.c | 2 +- plugins/shotwell-transitions/SlideEffect.c | 2 +- plugins/shotwell-transitions/SquaresEffect.c | 2 +- plugins/shotwell-transitions/StripesEffect.c | 2 +- .../shotwell-transitions/shotwell-transitions.c | 2 +- 65 files changed, 6746 insertions(+), 7221 deletions(-) (limited to 'plugins') 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 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 diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index 31d70a7..bc423d1 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabase.c generated by valac 0.34.4, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c index b20f73f..eee5e75 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseBehavior.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabaseBehavior.c generated by valac 0.34.4, the Vala compiler * generated from FSpotDatabaseBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index 48e5030..ffbd887 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -211,72 +211,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 221 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 231 "FSpotDatabaseTable.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 241 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 247 "FSpotDatabaseTable.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 258 "FSpotDatabaseTable.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 270 "FSpotDatabaseTable.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 274 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 278 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 282 "FSpotDatabaseTable.c" gint i = 0; @@ -299,16 +299,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 305 "FSpotDatabaseTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 314 "FSpotDatabaseTable.c" gboolean _tmp11_ = FALSE; @@ -321,97 +321,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 327 "FSpotDatabaseTable.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 333 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 343 "FSpotDatabaseTable.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 355 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 359 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 365 "FSpotDatabaseTable.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 376 "FSpotDatabaseTable.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 391 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 395 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 399 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 405 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 417 "FSpotDatabaseTable.c" gchar** _tmp25_ = NULL; @@ -420,91 +420,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 438 "FSpotDatabaseTable.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 442 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 448 "FSpotDatabaseTable.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 455 "FSpotDatabaseTable.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 463 "FSpotDatabaseTable.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 501 "FSpotDatabaseTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 510 "FSpotDatabaseTable.c" gint _tmp48_ = 0; @@ -520,94 +520,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 526 "FSpotDatabaseTable.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 532 "FSpotDatabaseTable.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 546 "FSpotDatabaseTable.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 566 "FSpotDatabaseTable.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 581 "FSpotDatabaseTable.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 585 "FSpotDatabaseTable.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 593 "FSpotDatabaseTable.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 604 "FSpotDatabaseTable.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 613 "FSpotDatabaseTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index 5cb73d5..8dc1559 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.32.1, the Vala compiler +/* FSpotImporter.c generated by valac 0.34.4, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1661,33 +1661,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 1665 "FSpotImporter.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1673 "FSpotImporter.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1679 "FSpotImporter.c" } @@ -1711,103 +1711,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1713 "FSpotImporter.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1722 "FSpotImporter.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1728 "FSpotImporter.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1737 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1743 "FSpotImporter.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1752 "FSpotImporter.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1756 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 1764 "FSpotImporter.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 1773 "FSpotImporter.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 1777 "FSpotImporter.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1799 "FSpotImporter.c" } @@ -1817,15 +1817,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1817 "FSpotImporter.c" } @@ -1838,37 +1838,37 @@ 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 1840 "FSpotImporter.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 1848 "FSpotImporter.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 1860 "FSpotImporter.c" } @@ -1888,112 +1888,112 @@ 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 1884 "FSpotImporter.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 1890 "FSpotImporter.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 1894 "FSpotImporter.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 1898 "FSpotImporter.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 1910 "FSpotImporter.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 1920 "FSpotImporter.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 1926 "FSpotImporter.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 1940 "FSpotImporter.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 1950 "FSpotImporter.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 1956 "FSpotImporter.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 1965 "FSpotImporter.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 1985 "FSpotImporter.c" } diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 5b8a0c1..3be8630 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -302,72 +302,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 312 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 322 "FSpotMetaTable.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 332 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 338 "FSpotMetaTable.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 349 "FSpotMetaTable.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 361 "FSpotMetaTable.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 365 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 369 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 373 "FSpotMetaTable.c" gint i = 0; @@ -390,16 +390,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 396 "FSpotMetaTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 405 "FSpotMetaTable.c" gboolean _tmp11_ = FALSE; @@ -412,97 +412,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 418 "FSpotMetaTable.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 424 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 434 "FSpotMetaTable.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 446 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 450 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 456 "FSpotMetaTable.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 467 "FSpotMetaTable.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 482 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 486 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 490 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 496 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 508 "FSpotMetaTable.c" gchar** _tmp25_ = NULL; @@ -511,91 +511,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 529 "FSpotMetaTable.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 533 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 539 "FSpotMetaTable.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 546 "FSpotMetaTable.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 554 "FSpotMetaTable.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 592 "FSpotMetaTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 601 "FSpotMetaTable.c" gint _tmp48_ = 0; @@ -611,94 +611,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 617 "FSpotMetaTable.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 623 "FSpotMetaTable.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 637 "FSpotMetaTable.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 657 "FSpotMetaTable.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 672 "FSpotMetaTable.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 676 "FSpotMetaTable.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 684 "FSpotMetaTable.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 695 "FSpotMetaTable.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 704 "FSpotMetaTable.c" } @@ -1113,15 +1113,15 @@ static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; const gchar* _tmp0_ = NULL; gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1127 "FSpotMetaTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index 27aca60..615eb70 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 92b63eb..8a40c4b 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index b610d4f..364919f 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotosTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index 2814b00..d183ce0 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.c +++ b/plugins/shotwell-data-imports/FSpotRollsTable.c @@ -1,4 +1,4 @@ -/* FSpotRollsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index 77543b8..3da1646 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.32.1, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.34.4, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 93805e4..291f238 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.34.4, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index 4abfac9..0dad7df 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.32.1, the Vala compiler +/* SqliteSupport.c generated by valac 0.34.4, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index dec3778..93ab197 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.32.1, the Vala compiler +/* VersionNumber.c generated by valac 0.34.4, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -246,72 +246,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 256 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 266 "VersionNumber.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 276 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 282 "VersionNumber.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 293 "VersionNumber.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 305 "VersionNumber.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 309 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 313 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 317 "VersionNumber.c" gint i = 0; @@ -334,16 +334,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 340 "VersionNumber.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 349 "VersionNumber.c" gboolean _tmp11_ = FALSE; @@ -356,97 +356,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 362 "VersionNumber.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 368 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 378 "VersionNumber.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 390 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 394 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 400 "VersionNumber.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 411 "VersionNumber.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 426 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 430 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 434 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 440 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 452 "VersionNumber.c" gchar** _tmp25_ = NULL; @@ -455,91 +455,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 473 "VersionNumber.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 477 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 483 "VersionNumber.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 490 "VersionNumber.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 498 "VersionNumber.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 536 "VersionNumber.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 545 "VersionNumber.c" gint _tmp48_ = 0; @@ -555,94 +555,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 561 "VersionNumber.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 567 "VersionNumber.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 581 "VersionNumber.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 601 "VersionNumber.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 616 "VersionNumber.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 620 "VersionNumber.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 628 "VersionNumber.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 639 "VersionNumber.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 648 "VersionNumber.c" } diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index 0c8ea43..df48222 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.32.1, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.34.4, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h index 3019306..731434a 100644 --- a/plugins/shotwell-plugin-common.h +++ b/plugins/shotwell-plugin-common.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* shotwell-plugin-common.h generated by valac 0.34.4, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__ diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi index b7882b8..93e24e1 100644 --- a/plugins/shotwell-plugin-common.vapi +++ b/plugins/shotwell-plugin-common.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.vapi generated by valac 0.32.1, do not modify. */ +/* shotwell-plugin-common.vapi generated by valac 0.34.4, do not modify. */ namespace Publishing { namespace RESTSupport { diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h index fb72125..668df4d 100644 --- a/plugins/shotwell-plugin-dev-1.0.h +++ b/plugins/shotwell-plugin-dev-1.0.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* shotwell-plugin-dev-1.0.h generated by valac 0.34.4, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi index e065dab..d88dfd2 100644 --- a/plugins/shotwell-plugin-dev-1.0.vapi +++ b/plugins/shotwell-plugin-dev-1.0.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.vapi generated by valac 0.32.1, do not modify. */ +/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.4, do not modify. */ namespace Spit { namespace DataImports { diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index 7b4b296..a2e4c0e 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.32.1, the Vala compiler +/* GalleryConnector.c generated by valac 0.34.4, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -2105,15 +2105,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2088 "GalleryConnector.c" } @@ -2499,103 +2499,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 2484 "GalleryConnector.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 2493 "GalleryConnector.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 2499 "GalleryConnector.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 2508 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 2514 "GalleryConnector.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 2523 "GalleryConnector.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 2527 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 2535 "GalleryConnector.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 2544 "GalleryConnector.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 2548 "GalleryConnector.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2570 "GalleryConnector.c" } @@ -3099,72 +3099,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 3078 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 3088 "GalleryConnector.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 3098 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 3104 "GalleryConnector.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 3115 "GalleryConnector.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 3127 "GalleryConnector.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 3131 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 3135 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 3139 "GalleryConnector.c" gint i = 0; @@ -3187,16 +3187,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 3162 "GalleryConnector.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 3171 "GalleryConnector.c" gboolean _tmp11_ = FALSE; @@ -3209,97 +3209,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 3184 "GalleryConnector.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 3190 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 3200 "GalleryConnector.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 3212 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3216 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 3222 "GalleryConnector.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 3233 "GalleryConnector.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 3248 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 3252 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 3256 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 3262 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 3274 "GalleryConnector.c" gchar** _tmp25_ = NULL; @@ -3308,91 +3308,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 3295 "GalleryConnector.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 3299 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 3305 "GalleryConnector.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 3312 "GalleryConnector.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3320 "GalleryConnector.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 3358 "GalleryConnector.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 3367 "GalleryConnector.c" gint _tmp48_ = 0; @@ -3408,94 +3408,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 3383 "GalleryConnector.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 3389 "GalleryConnector.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 3403 "GalleryConnector.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 3423 "GalleryConnector.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 3438 "GalleryConnector.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 3442 "GalleryConnector.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 3450 "GalleryConnector.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3461 "GalleryConnector.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3470 "GalleryConnector.c" } @@ -3839,11 +3839,11 @@ static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3818 "GalleryConnector.c" } @@ -9928,19 +9928,19 @@ static gchar* string_strip (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 9905 "GalleryConnector.c" } @@ -10047,37 +10047,37 @@ 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 10022 "GalleryConnector.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 10030 "GalleryConnector.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 10042 "GalleryConnector.c" } @@ -10097,112 +10097,112 @@ 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 10066 "GalleryConnector.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 10072 "GalleryConnector.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 10076 "GalleryConnector.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 10080 "GalleryConnector.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 10092 "GalleryConnector.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 10102 "GalleryConnector.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 10108 "GalleryConnector.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 10122 "GalleryConnector.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 10132 "GalleryConnector.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 10138 "GalleryConnector.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 10147 "GalleryConnector.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 10167 "GalleryConnector.c" } @@ -10763,25 +10763,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar _tmp3_ = '\0'; -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 10746 "GalleryConnector.c" } @@ -12896,35 +12896,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 12873 "GalleryConnector.c" gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12881 "GalleryConnector.c" } else { -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12887 "GalleryConnector.c" } diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index d953d67..f5faf8d 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -1,4 +1,4 @@ -/* RajcePublishing.c generated by valac 0.32.1, the Vala compiler +/* RajcePublishing.c generated by valac 0.34.4, the Vala compiler * generated from RajcePublishing.vala, do not modify */ /* Copyright 2014 rajce.net @@ -7770,19 +7770,19 @@ static gchar* string_strip (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 7784 "RajcePublishing.c" } diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index cac5ead..29249a3 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -1,4 +1,4 @@ -/* TumblrPublishing.c generated by valac 0.32.1, the Vala compiler +/* TumblrPublishing.c generated by valac 0.34.4, the Vala compiler * generated from TumblrPublishing.vala, do not modify */ /* Copyright 2012 BJA Electronics @@ -2803,11 +2803,11 @@ static gpointer _json_object_ref0 (gpointer self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 2807 "TumblrPublishing.c" { @@ -2822,73 +2822,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 2838 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2847 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 2863 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2874 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2888 "TumblrPublishing.c" } @@ -2896,24 +2896,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch35_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 2902 "TumblrPublishing.c" } __finally35: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2913 "TumblrPublishing.c" } @@ -6101,39 +6101,39 @@ 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 6115 "TumblrPublishing.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 6121 "TumblrPublishing.c" } @@ -6146,72 +6146,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 6138 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 6148 "TumblrPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 6158 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 6164 "TumblrPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 6175 "TumblrPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 6187 "TumblrPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 6191 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 6195 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 6199 "TumblrPublishing.c" gint i = 0; @@ -6234,16 +6234,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 6222 "TumblrPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 6231 "TumblrPublishing.c" gboolean _tmp11_ = FALSE; @@ -6256,97 +6256,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 6244 "TumblrPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 6250 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 6260 "TumblrPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 6272 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 6276 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 6282 "TumblrPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 6293 "TumblrPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 6308 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 6312 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 6316 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 6322 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 6334 "TumblrPublishing.c" gchar** _tmp25_ = NULL; @@ -6355,91 +6355,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 6355 "TumblrPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 6359 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 6365 "TumblrPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 6372 "TumblrPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6380 "TumblrPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 6418 "TumblrPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 6427 "TumblrPublishing.c" gint _tmp48_ = 0; @@ -6455,94 +6455,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 6443 "TumblrPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 6449 "TumblrPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 6463 "TumblrPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 6483 "TumblrPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 6498 "TumblrPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 6502 "TumblrPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 6510 "TumblrPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6521 "TumblrPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6530 "TumblrPublishing.c" } @@ -8042,37 +8042,37 @@ 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 8037 "TumblrPublishing.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 8045 "TumblrPublishing.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 8057 "TumblrPublishing.c" } @@ -8092,112 +8092,112 @@ 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 8081 "TumblrPublishing.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 8087 "TumblrPublishing.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 8091 "TumblrPublishing.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 8095 "TumblrPublishing.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 8107 "TumblrPublishing.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 8117 "TumblrPublishing.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 8123 "TumblrPublishing.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 8137 "TumblrPublishing.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 8147 "TumblrPublishing.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 8153 "TumblrPublishing.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 8162 "TumblrPublishing.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 8182 "TumblrPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 9118b93..8e71f94 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -1,4 +1,4 @@ -/* YandexPublishing.c generated by valac 0.32.1, the Vala compiler +/* YandexPublishing.c generated by valac 0.34.4, the Vala compiler * generated from YandexPublishing.vala, do not modify */ /* Copyright 2010+ Evgeniy Polyakov @@ -386,7 +386,6 @@ enum { PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY }; static void _vala_SoupMultipart_free (SoupMultipart* self); -static guint8* _vala_array_dup10 (guint8* self, int length); static void _g_free0_ (gpointer var); static void _vala_SoupBuffer_free (SoupBuffer* self); #define PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisherPrivate)) @@ -463,7 +462,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 467 "YandexPublishing.c" +#line 466 "YandexPublishing.c" } @@ -476,7 +475,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.yandex-fotki"; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 480 "YandexPublishing.c" +#line 479 "YandexPublishing.c" } @@ -489,7 +488,7 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base) result = "Yandex.Fotki"; #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 493 "YandexPublishing.c" +#line 492 "YandexPublishing.c" } @@ -556,7 +555,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo _g_free0 ((*info).license); #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" (*info).license = _tmp8_; -#line 560 "YandexPublishing.c" +#line 559 "YandexPublishing.c" } @@ -577,7 +576,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 581 "YandexPublishing.c" +#line 580 "YandexPublishing.c" } @@ -590,7 +589,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 594 "YandexPublishing.c" +#line 593 "YandexPublishing.c" } @@ -598,7 +597,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable YandexService * self; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService); -#line 602 "YandexPublishing.c" +#line 601 "YandexPublishing.c" } @@ -608,21 +607,21 @@ YandexService* yandex_service_construct (GType object_type) { self = (YandexService*) g_object_new (object_type, NULL); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 612 "YandexPublishing.c" +#line 611 "YandexPublishing.c" } YandexService* yandex_service_new (void) { #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return yandex_service_construct (TYPE_YANDEX_SERVICE); -#line 619 "YandexPublishing.c" +#line 618 "YandexPublishing.c" } static void yandex_service_class_init (YandexServiceClass * klass) { #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" yandex_service_parent_class = g_type_class_peek_parent (klass); -#line 626 "YandexPublishing.c" +#line 625 "YandexPublishing.c" } @@ -639,7 +638,7 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation; -#line 643 "YandexPublishing.c" +#line 642 "YandexPublishing.c" } @@ -650,7 +649,7 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media; -#line 654 "YandexPublishing.c" +#line 653 "YandexPublishing.c" } @@ -695,14 +694,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G publishing_yandex_transaction_add_headers (self); #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 699 "YandexPublishing.c" +#line 698 "YandexPublishing.c" } PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) { #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method); -#line 706 "YandexPublishing.c" +#line 705 "YandexPublishing.c" } @@ -725,7 +724,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti _publishing_rest_support_session_unref0 (_tmp1_); #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp3_) { -#line 729 "YandexPublishing.c" +#line 728 "YandexPublishing.c" PublishingRESTSupportSession* _tmp4_ = NULL; PublishingYandexSession* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -754,7 +753,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti _publishing_rest_support_session_unref0 (_tmp5_); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close"); -#line 758 "YandexPublishing.c" +#line 757 "YandexPublishing.c" } } @@ -775,14 +774,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje publishing_yandex_transaction_add_headers (self); #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 779 "YandexPublishing.c" +#line 778 "YandexPublishing.c" } PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) { #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method); -#line 786 "YandexPublishing.c" +#line 785 "YandexPublishing.c" } @@ -801,14 +800,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, _tmp1_ = type; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0); -#line 805 "YandexPublishing.c" +#line 804 "YandexPublishing.c" } static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) { #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass); -#line 812 "YandexPublishing.c" +#line 811 "YandexPublishing.c" } @@ -834,14 +833,14 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type) self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 838 "YandexPublishing.c" +#line 837 "YandexPublishing.c" } PublishingYandexSession* publishing_yandex_session_new (void) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION); -#line 845 "YandexPublishing.c" +#line 844 "YandexPublishing.c" } @@ -857,7 +856,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS result = _tmp0_ != NULL; #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 861 "YandexPublishing.c" +#line 860 "YandexPublishing.c" } @@ -868,7 +867,7 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) { _g_free0 (self->priv->auth_token); #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = NULL; -#line 872 "YandexPublishing.c" +#line 871 "YandexPublishing.c" } @@ -887,7 +886,7 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co _g_free0 (self->priv->auth_token); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = _tmp1_; -#line 891 "YandexPublishing.c" +#line 890 "YandexPublishing.c" } @@ -905,7 +904,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) result = _tmp1_; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 909 "YandexPublishing.c" +#line 908 "YandexPublishing.c" } @@ -918,7 +917,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass * g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate)); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated; -#line 922 "YandexPublishing.c" +#line 921 "YandexPublishing.c" } @@ -927,7 +926,7 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self); #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->auth_token = NULL; -#line 931 "YandexPublishing.c" +#line 930 "YandexPublishing.c" } @@ -939,7 +938,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob _g_free0 (self->priv->auth_token); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj); -#line 943 "YandexPublishing.c" +#line 942 "YandexPublishing.c" } @@ -966,14 +965,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 970 "YandexPublishing.c" +#line 969 "YandexPublishing.c" } PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) { #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url); -#line 977 "YandexPublishing.c" +#line 976 "YandexPublishing.c" } @@ -982,7 +981,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 986 "YandexPublishing.c" +#line 985 "YandexPublishing.c" } @@ -993,7 +992,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { GError * _inner_error_ = NULL; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane); -#line 997 "YandexPublishing.c" +#line 996 "YandexPublishing.c" { GRegex* _tmp0_ = NULL; GRegex* _tmp1_ = NULL; @@ -1006,7 +1005,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 1010 "YandexPublishing.c" +#line 1009 "YandexPublishing.c" goto __catch39_g_regex_error; } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1015,7 +1014,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_clear_error (&_inner_error_); #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 1019 "YandexPublishing.c" +#line 1018 "YandexPublishing.c" } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = _tmp0_; @@ -1027,7 +1026,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { self->priv->re = _tmp2_; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_regex_unref0 (_tmp0_); -#line 1031 "YandexPublishing.c" +#line 1030 "YandexPublishing.c" } goto __finally39; __catch39_g_regex_error: @@ -1041,7 +1040,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_assert_not_reached (); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 1045 "YandexPublishing.c" +#line 1044 "YandexPublishing.c" } __finally39: #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1052,7 +1051,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_clear_error (&_inner_error_); #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 1056 "YandexPublishing.c" +#line 1055 "YandexPublishing.c" } #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane)); @@ -1062,7 +1061,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) { g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0); #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (_tmp4_); -#line 1066 "YandexPublishing.c" +#line 1065 "YandexPublishing.c" } @@ -1070,35 +1069,35 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo PublishingYandexWebAuthPane * self; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane); -#line 1074 "YandexPublishing.c" +#line 1073 "YandexPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 1081 "YandexPublishing.c" +#line 1080 "YandexPublishing.c" } static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) { #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_boxed_copy (webkit_navigation_action_get_type (), self); -#line 1088 "YandexPublishing.c" +#line 1087 "YandexPublishing.c" } static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) { #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self ? _vala_WebKitNavigationAction_copy (self) : NULL; -#line 1095 "YandexPublishing.c" +#line 1094 "YandexPublishing.c" } static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) { #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (webkit_navigation_action_get_type (), self); -#line 1102 "YandexPublishing.c" +#line 1101 "YandexPublishing.c" } @@ -1115,7 +1114,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand switch (_tmp0_) { #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: -#line 1119 "YandexPublishing.c" +#line 1118 "YandexPublishing.c" { WebKitNavigationPolicyDecision* n_decision = NULL; WebKitPolicyDecision* _tmp1_ = NULL; @@ -1184,7 +1183,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand info = _tmp15_; #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp16_) { -#line 1188 "YandexPublishing.c" +#line 1187 "YandexPublishing.c" gchar* access_token = NULL; GMatchInfo* _tmp17_ = NULL; gchar** _tmp18_ = NULL; @@ -1224,7 +1223,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _tmp25_ = access_token; #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp25_ != NULL) { -#line 1228 "YandexPublishing.c" +#line 1227 "YandexPublishing.c" const gchar* _tmp26_ = NULL; WebKitPolicyDecision* _tmp27_ = NULL; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1247,15 +1246,15 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _g_object_unref0 (n_decision); #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1251 "YandexPublishing.c" +#line 1250 "YandexPublishing.c" } else { #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_emit_by_name (self, "login-failed"); -#line 1255 "YandexPublishing.c" +#line 1254 "YandexPublishing.c" } #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (access_token); -#line 1259 "YandexPublishing.c" +#line 1258 "YandexPublishing.c" } #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = decision; @@ -1271,11 +1270,11 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand _g_object_unref0 (n_decision); #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1275 "YandexPublishing.c" +#line 1274 "YandexPublishing.c" } #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: -#line 1279 "YandexPublishing.c" +#line 1278 "YandexPublishing.c" { WebKitPolicyDecision* _tmp29_ = NULL; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1284,7 +1283,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand webkit_policy_decision_use (_tmp29_); #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1288 "YandexPublishing.c" +#line 1287 "YandexPublishing.c" } default: { @@ -1292,14 +1291,14 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand result = FALSE; #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1296 "YandexPublishing.c" +#line 1295 "YandexPublishing.c" } } #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" result = TRUE; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1303 "YandexPublishing.c" +#line 1302 "YandexPublishing.c" } @@ -1318,14 +1317,14 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 1322 "YandexPublishing.c" +#line 1321 "YandexPublishing.c" } static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) { #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self); -#line 1329 "YandexPublishing.c" +#line 1328 "YandexPublishing.c" } @@ -1337,7 +1336,7 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) { _g_regex_unref0 (self->priv->re); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj); -#line 1341 "YandexPublishing.c" +#line 1340 "YandexPublishing.c" } @@ -1359,21 +1358,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 1363 "YandexPublishing.c" +#line 1362 "YandexPublishing.c" } PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS); -#line 1370 "YandexPublishing.c" +#line 1369 "YandexPublishing.c" } static void publishing_yandex_value_publish_options_init (GValue* value) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1377 "YandexPublishing.c" +#line 1376 "YandexPublishing.c" } @@ -1382,7 +1381,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (value->data[0].v_pointer); -#line 1386 "YandexPublishing.c" +#line 1385 "YandexPublishing.c" } } @@ -1392,11 +1391,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr if (src_value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer); -#line 1396 "YandexPublishing.c" +#line 1395 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1400 "YandexPublishing.c" +#line 1399 "YandexPublishing.c" } } @@ -1404,37 +1403,37 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return value->data[0].v_pointer; -#line 1408 "YandexPublishing.c" +#line 1407 "YandexPublishing.c" } static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (collect_values[0].v_pointer) { -#line 1415 "YandexPublishing.c" +#line 1414 "YandexPublishing.c" PublishingYandexPublishOptions* object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1422 "YandexPublishing.c" +#line 1421 "YandexPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1426 "YandexPublishing.c" +#line 1425 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = publishing_yandex_publish_options_ref (object); -#line 1430 "YandexPublishing.c" +#line 1429 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1434 "YandexPublishing.c" +#line 1433 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1438 "YandexPublishing.c" +#line 1437 "YandexPublishing.c" } @@ -1445,25 +1444,25 @@ static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* if (!object_p) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1449 "YandexPublishing.c" +#line 1448 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = NULL; -#line 1455 "YandexPublishing.c" +#line 1454 "YandexPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1459 "YandexPublishing.c" +#line 1458 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" *object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer); -#line 1463 "YandexPublishing.c" +#line 1462 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1467 "YandexPublishing.c" +#line 1466 "YandexPublishing.c" } @@ -1477,7 +1476,7 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con G_PARAM_SPEC (spec)->value_type = object_type; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return G_PARAM_SPEC (spec); -#line 1481 "YandexPublishing.c" +#line 1480 "YandexPublishing.c" } @@ -1486,7 +1485,7 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return value->data[0].v_pointer; -#line 1490 "YandexPublishing.c" +#line 1489 "YandexPublishing.c" } @@ -1506,17 +1505,17 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje value->data[0].v_pointer = v_object; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_ref (value->data[0].v_pointer); -#line 1510 "YandexPublishing.c" +#line 1509 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1514 "YandexPublishing.c" +#line 1513 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (old) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (old); -#line 1520 "YandexPublishing.c" +#line 1519 "YandexPublishing.c" } } @@ -1535,17 +1534,17 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = v_object; -#line 1539 "YandexPublishing.c" +#line 1538 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1543 "YandexPublishing.c" +#line 1542 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (old) { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publish_options_unref (old); -#line 1549 "YandexPublishing.c" +#line 1548 "YandexPublishing.c" } } @@ -1555,7 +1554,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" ((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize; -#line 1559 "YandexPublishing.c" +#line 1558 "YandexPublishing.c" } @@ -1570,7 +1569,7 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub self->destination_album_url = NULL; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->ref_count = 1; -#line 1574 "YandexPublishing.c" +#line 1573 "YandexPublishing.c" } @@ -1586,7 +1585,7 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO _g_free0 (self->destination_album); #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (self->destination_album_url); -#line 1590 "YandexPublishing.c" +#line 1589 "YandexPublishing.c" } @@ -1611,7 +1610,7 @@ gpointer publishing_yandex_publish_options_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return instance; -#line 1615 "YandexPublishing.c" +#line 1614 "YandexPublishing.c" } @@ -1624,7 +1623,7 @@ void publishing_yandex_publish_options_unref (gpointer instance) { PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self); #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1628 "YandexPublishing.c" +#line 1627 "YandexPublishing.c" } } @@ -1638,7 +1637,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1642 "YandexPublishing.c" +#line 1641 "YandexPublishing.c" } @@ -1646,7 +1645,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp PublishingYandexPublishingOptionsPane * self; #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); -#line 1650 "YandexPublishing.c" +#line 1649 "YandexPublishing.c" } @@ -1654,7 +1653,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled ( PublishingYandexPublishingOptionsPane * self; #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane); -#line 1658 "YandexPublishing.c" +#line 1657 "YandexPublishing.c" } @@ -1673,21 +1672,21 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 1677 "YandexPublishing.c" +#line 1676 "YandexPublishing.c" } static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self); -#line 1684 "YandexPublishing.c" +#line 1683 "YandexPublishing.c" } static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self); -#line 1691 "YandexPublishing.c" +#line 1690 "YandexPublishing.c" } @@ -1716,7 +1715,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _g_object_unref0 (self->priv->box); #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->box = _tmp1_; -#line 1720 "YandexPublishing.c" +#line 1719 "YandexPublishing.c" { GtkBuilder* _tmp2_ = NULL; GtkBuilder* _tmp3_ = NULL; @@ -1755,7 +1754,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_); #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1759 "YandexPublishing.c" +#line 1758 "YandexPublishing.c" goto __catch40_g_error; } #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1780,7 +1779,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _g_object_unref0 (self->priv->album_list); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->album_list = _tmp10_; -#line 1784 "YandexPublishing.c" +#line 1783 "YandexPublishing.c" { GeeIterator* _key_it = NULL; GeeHashMap* _tmp11_ = NULL; @@ -1807,7 +1806,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane _key_it = _tmp16_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 1811 "YandexPublishing.c" +#line 1810 "YandexPublishing.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; gchar* key = NULL; @@ -1823,7 +1822,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane if (!_tmp18_) { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1827 "YandexPublishing.c" +#line 1826 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp19_ = _key_it; @@ -1839,11 +1838,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_combo_box_text_append_text (_tmp21_, _tmp22_); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (key); -#line 1843 "YandexPublishing.c" +#line 1842 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (_key_it); -#line 1847 "YandexPublishing.c" +#line 1846 "YandexPublishing.c" } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp23_ = self->priv->album_list; @@ -1895,7 +1894,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (content); -#line 1899 "YandexPublishing.c" +#line 1898 "YandexPublishing.c" } goto __finally40; __catch40_g_error: @@ -1915,7 +1914,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 1919 "YandexPublishing.c" +#line 1918 "YandexPublishing.c" } __finally40: #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1926,18 +1925,18 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane g_clear_error (&_inner_error_); #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1930 "YandexPublishing.c" +#line 1929 "YandexPublishing.c" } #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 1934 "YandexPublishing.c" +#line 1933 "YandexPublishing.c" } PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) { #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host); -#line 1941 "YandexPublishing.c" +#line 1940 "YandexPublishing.c" } @@ -1946,7 +1945,7 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self)); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 1950 "YandexPublishing.c" +#line 1949 "YandexPublishing.c" } @@ -2047,7 +2046,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis _g_object_unref0 (access_type); #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (tmp); -#line 2051 "YandexPublishing.c" +#line 2050 "YandexPublishing.c" } @@ -2062,7 +2061,7 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 2066 "YandexPublishing.c" +#line 2065 "YandexPublishing.c" } @@ -2077,14 +2076,14 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget; -#line 2081 "YandexPublishing.c" +#line 2080 "YandexPublishing.c" } static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 2088 "YandexPublishing.c" +#line 2087 "YandexPublishing.c" } @@ -2104,7 +2103,7 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->album_list); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj); -#line 2108 "YandexPublishing.c" +#line 2107 "YandexPublishing.c" } @@ -2146,14 +2145,14 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ self->priv->options = _tmp2_; #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2150 "YandexPublishing.c" +#line 2149 "YandexPublishing.c" } PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) { #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1); -#line 2157 "YandexPublishing.c" +#line 2156 "YandexPublishing.c" } @@ -2195,7 +2194,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_ result = _tmp6_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2199 "YandexPublishing.c" +#line 2198 "YandexPublishing.c" } @@ -2208,14 +2207,14 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate)); #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction; -#line 2212 "YandexPublishing.c" +#line 2211 "YandexPublishing.c" } static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) { #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self); -#line 2219 "YandexPublishing.c" +#line 2218 "YandexPublishing.c" } @@ -2225,7 +2224,7 @@ static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploa self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader); #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj); -#line 2229 "YandexPublishing.c" +#line 2228 "YandexPublishing.c" } @@ -2243,26 +2242,26 @@ GType publishing_yandex_uploader_get_type (void) { static gchar* bool_to_string (gboolean self) { gchar* result = NULL; -#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (self) { -#line 2249 "YandexPublishing.c" +#line 2248 "YandexPublishing.c" gchar* _tmp0_ = NULL; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2257 "YandexPublishing.c" +#line 2256 "YandexPublishing.c" } else { gchar* _tmp1_ = NULL; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2266 "YandexPublishing.c" +#line 2265 "YandexPublishing.c" } } @@ -2270,7 +2269,7 @@ static gchar* bool_to_string (gboolean self) { static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 2274 "YandexPublishing.c" +#line 2273 "YandexPublishing.c" } @@ -2286,62 +2285,55 @@ 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 2318 "YandexPublishing.c" +#line 2317 "YandexPublishing.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 2324 "YandexPublishing.c" -} - - -static guint8* _vala_array_dup10 (guint8* self, int length) { -#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 2331 "YandexPublishing.c" +#line 2323 "YandexPublishing.c" } static void _g_free0_ (gpointer var) { #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" var = (g_free (var), NULL); -#line 2338 "YandexPublishing.c" +#line 2330 "YandexPublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 2345 "YandexPublishing.c" +#line 2337 "YandexPublishing.c" } @@ -2383,38 +2375,36 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc gint _tmp41__length1 = 0; guint8* _tmp42_ = NULL; gint _tmp42__length1 = 0; - guint8* _tmp43_ = NULL; - gint _tmp43__length1 = 0; - SoupBuffer* _tmp44_ = NULL; - SpitPublishingPublishable* _tmp45_ = NULL; + SoupBuffer* _tmp43_ = NULL; + SpitPublishingPublishable* _tmp44_ = NULL; + GFile* _tmp45_ = NULL; GFile* _tmp46_ = NULL; - GFile* _tmp47_ = NULL; + gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; SoupMessageHeaders* image_part_header = NULL; SoupBuffer* image_part_body = NULL; - SoupMessageHeaders* _tmp50_ = NULL; - SoupBuffer* _tmp51_ = NULL; + SoupMessageHeaders* _tmp49_ = NULL; + SoupBuffer* _tmp50_ = NULL; GHashTable* _result_ = NULL; - GHashFunc _tmp52_ = NULL; - GEqualFunc _tmp53_ = NULL; - GHashTable* _tmp54_ = NULL; + GHashFunc _tmp51_ = NULL; + GEqualFunc _tmp52_ = NULL; + GHashTable* _tmp53_ = NULL; + gchar* _tmp54_ = NULL; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; SoupMessage* outbound_message = NULL; + gchar* _tmp58_ = NULL; gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; + SoupMessage* _tmp60_ = NULL; SoupMessage* _tmp61_ = NULL; - SoupMessage* _tmp62_ = NULL; - SoupMessageHeaders* _tmp63_ = NULL; - PublishingYandexSession* _tmp64_ = NULL; + SoupMessageHeaders* _tmp62_ = NULL; + PublishingYandexSession* _tmp63_ = NULL; + gchar* _tmp64_ = NULL; gchar* _tmp65_ = NULL; gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - SoupMessageHeaders* _tmp69_ = NULL; + SoupMessageHeaders* _tmp68_ = NULL; GError * _inner_error_ = NULL; #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL); @@ -2500,7 +2490,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc soup_multipart_append_form_string (message_parts, "access", _tmp25_); #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp25_); -#line 2504 "YandexPublishing.c" +#line 2494 "YandexPublishing.c" { SpitPublishingPublishable* _tmp26_ = NULL; GFile* _tmp27_ = NULL; @@ -2535,7 +2525,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc if (G_UNLIKELY (_inner_error_ != NULL)) { #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 2539 "YandexPublishing.c" +#line 2529 "YandexPublishing.c" goto __catch41_g_file_error; } #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2548,7 +2538,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 2552 "YandexPublishing.c" +#line 2542 "YandexPublishing.c" } } goto __finally41; @@ -2588,7 +2578,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc _g_object_unref0 (_tmp35_); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (e); -#line 2592 "YandexPublishing.c" +#line 2582 "YandexPublishing.c" } __finally41: #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2603,7 +2593,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 2607 "YandexPublishing.c" +#line 2597 "YandexPublishing.c" } #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp40_ = soup_multipart_get_length (message_parts); @@ -2616,91 +2606,87 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp42__length1 = _tmp41__length1; #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup10 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_); -#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp43__length1 = _tmp42__length1; -#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp44_ = soup_buffer_new_take (_tmp43_, _tmp43__length1); + _tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0); #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - bindable_data = _tmp44_; + bindable_data = _tmp43_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp45_ = photo; + _tmp44_ = photo; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp46_ = spit_publishing_publishable_get_serialized_file (_tmp45_); + _tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp47_ = _tmp46_; + _tmp46_ = _tmp45_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp48_ = g_file_get_path (_tmp47_); + _tmp47_ = g_file_get_path (_tmp46_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp49_ = _tmp48_; + _tmp48_ = _tmp47_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_multipart_append_form_file (message_parts, "", _tmp49_, "image/jpeg", bindable_data); + soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp49_); + _g_free0 (_tmp48_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_object_unref0 (_tmp47_); + _g_object_unref0 (_tmp46_); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_multipart_get_part (message_parts, image_part_num, &_tmp50_, &_tmp51_); + soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - image_part_header = _tmp50_; + image_part_header = _tmp49_; #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - image_part_body = _tmp51_; + image_part_body = _tmp50_; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp52_ = g_str_hash; + _tmp51_ = g_str_hash; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp53_ = g_str_equal; + _tmp52_ = g_str_equal; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp54_ = g_hash_table_new_full (_tmp52_, _tmp53_, _g_free0_, _g_free0_); + _tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_); #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _result_ = _tmp54_; + _result_ = _tmp53_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp55_ = g_strdup ("name"); + _tmp54_ = g_strdup ("name"); #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp56_ = g_strdup ("image"); + _tmp55_ = g_strdup ("image"); #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_hash_table_insert (_result_, _tmp55_, _tmp56_); + g_hash_table_insert (_result_, _tmp54_, _tmp55_); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp57_ = g_strdup ("filename"); + _tmp56_ = g_strdup ("filename"); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp58_ = g_strdup ("unused"); + _tmp57_ = g_strdup ("unused"); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_hash_table_insert (_result_, _tmp57_, _tmp58_); + g_hash_table_insert (_result_, _tmp56_, _tmp57_); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp59_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp60_ = _tmp59_; + _tmp59_ = _tmp58_; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp61_ = soup_form_request_new_from_multipart (_tmp60_, message_parts); + _tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp62_ = _tmp61_; + _tmp61_ = _tmp60_; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp60_); + _g_free0 (_tmp59_); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - outbound_message = _tmp62_; + outbound_message = _tmp61_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp63_ = outbound_message->request_headers; + _tmp62_ = outbound_message->request_headers; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp64_ = session; + _tmp63_ = session; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp65_ = publishing_yandex_session_get_auth_token (_tmp64_); + _tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp66_ = _tmp65_; + _tmp65_ = _tmp64_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp67_ = g_strdup_printf ("OAuth %s", _tmp66_); + _tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp68_ = _tmp67_; + _tmp67_ = _tmp66_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_message_headers_append (_tmp63_, "Authorization", _tmp68_); + soup_message_headers_append (_tmp62_, "Authorization", _tmp67_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp68_); + _g_free0 (_tmp67_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp66_); + _g_free0 (_tmp65_); #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp69_ = outbound_message->request_headers; + _tmp68_ = outbound_message->request_headers; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_message_headers_append (_tmp69_, "Connection", "close"); + soup_message_headers_append (_tmp68_, "Connection", "close"); #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message); #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2715,21 +2701,21 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc __vala_SoupMultipart_free0 (message_parts); #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2719 "YandexPublishing.c" +#line 2705 "YandexPublishing.c" } PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo); -#line 2726 "YandexPublishing.c" +#line 2712 "YandexPublishing.c" } static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) { #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2733 "YandexPublishing.c" +#line 2719 "YandexPublishing.c" } @@ -2790,14 +2776,14 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G self->priv->options = _tmp4_; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 2794 "YandexPublishing.c" +#line 2780 "YandexPublishing.c" } PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host); -#line 2801 "YandexPublishing.c" +#line 2787 "YandexPublishing.c" } @@ -2815,7 +2801,7 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY result = _tmp1_; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2819 "YandexPublishing.c" +#line 2805 "YandexPublishing.c" } @@ -2832,7 +2818,7 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan _tmp1_ = auth_token; #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_); -#line 2836 "YandexPublishing.c" +#line 2822 "YandexPublishing.c" } @@ -2844,7 +2830,7 @@ void publishing_yandex_yandex_publisher_invalidate_persistent_session (Publishin _tmp0_ = self->priv->host; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token"); -#line 2848 "YandexPublishing.c" +#line 2834 "YandexPublishing.c" } @@ -2867,7 +2853,7 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub result = _tmp2_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2871 "YandexPublishing.c" +#line 2857 "YandexPublishing.c" } @@ -2883,7 +2869,7 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi result = _tmp0_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2887 "YandexPublishing.c" +#line 2873 "YandexPublishing.c" } @@ -2902,7 +2888,7 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic result = _tmp1_; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2906 "YandexPublishing.c" +#line 2892 "YandexPublishing.c" } @@ -2916,7 +2902,7 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande result = NULL; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 2920 "YandexPublishing.c" +#line 2906 "YandexPublishing.c" } @@ -2929,7 +2915,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand title = NULL; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" link = NULL; -#line 2933 "YandexPublishing.c" +#line 2919 "YandexPublishing.c" { xmlNode* c = NULL; xmlNode* _tmp0_ = NULL; @@ -2940,14 +2926,14 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp1_ = _tmp0_->children; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp1_; -#line 2944 "YandexPublishing.c" +#line 2930 "YandexPublishing.c" { gboolean _tmp2_ = FALSE; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = TRUE; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 2951 "YandexPublishing.c" +#line 2937 "YandexPublishing.c" xmlNode* _tmp5_ = NULL; xmlNode* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -2958,7 +2944,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand const gchar* _tmp19_ = NULL; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp2_) { -#line 2962 "YandexPublishing.c" +#line 2948 "YandexPublishing.c" xmlNode* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2967,7 +2953,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp4_ = _tmp3_->next; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp4_; -#line 2971 "YandexPublishing.c" +#line 2957 "YandexPublishing.c" } #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = FALSE; @@ -2977,7 +2963,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand if (!(_tmp5_ != NULL)) { #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 2981 "YandexPublishing.c" +#line 2967 "YandexPublishing.c" } #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = c; @@ -2985,7 +2971,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp7_ = _tmp6_->name; #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (g_strcmp0 (_tmp7_, "title") == 0) { -#line 2989 "YandexPublishing.c" +#line 2975 "YandexPublishing.c" xmlNode* _tmp8_ = NULL; gchar* _tmp9_ = NULL; #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2996,7 +2982,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (title); #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" title = _tmp9_; -#line 3000 "YandexPublishing.c" +#line 2986 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp11_ = c; @@ -3004,7 +2990,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp12_ = _tmp11_->name; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (g_strcmp0 (_tmp12_, "link") == 0) { -#line 3008 "YandexPublishing.c" +#line 2994 "YandexPublishing.c" xmlNode* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -3018,15 +3004,15 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp15_); -#line 3022 "YandexPublishing.c" +#line 3008 "YandexPublishing.c" } else { #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = FALSE; -#line 3026 "YandexPublishing.c" +#line 3012 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp10_) { -#line 3030 "YandexPublishing.c" +#line 3016 "YandexPublishing.c" xmlNode* _tmp16_ = NULL; gchar* _tmp17_ = NULL; #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3037,27 +3023,27 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (link); #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" link = _tmp17_; -#line 3041 "YandexPublishing.c" +#line 3027 "YandexPublishing.c" } #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp19_ = title; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp19_ != NULL) { -#line 3047 "YandexPublishing.c" +#line 3033 "YandexPublishing.c" const gchar* _tmp20_ = NULL; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_ = link; #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = _tmp20_ != NULL; -#line 3053 "YandexPublishing.c" +#line 3039 "YandexPublishing.c" } else { #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = FALSE; -#line 3057 "YandexPublishing.c" +#line 3043 "YandexPublishing.c" } #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp18_) { -#line 3061 "YandexPublishing.c" +#line 3047 "YandexPublishing.c" const gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; GeeHashMap* _tmp23_ = NULL; @@ -3087,7 +3073,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand link = NULL; #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 3091 "YandexPublishing.c" +#line 3077 "YandexPublishing.c" } } } @@ -3096,7 +3082,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand _g_free0 (link); #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (title); -#line 3100 "YandexPublishing.c" +#line 3086 "YandexPublishing.c" } @@ -3105,7 +3091,7 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return result; -#line 3109 "YandexPublishing.c" +#line 3095 "YandexPublishing.c" } @@ -3136,7 +3122,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_propagate_error (error, _inner_error_); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3140 "YandexPublishing.c" +#line 3126 "YandexPublishing.c" } else { #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3144,7 +3130,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_clear_error (&_inner_error_); #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3148 "YandexPublishing.c" +#line 3134 "YandexPublishing.c" } } #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3167,7 +3153,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa _publishing_rest_support_xml_document_unref0 (doc); #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3171 "YandexPublishing.c" +#line 3157 "YandexPublishing.c" } else { #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3177,12 +3163,12 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa g_clear_error (&_inner_error_); #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3181 "YandexPublishing.c" +#line 3167 "YandexPublishing.c" } } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3186 "YandexPublishing.c" +#line 3172 "YandexPublishing.c" } @@ -3212,7 +3198,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_propagate_error (error, _inner_error_); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3216 "YandexPublishing.c" +#line 3202 "YandexPublishing.c" } else { #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3220,7 +3206,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_clear_error (&_inner_error_); #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3224 "YandexPublishing.c" +#line 3210 "YandexPublishing.c" } } #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3229,7 +3215,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" root = _tmp3_; -#line 3233 "YandexPublishing.c" +#line 3219 "YandexPublishing.c" { xmlNode* e = NULL; xmlNode* _tmp4_ = NULL; @@ -3240,21 +3226,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _tmp5_ = _tmp4_->children; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _tmp5_; -#line 3244 "YandexPublishing.c" +#line 3230 "YandexPublishing.c" { gboolean _tmp6_ = FALSE; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = TRUE; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 3251 "YandexPublishing.c" +#line 3237 "YandexPublishing.c" xmlNode* _tmp9_ = NULL; xmlNode* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; xmlNode* _tmp12_ = NULL; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp6_) { -#line 3258 "YandexPublishing.c" +#line 3244 "YandexPublishing.c" xmlNode* _tmp7_ = NULL; xmlNode* _tmp8_ = NULL; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3263,7 +3249,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _tmp8_ = _tmp7_->next; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _tmp8_; -#line 3267 "YandexPublishing.c" +#line 3253 "YandexPublishing.c" } #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = FALSE; @@ -3273,7 +3259,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex if (!(_tmp9_ != NULL)) { #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 3277 "YandexPublishing.c" +#line 3263 "YandexPublishing.c" } #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = e; @@ -3283,7 +3269,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex if (g_strcmp0 (_tmp11_, "entry") != 0) { #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 3287 "YandexPublishing.c" +#line 3273 "YandexPublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = e; @@ -3299,7 +3285,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex _publishing_rest_support_xml_document_unref0 (doc); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3303 "YandexPublishing.c" +#line 3289 "YandexPublishing.c" } else { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3309,7 +3295,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex g_clear_error (&_inner_error_); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3313 "YandexPublishing.c" +#line 3299 "YandexPublishing.c" } } } @@ -3317,21 +3303,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex } #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3321 "YandexPublishing.c" +#line 3307 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 3328 "YandexPublishing.c" +#line 3314 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3335 "YandexPublishing.c" +#line 3321 "YandexPublishing.c" } @@ -3364,7 +3350,7 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY _tmp5_ = _tmp4_->message; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_); -#line 3368 "YandexPublishing.c" +#line 3354 "YandexPublishing.c" } @@ -3396,7 +3382,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self); -#line 3400 "YandexPublishing.c" +#line 3386 "YandexPublishing.c" { PublishingRESTSupportTransaction* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -3415,7 +3401,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3419 "YandexPublishing.c" +#line 3405 "YandexPublishing.c" goto __catch42_spit_publishing_publishing_error; } #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3424,7 +3410,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_clear_error (&_inner_error_); #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3428 "YandexPublishing.c" +#line 3414 "YandexPublishing.c" } } goto __finally42; @@ -3447,7 +3433,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi _g_error_free0 (err); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3451 "YandexPublishing.c" +#line 3437 "YandexPublishing.c" } __finally42: #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3458,7 +3444,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi g_clear_error (&_inner_error_); #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3462 "YandexPublishing.c" +#line 3448 "YandexPublishing.c" } #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp9_ = self->priv->album_list; @@ -3478,7 +3464,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi if (_tmp14_) { #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_upload (self); -#line 3482 "YandexPublishing.c" +#line 3468 "YandexPublishing.c" } else { SpitPublishingPluginHost* _tmp15_ = NULL; GError* _tmp16_ = NULL; @@ -3493,7 +3479,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_); #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (_tmp17_); -#line 3497 "YandexPublishing.c" +#line 3483 "YandexPublishing.c" } } @@ -3539,7 +3525,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0); #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3542 "YandexPublishing.c" +#line 3528 "YandexPublishing.c" { #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3547,7 +3533,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3550 "YandexPublishing.c" +#line 3536 "YandexPublishing.c" goto __catch43_spit_publishing_publishing_error; } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3562,7 +3548,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_clear_error (&_inner_error_); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3565 "YandexPublishing.c" +#line 3551 "YandexPublishing.c" } } goto __finally43; @@ -3583,7 +3569,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 3586 "YandexPublishing.c" +#line 3572 "YandexPublishing.c" } __finally43: #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3600,7 +3586,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish g_clear_error (&_inner_error_); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3603 "YandexPublishing.c" +#line 3589 "YandexPublishing.c" } #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); @@ -3608,21 +3594,21 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish _g_free0 (data); #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (album); -#line 3611 "YandexPublishing.c" +#line 3597 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published); -#line 3618 "YandexPublishing.c" +#line 3604 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3625 "YandexPublishing.c" +#line 3611 "YandexPublishing.c" } @@ -3654,7 +3640,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan _tmp4_ = num_published; #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp4_ == 0) { -#line 3657 "YandexPublishing.c" +#line 3643 "YandexPublishing.c" SpitPublishingPluginHost* _tmp5_ = NULL; GError* _tmp6_ = NULL; GError* _tmp7_ = NULL; @@ -3668,7 +3654,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (_tmp7_); -#line 3671 "YandexPublishing.c" +#line 3657 "YandexPublishing.c" } #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = self->priv->host; @@ -3678,7 +3664,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan _tmp9_ = self->priv->host; #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp9_); -#line 3681 "YandexPublishing.c" +#line 3667 "YandexPublishing.c" } @@ -3711,7 +3697,7 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex _tmp5_ = _tmp4_->message; #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_); -#line 3714 "YandexPublishing.c" +#line 3700 "YandexPublishing.c" } @@ -3746,14 +3732,14 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish _tmp4_ = completed_fraction; #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ (_tmp3_, _tmp4_, _tmp2__target); -#line 3748 "YandexPublishing.c" +#line 3734 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete); -#line 3755 "YandexPublishing.c" +#line 3741 "YandexPublishing.c" } @@ -3844,7 +3830,7 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan _publishing_rest_support_batch_uploader_unref0 (uploader); #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3846 "YandexPublishing.c" +#line 3832 "YandexPublishing.c" } @@ -3859,7 +3845,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex if (!_tmp0_) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 3861 "YandexPublishing.c" +#line 3847 "YandexPublishing.c" } #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->session; @@ -3871,7 +3857,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex self->priv->running = FALSE; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 3873 "YandexPublishing.c" +#line 3859 "YandexPublishing.c" } @@ -3927,11 +3913,11 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande if (_tmp12_) { #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_create_destination_album (self); -#line 3929 "YandexPublishing.c" +#line 3915 "YandexPublishing.c" } else { #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_upload (self); -#line 3933 "YandexPublishing.c" +#line 3919 "YandexPublishing.c" } } @@ -3939,14 +3925,14 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 3941 "YandexPublishing.c" +#line 3927 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 3948 "YandexPublishing.c" +#line 3934 "YandexPublishing.c" } @@ -3981,21 +3967,21 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing _tmp5_ = _tmp4_->message; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_); -#line 3983 "YandexPublishing.c" +#line 3969 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) { #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self); -#line 3990 "YandexPublishing.c" +#line 3976 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) { #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self); -#line 3997 "YandexPublishing.c" +#line 3983 "YandexPublishing.c" } @@ -4040,7 +4026,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp6_); -#line 4042 "YandexPublishing.c" +#line 4028 "YandexPublishing.c" { PublishingRESTSupportTransaction* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -4059,7 +4045,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4061 "YandexPublishing.c" +#line 4047 "YandexPublishing.c" goto __catch44_spit_publishing_publishing_error; } #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4068,7 +4054,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_clear_error (&_inner_error_); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4070 "YandexPublishing.c" +#line 4056 "YandexPublishing.c" } } goto __finally44; @@ -4089,7 +4075,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4091 "YandexPublishing.c" +#line 4077 "YandexPublishing.c" } __finally44: #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4100,7 +4086,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish g_clear_error (&_inner_error_); #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4102 "YandexPublishing.c" +#line 4088 "YandexPublishing.c" } #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = self->priv->options; @@ -4122,7 +4108,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (publishing_options_pane); -#line 4124 "YandexPublishing.c" +#line 4110 "YandexPublishing.c" } @@ -4158,7 +4144,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0); -#line 4160 "YandexPublishing.c" +#line 4146 "YandexPublishing.c" { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4166,7 +4152,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex if (G_UNLIKELY (_inner_error_ != NULL)) { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4168 "YandexPublishing.c" +#line 4154 "YandexPublishing.c" goto __catch45_spit_publishing_publishing_error; } #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4177,7 +4163,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_clear_error (&_inner_error_); #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4179 "YandexPublishing.c" +#line 4165 "YandexPublishing.c" } } goto __finally45; @@ -4198,7 +4184,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4200 "YandexPublishing.c" +#line 4186 "YandexPublishing.c" } __finally45: #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4211,25 +4197,25 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex g_clear_error (&_inner_error_); #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4213 "YandexPublishing.c" +#line 4199 "YandexPublishing.c" } #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4217 "YandexPublishing.c" +#line 4203 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender); -#line 4224 "YandexPublishing.c" +#line 4210 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err); -#line 4231 "YandexPublishing.c" +#line 4217 "YandexPublishing.c" } @@ -4262,7 +4248,7 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan _tmp5_ = _tmp4_->message; #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_); -#line 4264 "YandexPublishing.c" +#line 4250 "YandexPublishing.c" } @@ -4301,7 +4287,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp6_); -#line 4303 "YandexPublishing.c" +#line 4289 "YandexPublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; PublishingRESTSupportTransaction* _tmp7_ = NULL; @@ -4330,7 +4316,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (G_UNLIKELY (_inner_error_ != NULL)) { #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4332 "YandexPublishing.c" +#line 4318 "YandexPublishing.c" goto __catch46_spit_publishing_publishing_error; } #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4339,7 +4325,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_clear_error (&_inner_error_); #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4341 "YandexPublishing.c" +#line 4327 "YandexPublishing.c" } #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = doc; @@ -4347,7 +4333,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_); #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" root = _tmp13_; -#line 4349 "YandexPublishing.c" +#line 4335 "YandexPublishing.c" { xmlNode* work = NULL; xmlNode* _tmp14_ = NULL; @@ -4358,20 +4344,20 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp15_ = _tmp14_->children; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" work = _tmp15_; -#line 4360 "YandexPublishing.c" +#line 4346 "YandexPublishing.c" { gboolean _tmp16_ = FALSE; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = TRUE; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 4367 "YandexPublishing.c" +#line 4353 "YandexPublishing.c" xmlNode* _tmp19_ = NULL; xmlNode* _tmp20_ = NULL; const gchar* _tmp21_ = NULL; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp16_) { -#line 4373 "YandexPublishing.c" +#line 4359 "YandexPublishing.c" xmlNode* _tmp17_ = NULL; xmlNode* _tmp18_ = NULL; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4380,7 +4366,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp18_ = _tmp17_->next; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" work = _tmp18_; -#line 4382 "YandexPublishing.c" +#line 4368 "YandexPublishing.c" } #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = FALSE; @@ -4390,7 +4376,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (!(_tmp19_ != NULL)) { #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4392 "YandexPublishing.c" +#line 4378 "YandexPublishing.c" } #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_ = work; @@ -4400,7 +4386,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (g_strcmp0 (_tmp21_, "workspace") != 0) { #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 4402 "YandexPublishing.c" +#line 4388 "YandexPublishing.c" } { xmlNode* c = NULL; @@ -4412,14 +4398,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp23_ = _tmp22_->children; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp23_; -#line 4414 "YandexPublishing.c" +#line 4400 "YandexPublishing.c" { gboolean _tmp24_ = FALSE; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp24_ = TRUE; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" while (TRUE) { -#line 4421 "YandexPublishing.c" +#line 4407 "YandexPublishing.c" xmlNode* _tmp27_ = NULL; xmlNode* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -4429,7 +4415,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex gboolean _tmp33_ = FALSE; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (!_tmp24_) { -#line 4431 "YandexPublishing.c" +#line 4417 "YandexPublishing.c" xmlNode* _tmp25_ = NULL; xmlNode* _tmp26_ = NULL; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4438,7 +4424,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _tmp26_ = _tmp25_->next; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" c = _tmp26_; -#line 4440 "YandexPublishing.c" +#line 4426 "YandexPublishing.c" } #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp24_ = FALSE; @@ -4448,7 +4434,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (!(_tmp27_ != NULL)) { #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4450 "YandexPublishing.c" +#line 4436 "YandexPublishing.c" } #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = c; @@ -4458,7 +4444,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex if (g_strcmp0 (_tmp29_, "collection") != 0) { #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" continue; -#line 4460 "YandexPublishing.c" +#line 4446 "YandexPublishing.c" } #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp30_ = c; @@ -4472,7 +4458,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _g_free0 (_tmp32_); #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp33_) { -#line 4474 "YandexPublishing.c" +#line 4460 "YandexPublishing.c" gchar* url = NULL; xmlNode* _tmp34_ = NULL; gchar* _tmp35_ = NULL; @@ -4504,7 +4490,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex _g_free0 (url); #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 4506 "YandexPublishing.c" +#line 4492 "YandexPublishing.c" } } } @@ -4514,7 +4500,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex } #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 4516 "YandexPublishing.c" +#line 4502 "YandexPublishing.c" } goto __finally46; __catch46_spit_publishing_publishing_error: @@ -4534,7 +4520,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_); #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4536 "YandexPublishing.c" +#line 4522 "YandexPublishing.c" } __finally46: #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4545,7 +4531,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex g_clear_error (&_inner_error_); #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4547 "YandexPublishing.c" +#line 4533 "YandexPublishing.c" } } @@ -4577,7 +4563,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0); -#line 4579 "YandexPublishing.c" +#line 4565 "YandexPublishing.c" { #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -4585,7 +4571,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan if (G_UNLIKELY (_inner_error_ != NULL)) { #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4587 "YandexPublishing.c" +#line 4573 "YandexPublishing.c" goto __catch47_spit_publishing_publishing_error; } #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4596,7 +4582,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_clear_error (&_inner_error_); #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4598 "YandexPublishing.c" +#line 4584 "YandexPublishing.c" } } goto __finally47; @@ -4617,7 +4603,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_error_free0 (err); -#line 4619 "YandexPublishing.c" +#line 4605 "YandexPublishing.c" } __finally47: #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4630,11 +4616,11 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan g_clear_error (&_inner_error_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4632 "YandexPublishing.c" +#line 4618 "YandexPublishing.c" } #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4636 "YandexPublishing.c" +#line 4622 "YandexPublishing.c" } @@ -4663,7 +4649,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish _tmp3_ = access_token; #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_); -#line 4665 "YandexPublishing.c" +#line 4651 "YandexPublishing.c" } @@ -4672,21 +4658,21 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self)); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_debug ("YandexPublishing.vala:595: login failed"); -#line 4674 "YandexPublishing.c" +#line 4660 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) { #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url); -#line 4681 "YandexPublishing.c" +#line 4667 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self); -#line 4688 "YandexPublishing.c" +#line 4674 "YandexPublishing.c" } @@ -4731,14 +4717,14 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY _tmp7_ = self->priv->web_auth_pane; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 4733 "YandexPublishing.c" +#line 4719 "YandexPublishing.c" } static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self); -#line 4740 "YandexPublishing.c" +#line 4726 "YandexPublishing.c" } @@ -4753,7 +4739,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand _tmp1_ = _ ("You are not currently logged into Yandex.Fotki."); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self); -#line 4755 "YandexPublishing.c" +#line 4741 "YandexPublishing.c" } @@ -4770,7 +4756,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return; -#line 4772 "YandexPublishing.c" +#line 4758 "YandexPublishing.c" } #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->host; @@ -4779,7 +4765,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \ "s publisher is not restartable."); -#line 4780 "YandexPublishing.c" +#line 4766 "YandexPublishing.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction."); @@ -4789,7 +4775,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish _tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp2_) { -#line 4790 "YandexPublishing.c" +#line 4776 "YandexPublishing.c" PublishingYandexSession* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -4813,11 +4799,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_); #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (_tmp7_); -#line 4814 "YandexPublishing.c" +#line 4800 "YandexPublishing.c" } else { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_show_welcome_page (self); -#line 4818 "YandexPublishing.c" +#line 4804 "YandexPublishing.c" } } @@ -4832,7 +4818,7 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe self->priv->host = NULL; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->running = FALSE; -#line 4833 "YandexPublishing.c" +#line 4819 "YandexPublishing.c" } @@ -4843,7 +4829,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate)); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize; -#line 4844 "YandexPublishing.c" +#line 4830 "YandexPublishing.c" } @@ -4858,7 +4844,7 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start; #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop; -#line 4859 "YandexPublishing.c" +#line 4845 "YandexPublishing.c" } @@ -4879,7 +4865,7 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa self->priv->running = FALSE; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" self->priv->web_auth_pane = NULL; -#line 4880 "YandexPublishing.c" +#line 4866 "YandexPublishing.c" } @@ -4907,7 +4893,7 @@ static void publishing_yandex_yandex_publisher_finalize (GObject* obj) { _publishing_rest_support_session_unref0 (self->priv->session); #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj); -#line 4908 "YandexPublishing.c" +#line 4894 "YandexPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala index dbfa3de..0bf929e 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.vala +++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala @@ -275,7 +275,7 @@ private class UploadTransaction: Transaction { int image_part_num = message_parts.get_length(); - var bindable_data = new Soup.Buffer.take (photo_data.data); + Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]); message_parts.append_form_file("", photo.get_serialized_file().get_path(), "image/jpeg", bindable_data); unowned Soup.MessageHeaders image_part_header; diff --git a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui index 1f2dfae..3317805 100644 --- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui +++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui @@ -1,12 +1,7 @@ + - - - Go _Back - - - _Log in - + True False @@ -23,7 +18,6 @@ 0 0 5 - 1 @@ -38,8 +32,6 @@ 0 1 - 1 - 1 @@ -54,7 +46,6 @@ 1 1 4 - 1 @@ -68,8 +59,6 @@ 2 2 - 1 - 1 @@ -83,8 +72,6 @@ 2 3 - 1 - 1 @@ -96,8 +83,6 @@ 3 2 - 1 - 1 @@ -111,8 +96,6 @@ 3 3 - 1 - 1 @@ -123,7 +106,6 @@ Go _Back - go_back_action 102 True True @@ -136,14 +118,11 @@ 0 0 - 1 - 1 _Log in - login_action 102 True True @@ -159,8 +138,6 @@ 1 0 - 1 - 1 @@ -168,7 +145,6 @@ 0 6 5 - 1 @@ -182,8 +158,6 @@ 2 5 - 1 - 1 @@ -197,8 +171,6 @@ 3 5 - 1 - 1 @@ -211,7 +183,6 @@ 0 4 5 - 1 diff --git a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui index fc2824f..8662f8c 100644 --- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui +++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui @@ -1,26 +1,7 @@ - - - - _Logout - - - _Publish - - - A _new album - True - 1 - 1 - - - An _existing album - True - publish_new_radioaction - - - _Remove location, tag and camera-identifying data before uploading - + + + True False @@ -28,15 +9,15 @@ True False - 0.30000001192092896 - 16 + start + 16 + 16 'Publishing to $url as $username' (populated in application code) 0 0 2 - 1 @@ -50,49 +31,43 @@ True - publish_to_existing_radioaction + An _existing album True True False - 0 + start + True True publish_new_radio 0 0 - 1 - 1 True False - 0 - 1 1 0 - 1 - 1 - publish_new_radioaction + A _new album True True False - 0 + start + True True 0 1 - 1 - 1 @@ -104,27 +79,25 @@ 1 1 - 1 - 1 - strip_metadata_toggleaction + _Remove location, tag and camera-identifying data before uploading True True False + start center 16 True - 0 + True True 0 5 2 - 1 @@ -137,8 +110,6 @@ 0 3 - 1 - 1 @@ -155,8 +126,6 @@ 1 0 - 1 - 1 @@ -173,24 +142,18 @@ 0 0 - 1 - 1 1 4 - 1 - 1 True False - 0 - 1 Original size Width or height @@ -199,8 +162,6 @@ 1 3 - 1 - 1 @@ -214,7 +175,6 @@ 0 2 2 - 1 @@ -225,7 +185,6 @@ 0 1 2 - 1 @@ -241,33 +200,31 @@ True - logout_action + _Logout True True True + True 0 0 - 1 - 1 - publish_action + _Publish True True True True True True + True 1 0 - 1 - 1 @@ -275,7 +232,6 @@ 0 2 2 - 1 diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui index 439a754..2ef9f3d 100644 --- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui +++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui @@ -1,26 +1,26 @@ - + False - + True False 30 30 - True + vertical 8 True False + start True True label True - 0 False @@ -29,60 +29,63 @@ - + True False - 2 - 2 - 8 2 + 8 True False + start _Email address True username_entry - 0 - - - - - True - False - _Password - True - password_entry - 0 - 1 - 2 + 0 + 0 True True + True ● 1 - 2 + 0 True True + True + False False ● 1 - 2 1 - 2 + + + + + True + False + start + _Password + True + password_entry + + + 0 + 1 @@ -95,12 +98,11 @@ _Remember - False True True False + start True - 0 True @@ -110,7 +112,7 @@ - + True False diff --git a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui index 374ca65..28011f1 100644 --- a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui +++ b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -36,7 +37,6 @@ _Logout - False 64 24 True @@ -45,7 +45,6 @@ center True True - False True @@ -82,14 +81,10 @@ 320 True False - 0 - 1 1 1 - 1 - 1 @@ -102,23 +97,18 @@ 1 2 - 1 - 1 An _existing album: - False True True False start 4 4 - False True - 0 True True create_new_radio @@ -126,86 +116,69 @@ 0 1 - 1 - 1 A _new album named: - False True True False start 4 4 - False True - 0 - 0.47999998927116394 True True 0 2 - 1 - 1 _Hide album - False True True False - False + start True - 0 True 1 3 - 1 - 1 Open target _album in browser - False True True False - False + start True - 0 True 1 4 - 1 - 1 True False + start 4 8 - 0 $mediatype will appear in 0 0 2 - 1 @@ -245,7 +218,6 @@ _Publish - False 96 30 True @@ -255,7 +227,6 @@ center True True - False True diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index 53262a3..6b17a54 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.32.1, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.34.4, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui index 9752a7c..24a647f 100644 --- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui +++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui @@ -1,26 +1,26 @@ - - + + False - + True False 30 30 - True + vertical 8 True False + start True True label True - 0 False @@ -29,60 +29,63 @@ - + True False - 2 - 2 - 8 2 + 8 True False + start _Email address True username_entry - 0 - - - - - True - False - _Password - True - password_entry - 0 - 1 - 2 + 0 + 0 True True + True ● 1 - 2 + 0 True True + True + False False ● 1 - 2 1 - 2 + + + + + True + False + start + _Password + True + password_entry + + + 0 + 1 @@ -93,7 +96,7 @@ - + True False diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui index ac201da..acc5459 100644 --- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui +++ b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -16,7 +17,7 @@ True False - You are logged into Tumblr as (name). + You are logged into Tumblr as (name). (this label's string is populated and set inside the code, so changes made here will not display) @@ -48,15 +49,13 @@ so changes made here will not display) 0 0 - 1 - 1 True False - 1 + end Photo _size: True size_combo @@ -64,36 +63,26 @@ so changes made here will not display) 0 1 - 1 - 1 True False - 0 - 1 1 0 - 1 - 1 True False - 0 - 1 1 1 - 1 - 1 @@ -114,12 +103,10 @@ so changes made here will not display) _Logout - False 96 True True True - False True @@ -132,12 +119,10 @@ so changes made here will not display) _Publish - False 96 True True True - False True diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui index 1d9cc22..e1cc54d 100644 --- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui +++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui @@ -28,15 +28,18 @@ False - + True False + center + center + 30 + 30 + vertical - + True False - 2 - 2 True @@ -44,24 +47,12 @@ _Albums (or write new): True album_list - 0.30000001192092896 + 0 1 - 2 - - - True - False - 6 - Access _type: - True - access_type_list - 0 - - True @@ -70,8 +61,7 @@ 1 - 2 - 1 + 0 @@ -82,10 +72,23 @@ 1 - 2 1 - 2 - 1 + + + + + True + False + start + 6 + 6 + Access _type: + True + access_type_list + + + 0 + 0 @@ -104,8 +107,8 @@ True True False + start True - 0.30000001192092896 True @@ -121,8 +124,8 @@ True True False + start True - 0.30000001192092896 True @@ -132,7 +135,7 @@ - + True False 2 diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c index 40b85b5..de24060 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.c +++ b/plugins/shotwell-publishing/FacebookPublishing.c @@ -1,4 +1,4 @@ -/* FacebookPublishing.c generated by valac 0.32.1, the Vala compiler +/* FacebookPublishing.c generated by valac 0.34.4, the Vala compiler * generated from FacebookPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3460,35 +3460,35 @@ 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 3465 "FacebookPublishing.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 3473 "FacebookPublishing.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 3479 "FacebookPublishing.c" } @@ -3512,103 +3512,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 3513 "FacebookPublishing.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 3522 "FacebookPublishing.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 3528 "FacebookPublishing.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 3537 "FacebookPublishing.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 3543 "FacebookPublishing.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 3552 "FacebookPublishing.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 3556 "FacebookPublishing.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 3564 "FacebookPublishing.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 3573 "FacebookPublishing.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3577 "FacebookPublishing.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3599 "FacebookPublishing.c" } @@ -3621,33 +3621,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 3624 "FacebookPublishing.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3632 "FacebookPublishing.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3638 "FacebookPublishing.c" } @@ -3657,11 +3657,11 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 3652 "FacebookPublishing.c" { @@ -3676,73 +3676,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 3683 "FacebookPublishing.c" goto __catch4_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3692 "FacebookPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 3708 "FacebookPublishing.c" goto __catch4_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3719 "FacebookPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3733 "FacebookPublishing.c" } @@ -3750,24 +3750,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch4_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 3747 "FacebookPublishing.c" } __finally4: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3758 "FacebookPublishing.c" } @@ -5366,17 +5366,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 5348 "FacebookPublishing.c" } @@ -9919,13 +9919,13 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_ static gchar* g_date_time_to_string (GDateTime* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 2785 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2834 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z"); -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp0_; -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 9895 "FacebookPublishing.c" } @@ -10203,7 +10203,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" _tmp34__length1 = payload_length1; #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" - _tmp35_ = soup_buffer_new_with_owner (_tmp34_, _tmp34__length1, self, NULL); + _tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1); #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" image_data = _tmp35_; #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala" diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala index 8c5222a..3fafe37 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.vala +++ b/plugins/shotwell-publishing/FacebookPublishing.vala @@ -1347,7 +1347,7 @@ internal class GraphSession { unowned uint8[] payload = (uint8[]) mapped_file.get_contents(); payload.length = (int) mapped_file.get_length(); - var image_data = new Soup.Buffer.with_owner (payload, this, null); + Soup.Buffer image_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, payload); Soup.Multipart mp_envelope = new Soup.Multipart("multipart/form-data"); @@ -1447,9 +1447,9 @@ internal class GraphSession { // these error types are always recoverable given the unique behavior of the Facebook // endpoint, so try again - if (msg.status_code == Soup.Status.IO_ERROR || - msg.status_code == Soup.Status.MALFORMED || - msg.status_code == Soup.Status.TRY_AGAIN) { + if (msg.status_code == Soup.KnownStatusCode.IO_ERROR || + msg.status_code == Soup.KnownStatusCode.MALFORMED || + msg.status_code == Soup.KnownStatusCode.TRY_AGAIN) { real_message.bytes_so_far = 0; soup_session.queue_message(msg, null); return; @@ -1460,8 +1460,8 @@ internal class GraphSession { Spit.Publishing.PublishingError? error = null; switch (msg.status_code) { - case Soup.Status.OK: - case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new + 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; @@ -1471,14 +1471,14 @@ internal class GraphSession { "OAuth Access Token has Expired. Logout user."); break; - case Soup.Status.CANT_RESOLVE: - case Soup.Status.CANT_RESOLVE_PROXY: + case Soup.KnownStatusCode.CANT_RESOLVE: + case Soup.KnownStatusCode.CANT_RESOLVE_PROXY: error = new Spit.Publishing.PublishingError.NO_ANSWER( "Unable to resolve %s (error code %u)", real_message.get_uri(), msg.status_code); break; - case Soup.Status.CANT_CONNECT: - case Soup.Status.CANT_CONNECT_PROXY: + case Soup.KnownStatusCode.CANT_CONNECT: + case Soup.KnownStatusCode.CANT_CONNECT_PROXY: error = new Spit.Publishing.PublishingError.NO_ANSWER( "Unable to connect to %s (error code %u)", real_message.get_uri(), msg.status_code); break; diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index 5ce38bd..f0a92e8 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.32.1, the Vala compiler +/* FlickrPublishing.c generated by valac 0.34.4, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -18,10 +18,10 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -130,6 +130,7 @@ typedef struct _PublishingFlickrAuthenticationRequestTransaction PublishingFlick typedef struct _PublishingFlickrAuthenticationRequestTransactionClass PublishingFlickrAuthenticationRequestTransactionClass; #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) #define PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_flickr_access_token_fetch_transaction_get_type ()) #define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransaction)) @@ -180,7 +181,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFli typedef struct _PublishingFlickrUploadTransaction PublishingFlickrUploadTransaction; typedef struct _PublishingFlickrUploadTransactionClass PublishingFlickrUploadTransactionClass; typedef struct _PublishingFlickrUploadTransactionPrivate PublishingFlickrUploadTransactionPrivate; -#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) typedef struct _PublishingFlickrSessionPrivate PublishingFlickrSessionPrivate; #define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL))) typedef struct _PublishingFlickrPublishingOptionsPanePrivate PublishingFlickrPublishingOptionsPanePrivate; @@ -253,7 +253,7 @@ struct _PublishingFlickrPublishingParameters { volatile int ref_count; PublishingFlickrPublishingParametersPrivate * priv; PublishingFlickrUserKind user_kind; - gint quota_free_mb; + gint64 quota_free_bytes; gint photo_major_axis_size; gchar* username; PublishingFlickrVisibilitySpecification* visibility_specification; @@ -495,7 +495,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi static const gchar* flickr_service_real_get_id (SpitPluggable* base); static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base); static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length); +static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length); static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled); static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host); PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host); @@ -693,7 +693,7 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis static void _g_free0_ (gpointer var); static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1); -static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length); +static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length); gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self); static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); @@ -875,7 +875,7 @@ static gpointer _g_object_ref0 (gpointer self) { } -static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length) { +static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) { GdkPixbuf** result; int i; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -965,7 +965,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8__length1 = flickr_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9__length1 = _tmp8__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2843,18 +2843,19 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req const gchar* _tmp0_ = NULL; gchar* oauth_token = NULL; gchar* oauth_token_secret = NULL; - gchar** key_value_pairs = NULL; + GHashTable* data = NULL; const gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint key_value_pairs_length1 = 0; - gint _key_value_pairs_size_ = 0; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - gboolean _tmp24_ = FALSE; - const gchar* _tmp25_ = NULL; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; + GHashTable* _tmp2_ = NULL; + GHashTable* _tmp3_ = NULL; + gconstpointer _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + GHashTable* _tmp6_ = NULL; + gconstpointer _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; + const gchar* _tmp10_ = NULL; + const gchar* _tmp16_ = NULL; + const gchar* _tmp17_ = NULL; #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2871,199 +2872,78 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = response; #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0); -#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs = _tmp3_; -#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs_length1 = _vala_array_length (_tmp2_); + _tmp2_ = soup_form_decode (_tmp1_); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _key_value_pairs_size_ = key_value_pairs_length1; + data = _tmp2_; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = key_value_pairs; + _tmp3_ = data; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4__length1 = key_value_pairs_length1; -#line 2862 "FlickrPublishing.c" - { - gchar** pair_collection = NULL; - gint pair_collection_length1 = 0; - gint _pair_collection_size_ = 0; - gint pair_it = 0; -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - pair_collection = _tmp4_; + g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - pair_collection_length1 = _tmp4__length1; -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) { -#line 2874 "FlickrPublishing.c" - gchar* _tmp5_ = NULL; - gchar* pair = NULL; + _g_free0 (oauth_token); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = g_strdup (pair_collection[pair_it]); + _tmp5_ = g_strdup (_tmp4_); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - pair = _tmp5_; -#line 2881 "FlickrPublishing.c" - { - gchar** split_pair = NULL; - const gchar* _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gint split_pair_length1 = 0; - gint _split_pair_size_ = 0; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - const gchar* _tmp15_ = NULL; + oauth_token = _tmp5_; #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = pair; + _tmp6_ = data; #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0); + g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair = _tmp8_; + _g_free0 (oauth_token_secret); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair_length1 = _vala_array_length (_tmp7_); + _tmp8_ = g_strdup (_tmp7_); #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _split_pair_size_ = split_pair_length1; + oauth_token_secret = _tmp8_; +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp10_ = oauth_token; +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp10_ == NULL) { +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp9_ = TRUE; +#line 2881 "FlickrPublishing.c" + } else { + const gchar* _tmp11_ = NULL; #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = split_pair; + _tmp11_ = oauth_token_secret; #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9__length1 = split_pair_length1; + _tmp9_ = _tmp11_ == NULL; +#line 2888 "FlickrPublishing.c" + } #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp9__length1 != 2) { -#line 2910 "FlickrPublishing.c" - SpitPublishingPluginHost* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + if (_tmp9_) { +#line 2892 "FlickrPublishing.c" + SpitPublishingPluginHost* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + GError* _tmp14_ = NULL; + GError* _tmp15_ = NULL; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = self->priv->host; + _tmp12_ = self->priv->host; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = response; + _tmp13_ = response; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp11_); + _tmp14_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp13_); #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = _tmp12_; + _tmp15_ = _tmp14_; #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_); + spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_); #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_error_free0 (_tmp13_); -#line 2927 "FlickrPublishing.c" - } -#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = split_pair; -#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14__length1 = split_pair_length1; -#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = _tmp14_[0]; -#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (g_strcmp0 (_tmp15_, "oauth_token") == 0) { -#line 2937 "FlickrPublishing.c" - gchar** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = split_pair; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16__length1 = split_pair_length1; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = _tmp16_[1]; + _g_error_free0 (_tmp15_); +#line 2909 "FlickrPublishing.c" + } #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp16_ = oauth_token; #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (oauth_token); + _tmp17_ = oauth_token_secret; #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - oauth_token = _tmp18_; -#line 2954 "FlickrPublishing.c" - } else { - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - const gchar* _tmp20_ = NULL; -#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = split_pair; -#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19__length1 = split_pair_length1; -#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = _tmp19_[0]; -#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) { -#line 2967 "FlickrPublishing.c" - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = split_pair; -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21__length1 = split_pair_length1; -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = _tmp21_[1]; -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = g_strdup (_tmp22_); -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (oauth_token_secret); -#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - oauth_token_secret = _tmp23_; -#line 2984 "FlickrPublishing.c" - } - } -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (pair); -#line 2991 "FlickrPublishing.c" - } - } - } -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = oauth_token; -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp25_ == NULL) { -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = TRUE; -#line 3001 "FlickrPublishing.c" - } else { - const gchar* _tmp26_ = NULL; -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = oauth_token_secret; -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = _tmp26_ == NULL; -#line 3008 "FlickrPublishing.c" - } -#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp24_) { -#line 3012 "FlickrPublishing.c" - SpitPublishingPluginHost* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - GError* _tmp29_ = NULL; - GError* _tmp30_ = NULL; -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp27_ = self->priv->host; -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp28_ = response; -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "'%s' isn't a valid response to an OAuth authentication request", _tmp28_); -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp30_ = _tmp29_; -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_); -#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_error_free0 (_tmp30_); -#line 3029 "FlickrPublishing.c" - } -#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp31_ = oauth_token; -#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp32_ = oauth_token_secret; -#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp31_, _tmp32_); + publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp16_, _tmp17_); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL); + _g_hash_table_unref0 (data); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (oauth_token_secret); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (oauth_token); -#line 3043 "FlickrPublishing.c" +#line 2923 "FlickrPublishing.c" } @@ -3076,60 +2956,60 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; GError * _inner_error_ = NULL; -#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (token != NULL); -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = token; -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strconcat ("https://www.flickr.com/services/oauth/authorize?oauth_token=", _tmp0_, NULL); -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_; -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strconcat (_tmp2_, "&perms=write", NULL); -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_; -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp2_); -#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" login_uri = _tmp4_; -#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = login_uri; -#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:419: ACTION: launching system browser with uri =" \ +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:409: ACTION: launching system browser with uri =" \ " '%s'", _tmp5_); -#line 3078 "FlickrPublishing.c" +#line 2958 "FlickrPublishing.c" { const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = login_uri; -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp7_; -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_spawn_command_line_async (_tmp8_, &_inner_error_); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp8_); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { -#line 3097 "FlickrPublishing.c" +#line 2977 "FlickrPublishing.c" goto __catch17_g_spawn_error; } -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (login_uri); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3108 "FlickrPublishing.c" +#line 2988 "FlickrPublishing.c" } } goto __finally17; @@ -3139,46 +3019,46 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish SpitPublishingPluginHost* _tmp9_ = NULL; GError* _tmp10_ = NULL; GError* _tmp11_ = NULL; -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->host; -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "couldn't launch system web browser to complete Flickr login"); -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_; -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp9_, _tmp11_); -#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp11_); -#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (login_uri); -#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3138 "FlickrPublishing.c" +#line 3018 "FlickrPublishing.c" } __finally17: -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (login_uri); -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3151 "FlickrPublishing.c" +#line 3031 "FlickrPublishing.c" } -#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_system_browser_launched (self); -#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (login_uri); -#line 3157 "FlickrPublishing.c" +#line 3037 "FlickrPublishing.c" } @@ -3192,24 +3072,24 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin SpitPublishingPluginHost* _tmp11_ = NULL; PublishingFlickrPinEntryPane* _tmp12_ = NULL; GError * _inner_error_ = NULL; -#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:433: ACTION: showing PIN entry pane"); -#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:423: ACTION: showing PIN entry pane"); +#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = gtk_builder_new (); -#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp0_; -#line 3179 "FlickrPublishing.c" +#line 3059 "FlickrPublishing.c" { GtkBuilder* _tmp1_ = NULL; -#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = builder; -#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_); -#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3188 "FlickrPublishing.c" +#line 3068 "FlickrPublishing.c" goto __catch18_g_error; } } @@ -3223,71 +3103,71 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin const gchar* _tmp5_ = NULL; GError* _tmp6_ = NULL; GError* _tmp7_ = NULL; -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = e; -#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_->message; -#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:441: Could not parse UI file! Error: %s.", _tmp3_); -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:431: Could not parse UI file! Error: %s.", _tmp3_); +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->host; -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ "n’t continue."); -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_); -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_); -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp7_); -#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3230 "FlickrPublishing.c" +#line 3110 "FlickrPublishing.c" } __finally18: -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3243 "FlickrPublishing.c" +#line 3123 "FlickrPublishing.c" } -#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = builder; -#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = publishing_flickr_pin_entry_pane_new (_tmp8_); -#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" pin_entry_pane = _tmp9_; -#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = pin_entry_pane; -#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self, 0); -#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = self->priv->host; -#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = pin_entry_pane; -#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (pin_entry_pane); -#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 3265 "FlickrPublishing.c" +#line 3145 "FlickrPublishing.c" } @@ -3301,56 +3181,56 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl const gchar* _tmp5_ = NULL; PublishingFlickrAccessTokenFetchTransaction* _tmp6_ = NULL; GError * _inner_error_ = NULL; -#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (pin != NULL); -#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = pin; -#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:454: ACTION: validating authorization PIN %s", _tmp0_); -#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:444: ACTION: validating authorization PIN %s", _tmp0_); +#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE); -#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->host; -#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _ ("Verifying authorization…"); -#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->session; -#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = pin; -#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_); -#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" txn = _tmp6_; -#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); -#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3309 "FlickrPublishing.c" +#line 3189 "FlickrPublishing.c" { -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3317 "FlickrPublishing.c" +#line 3197 "FlickrPublishing.c" goto __catch19_spit_publishing_publishing_error; } -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3328 "FlickrPublishing.c" +#line 3208 "FlickrPublishing.c" } } goto __finally19; @@ -3359,317 +3239,192 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl GError* err = NULL; SpitPublishingPluginHost* _tmp7_ = NULL; GError* _tmp8_ = NULL; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->host; -#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = err; -#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 3349 "FlickrPublishing.c" +#line 3229 "FlickrPublishing.c" } __finally19: -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3362 "FlickrPublishing.c" +#line 3242 "FlickrPublishing.c" } -#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 3366 "FlickrPublishing.c" +#line 3246 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response) { const gchar* _tmp0_ = NULL; - gchar** key_value_pairs = NULL; - const gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint key_value_pairs_length1 = 0; - gint _key_value_pairs_size_ = 0; gchar* token = NULL; gchar* token_secret = NULL; gchar* username = NULL; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + GHashTable* data = NULL; + const gchar* _tmp1_ = NULL; + GHashTable* _tmp2_ = NULL; + GHashTable* _tmp3_ = NULL; + gconstpointer _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + GHashTable* _tmp6_ = NULL; + gconstpointer _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + GHashTable* _tmp9_ = NULL; + gconstpointer _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + const gchar* _tmp12_ = NULL; + const gchar* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + gboolean _tmp15_ = FALSE; + gboolean _tmp16_ = FALSE; + const gchar* _tmp17_ = NULL; + PublishingFlickrSession* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; - const gchar* _tmp30_ = NULL; - PublishingFlickrSession* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (response != NULL); -#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = response; -#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:471: ACTION: extracting access phase credentials" \ +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:461: ACTION: extracting access phase credentials" \ " from '%s'", _tmp0_); -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = response; -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0); -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs = _tmp3_; -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs_length1 = _vala_array_length (_tmp2_); -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _key_value_pairs_size_ = key_value_pairs_length1; -#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" token = NULL; -#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" token_secret = NULL; -#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" username = NULL; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = key_value_pairs; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4__length1 = key_value_pairs_length1; -#line 3421 "FlickrPublishing.c" - { - gchar** key_value_pair_collection = NULL; - gint key_value_pair_collection_length1 = 0; - gint _key_value_pair_collection_size_ = 0; - gint key_value_pair_it = 0; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pair_collection = _tmp4_; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pair_collection_length1 = _tmp4__length1; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - for (key_value_pair_it = 0; key_value_pair_it < _tmp4__length1; key_value_pair_it = key_value_pair_it + 1) { -#line 3433 "FlickrPublishing.c" - gchar* _tmp5_ = NULL; - gchar* key_value_pair = NULL; -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = g_strdup (key_value_pair_collection[key_value_pair_it]); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pair = _tmp5_; -#line 3440 "FlickrPublishing.c" - { - gchar** split_pair = NULL; - const gchar* _tmp6_ = NULL; - gchar** _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gint split_pair_length1 = 0; - gint _split_pair_size_ = 0; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gchar* key = NULL; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* value = NULL; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = key_value_pair; -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0); -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair = _tmp8_; -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair_length1 = _vala_array_length (_tmp7_); -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _split_pair_size_ = split_pair_length1; -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = split_pair; -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9__length1 = split_pair_length1; -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp9__length1 != 2) { -#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); -#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (key_value_pair); -#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - continue; -#line 3483 "FlickrPublishing.c" - } -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = split_pair; -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10__length1 = split_pair_length1; -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _tmp10_[0]; -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = g_strdup (_tmp11_); -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key = _tmp12_; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = split_pair; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13__length1 = split_pair_length1; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = _tmp13_[1]; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = g_strdup (_tmp14_); -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - value = _tmp15_; -#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = key; -#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (g_strcmp0 (_tmp16_, "oauth_token") == 0) { -#line 3509 "FlickrPublishing.c" - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = value; -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = g_strdup (_tmp17_); -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (token); -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - token = _tmp18_; -#line 3520 "FlickrPublishing.c" - } else { - const gchar* _tmp19_ = NULL; -#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = key; -#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (g_strcmp0 (_tmp19_, "oauth_token_secret") == 0) { -#line 3527 "FlickrPublishing.c" - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; -#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = value; -#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = g_strdup (_tmp20_); -#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (token_secret); -#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - token_secret = _tmp21_; -#line 3538 "FlickrPublishing.c" - } else { - const gchar* _tmp22_ = NULL; -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = key; -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (g_strcmp0 (_tmp22_, "username") == 0) { -#line 3545 "FlickrPublishing.c" - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = value; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = g_strdup (_tmp23_); -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (username); -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - username = _tmp24_; -#line 3556 "FlickrPublishing.c" - } - } - } -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (value); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (key); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); -#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (key_value_pair); -#line 3568 "FlickrPublishing.c" - } - } - } -#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = token; -#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = token_secret; -#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp27_ = username; -#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:495: access phase credentials: { token = '%s'; t" \ -"oken_secret = '%s'; username = '%s' }", _tmp25_, _tmp26_, _tmp27_); -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp30_ = token; -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp30_ == NULL) { -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29_ = TRUE; -#line 3586 "FlickrPublishing.c" +#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp1_ = response; +#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp2_ = soup_form_decode (_tmp1_); +#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + data = _tmp2_; +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp3_ = data; +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_); +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (token); +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp5_ = g_strdup (_tmp4_); +#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + token = _tmp5_; +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp6_ = data; +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_); +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (token_secret); +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp8_ = g_strdup (_tmp7_); +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + token_secret = _tmp8_; +#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp9_ = data; +#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_); +#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (username); +#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp11_ = g_strdup (_tmp10_); +#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + username = _tmp11_; +#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp12_ = token; +#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp13_ = token_secret; +#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp14_ = username; +#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:472: access phase credentials: { token = '%s'; t" \ +"oken_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_); +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp17_ = token; +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp17_ == NULL) { +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp16_ = TRUE; +#line 3341 "FlickrPublishing.c" } else { - const gchar* _tmp31_ = NULL; -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp31_ = token_secret; -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29_ = _tmp31_ == NULL; -#line 3593 "FlickrPublishing.c" - } -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp29_) { -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp28_ = TRUE; -#line 3599 "FlickrPublishing.c" + const gchar* _tmp18_ = NULL; +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp18_ = token_secret; +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp16_ = _tmp18_ == NULL; +#line 3348 "FlickrPublishing.c" + } +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp16_) { +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp15_ = TRUE; +#line 3354 "FlickrPublishing.c" } else { - const gchar* _tmp32_ = NULL; -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp32_ = username; -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp28_ = _tmp32_ == NULL; -#line 3606 "FlickrPublishing.c" - } -#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp28_) { -#line 3610 "FlickrPublishing.c" - SpitPublishingPluginHost* _tmp33_ = NULL; - GError* _tmp34_ = NULL; - GError* _tmp35_ = NULL; -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp33_ = self->priv->host; -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp34_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \ -"but at " "least one of these is absent"); -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp35_ = _tmp34_; -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp33_, _tmp35_); -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_error_free0 (_tmp35_); -#line 3624 "FlickrPublishing.c" + const gchar* _tmp19_ = NULL; +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp19_ = username; +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp15_ = _tmp19_ == NULL; +#line 3361 "FlickrPublishing.c" } -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp36_ = self->priv->session; -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp37_ = token; -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp38_ = token_secret; -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp39_ = username; -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_session_set_access_phase_credentials (_tmp36_, _tmp37_, _tmp38_, _tmp39_); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp15_) { +#line 3365 "FlickrPublishing.c" + SpitPublishingPluginHost* _tmp20_ = NULL; + GError* _tmp21_ = NULL; + GError* _tmp22_ = NULL; +#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp20_ = self->priv->host; +#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \ +"but at " "least one of these is absent"); +#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp22_ = _tmp21_; +#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_); +#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_error_free0 (_tmp22_); +#line 3379 "FlickrPublishing.c" + } +#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp23_ = self->priv->session; +#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp24_ = token; +#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp25_ = token_secret; +#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp26_ = username; +#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_); +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_hash_table_unref0 (data); +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (username); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (token_secret); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (token); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL); -#line 3644 "FlickrPublishing.c" +#line 3399 "FlickrPublishing.c" } @@ -3680,49 +3435,49 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing PublishingFlickrSession* _tmp2_ = NULL; PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL; GError * _inner_error_ = NULL; -#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:507: ACTION: running network transaction to fetc" \ +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:484: ACTION: running network transaction to fetc" \ "h account information"); -#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE); -#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_); -#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->session; -#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_); -#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" txn = _tmp3_; -#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3677 "FlickrPublishing.c" +#line 3432 "FlickrPublishing.c" { -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3685 "FlickrPublishing.c" +#line 3440 "FlickrPublishing.c" goto __catch20_spit_publishing_publishing_error; } -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3696 "FlickrPublishing.c" +#line 3451 "FlickrPublishing.c" } } goto __finally20; @@ -3731,52 +3486,70 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing GError* err = NULL; SpitPublishingPluginHost* _tmp4_ = NULL; GError* _tmp5_ = NULL; -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->host; -#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = err; -#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 3717 "FlickrPublishing.c" +#line 3472 "FlickrPublishing.c" } __finally20: -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3730 "FlickrPublishing.c" +#line 3485 "FlickrPublishing.c" } -#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 3734 "FlickrPublishing.c" +#line 3489 "FlickrPublishing.c" +} + + +static gint64 int64_parse (const gchar* str) { + gint64 result = 0LL; + const gchar* _tmp0_ = NULL; + gint64 _tmp1_ = 0LL; +#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + g_return_val_if_fail (str != NULL, 0LL); +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + _tmp0_ = str; +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + result = _tmp1_; +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + return result; +#line 3507 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) { const gchar* _tmp0_ = NULL; GError * _inner_error_ = NULL; -#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (xml != NULL); -#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = xml; -#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:524: ACTION: parsing account information from xm" \ +#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:501: ACTION: parsing account information from xm" \ "l = '%s'", _tmp0_); -#line 3749 "FlickrPublishing.c" +#line 3522 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* response_doc = NULL; const gchar* _tmp1_ = NULL; @@ -3802,229 +3575,229 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P gchar* _tmp16_ = NULL; PublishingFlickrUserKind user_kind = 0; const gchar* _tmp17_ = NULL; - gint quota_mb_left = 0; + gint64 quota_bytes_left = 0LL; const gchar* _tmp20_ = NULL; - gint _tmp21_ = 0; + gint64 _tmp21_ = 0LL; PublishingFlickrPublishingParameters* _tmp22_ = NULL; - gint _tmp23_ = 0; + gint64 _tmp23_ = 0LL; PublishingFlickrPublishingParameters* _tmp24_ = NULL; PublishingFlickrUserKind _tmp25_ = 0; -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_); -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" response_doc = _tmp2_; -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3792 "FlickrPublishing.c" +#line 3565 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3801 "FlickrPublishing.c" +#line 3574 "FlickrPublishing.c" } -#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = response_doc; -#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_); -#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" root_node = _tmp4_; -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = response_doc; -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = root_node; -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_node = _tmp7_; -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3823 "FlickrPublishing.c" +#line 3596 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3834 "FlickrPublishing.c" +#line 3607 "FlickrPublishing.c" } -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = response_doc; -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = user_node; -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_); -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" is_pro_str = _tmp10_; -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3850 "FlickrPublishing.c" +#line 3623 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3861 "FlickrPublishing.c" +#line 3634 "FlickrPublishing.c" } -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = response_doc; -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = user_node; -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" bandwidth_node = _tmp13_; -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3879 "FlickrPublishing.c" +#line 3652 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3892 "FlickrPublishing.c" +#line 3665 "FlickrPublishing.c" } -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = response_doc; -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = bandwidth_node; -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" remaining_kb_str = _tmp16_; -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3910 "FlickrPublishing.c" +#line 3683 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3923 "FlickrPublishing.c" +#line 3696 "FlickrPublishing.c" } -#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = is_pro_str; -#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp17_, "0") == 0) { -#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_FREE; -#line 3931 "FlickrPublishing.c" +#line 3704 "FlickrPublishing.c" } else { const gchar* _tmp18_ = NULL; -#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = is_pro_str; -#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp18_, "1") == 0) { -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_PRO; -#line 3940 "FlickrPublishing.c" +#line 3713 "FlickrPublishing.c" } else { GError* _tmp19_ = NULL; -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to determine if user has free or pro account"); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp19_; -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3955 "FlickrPublishing.c" +#line 3728 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3970 "FlickrPublishing.c" +#line 3743 "FlickrPublishing.c" } } -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = remaining_kb_str; -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = atoi (_tmp20_); -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - quota_mb_left = _tmp21_ / 1024; -#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp21_ = int64_parse (_tmp20_); +#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + quota_bytes_left = _tmp21_ * 1024; +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = self->priv->parameters; -#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = quota_mb_left; -#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_->quota_free_mb = _tmp23_; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp23_ = quota_bytes_left; +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp22_->quota_free_bytes = _tmp23_; +#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = self->priv->parameters; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = user_kind; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_->user_kind = _tmp25_; -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 3997 "FlickrPublishing.c" +#line 3770 "FlickrPublishing.c" } goto __finally21; __catch21_spit_publishing_publishing_error: @@ -4033,69 +3806,69 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P GError* _tmp26_ = NULL; SpitPublishingPluginHost* _tmp27_ = NULL; GError* _tmp28_ = NULL; -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = err; -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_error_matches (_tmp26_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) { -#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4020 "FlickrPublishing.c" +#line 3793 "FlickrPublishing.c" } -#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = self->priv->host; -#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = err; -#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_); -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4032 "FlickrPublishing.c" +#line 3805 "FlickrPublishing.c" } __finally21: -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4043 "FlickrPublishing.c" +#line 3816 "FlickrPublishing.c" } -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_info_available (self); -#line 4047 "FlickrPublishing.c" +#line 3820 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) { PublishingFlickrSession* _tmp0_ = NULL; -#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:568: ACTION: logging user out, deauthenticating " \ +#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:545: ACTION: logging user out, deauthenticating " \ "session, and erasing stored credentials"); -#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->session; -#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_session_deauthenticate (_tmp0_); -#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_invalidate_persistent_session (self); -#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 4067 "FlickrPublishing.c" +#line 3840 "FlickrPublishing.c" } @@ -4114,28 +3887,28 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( SpitPublishingPluginHost* _tmp17_ = NULL; PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL; GError * _inner_error_ = NULL; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:579: ACTION: displaying publishing options pane"); -#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:556: ACTION: displaying publishing options pane"); +#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE); -#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = gtk_builder_new (); -#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp1_; -#line 4098 "FlickrPublishing.c" +#line 3871 "FlickrPublishing.c" { GtkBuilder* _tmp2_ = NULL; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_); -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4107 "FlickrPublishing.c" +#line 3880 "FlickrPublishing.c" goto __catch22_g_error; } } @@ -4149,83 +3922,83 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( const gchar* _tmp6_ = NULL; GError* _tmp7_ = NULL; GError* _tmp8_ = NULL; -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = e; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_->message; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:591: Could not parse UI file! Error: %s.", _tmp4_); -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:568: Could not parse UI file! Error: %s.", _tmp4_); +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->host; -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ "n’t continue."); -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp7_; -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_); -#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp8_); -#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4149 "FlickrPublishing.c" +#line 3922 "FlickrPublishing.c" } __finally22: -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4162 "FlickrPublishing.c" +#line 3935 "FlickrPublishing.c" } -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->parameters; -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->host; -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_); -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = builder; -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_); -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publishing_options_pane); -#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publishing_options_pane = _tmp14_; -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = self->priv->publishing_options_pane; -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0); -#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = self->priv->publishing_options_pane; -#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = self->priv->host; -#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = self->priv->publishing_options_pane; -#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 4196 "FlickrPublishing.c" +#line 3969 "FlickrPublishing.c" } @@ -4239,51 +4012,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli GDateTime* _tmp5_ = NULL; gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = a; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = b; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_date_time_compare (_tmp2_, _tmp5_); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_date_time_unref0 (_tmp5_); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_date_time_unref0 (_tmp2_); -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp7_; -#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4238 "FlickrPublishing.c" +#line 4011 "FlickrPublishing.c" } static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; result = publishing_flickr_flickr_publisher_flickr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b); -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4247 "FlickrPublishing.c" +#line 4020 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { -#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete); -#line 4254 "FlickrPublishing.c" +#line 4027 "FlickrPublishing.c" } @@ -4323,168 +4096,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick PublishingFlickrUploader* _tmp28_ = NULL; PublishingFlickrUploader* _tmp29_ = NULL; PublishingFlickrUploader* _tmp30_ = NULL; -#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = strip_metadata; -#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_); -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:612: ACTION: uploading media items to remote ser" \ +#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:589: ACTION: uploading media items to remote ser" \ "ver."); -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE); -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->host; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->parameters; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_->photo_major_axis_size; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = strip_metadata; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_); -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL); -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = NULL; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = NULL; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = NULL; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = _tmp8_; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = _tmp6_; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = _tmp7_; -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp9_) { -#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4336 "FlickrPublishing.c" +#line 4109 "FlickrPublishing.c" } -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->host; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_); -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables = _tmp12_; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables_length1 = _tmp11_; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishables_size_ = publishables_length1; -#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); -#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_list = _tmp13_; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishables; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14__length1 = publishables_length1; -#line 4356 "FlickrPublishing.c" +#line 4129 "FlickrPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; gint _p_collection_size_ = 0; gint p_it = 0; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p_collection = _tmp14_; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p_collection_length1 = _tmp14__length1; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { -#line 4368 "FlickrPublishing.c" +#line 4141 "FlickrPublishing.c" SpitPublishingPublishable* _tmp15_ = NULL; SpitPublishingPublishable* p = NULL; -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p = _tmp15_; -#line 4375 "FlickrPublishing.c" +#line 4148 "FlickrPublishing.c" { GeeArrayList* _tmp16_ = NULL; SpitPublishingPublishable* _tmp17_ = NULL; -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = sorted_list; -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = p; -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (p); -#line 4387 "FlickrPublishing.c" +#line 4160 "FlickrPublishing.c" } } } -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = sorted_list; -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func, NULL, NULL); -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = self->priv->session; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = sorted_list; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp21_); -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = _tmp22_; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23__length1 = _tmp21_; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = self->priv->parameters; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = strip_metadata; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_); -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = _tmp26_; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL); -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" uploader = _tmp27_; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = uploader; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0); -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = uploader; -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0); -#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = uploader; -#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self); -#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (sorted_list); -#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 4435 "FlickrPublishing.c" +#line 4208 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) { SpitPublishingPluginHost* _tmp0_ = NULL; SpitPublishingPluginHost* _tmp1_ = NULL; -#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:640: ACTION: showing success pane."); -#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:617: ACTION: showing success pane."); +#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE); -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 4454 "FlickrPublishing.c" +#line 4227 "FlickrPublishing.c" } @@ -4492,32 +4265,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli gint result = 0; SpitPublishingPluginHost* _tmp0_ = NULL; gint _tmp1_ = 0; -#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", 0); -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4472 "FlickrPublishing.c" +#line 4245 "FlickrPublishing.c" } void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) { SpitPublishingPluginHost* _tmp0_ = NULL; gint _tmp1_ = 0; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = vis; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", _tmp1_); -#line 4487 "FlickrPublishing.c" +#line 4260 "FlickrPublishing.c" } @@ -4525,32 +4298,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF gint result = 0; SpitPublishingPluginHost* _tmp0_ = NULL; gint _tmp1_ = 0; -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); -#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1); -#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4505 "FlickrPublishing.c" +#line 4278 "FlickrPublishing.c" } void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) { SpitPublishingPluginHost* _tmp0_ = NULL; gint _tmp1_ = 0; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = size; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_); -#line 4520 "FlickrPublishing.c" +#line 4293 "FlickrPublishing.c" } @@ -4559,17 +4332,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic SpitPublishingService* result = NULL; SpitPublishingService* _tmp0_ = NULL; SpitPublishingService* _tmp1_ = NULL; -#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->service; -#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4539 "FlickrPublishing.c" +#line 4312 "FlickrPublishing.c" } @@ -4577,31 +4350,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi PublishingFlickrFlickrPublisher * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->running; -#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; -#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4555 "FlickrPublishing.c" +#line 4328 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) { gboolean _tmp0_ = FALSE; -#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = TRUE; -#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->was_started = TRUE; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishing_flickr_flickr_publisher_is_persistent_session_valid (self); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_) { -#line 4571 "FlickrPublishing.c" +#line 4344 "FlickrPublishing.c" PublishingFlickrSession* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -4609,39 +4382,39 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:677: attempt start: a persistent session is avai" \ +#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:654: attempt start: a persistent session is avai" \ "lable; using it"); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_; -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp5_); -#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp3_); -#line 4603 "FlickrPublishing.c" +#line 4376 "FlickrPublishing.c" } else { -#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:682: attempt start: no persistent session availa" \ +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:659: attempt start: no persistent session availa" \ "ble; showing login welcome pane"); -#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_login_welcome_pane (self); -#line 4609 "FlickrPublishing.c" +#line 4382 "FlickrPublishing.c" } } @@ -4650,55 +4423,55 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish PublishingFlickrFlickrPublisher * self; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_) { -#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4626 "FlickrPublishing.c" +#line 4399 "FlickrPublishing.c" } -#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->was_started; -#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_error ("FlickrPublishing.vala:693: FlickrPublisher: start( ): can't start; thi" \ +#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_error ("FlickrPublishing.vala:670: FlickrPublisher: start( ): can't start; thi" \ "s publisher is not restartable."); -#line 4634 "FlickrPublishing.c" +#line 4407 "FlickrPublishing.c" } -#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:695: FlickrPublisher: starting interaction."); -#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:672: FlickrPublisher: starting interaction."); +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 4640 "FlickrPublishing.c" +#line 4413 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; PublishingFlickrSession* _tmp0_ = NULL; -#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:701: FlickrPublisher: stop( ) invoked."); -#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:678: FlickrPublisher: stop( ) invoked."); +#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->session; -#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ != NULL) { -#line 4655 "FlickrPublishing.c" +#line 4428 "FlickrPublishing.c" PublishingFlickrSession* _tmp1_ = NULL; -#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; -#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 4661 "FlickrPublishing.c" +#line 4434 "FlickrPublishing.c" } -#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 4665 "FlickrPublishing.c" +#line 4438 "FlickrPublishing.c" } @@ -4709,7 +4482,7 @@ static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlick g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate)); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize; -#line 4676 "FlickrPublishing.c" +#line 4449 "FlickrPublishing.c" } @@ -4724,7 +4497,7 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop; -#line 4691 "FlickrPublishing.c" +#line 4464 "FlickrPublishing.c" } @@ -4743,7 +4516,7 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv->publishing_options_pane = NULL; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 4710 "FlickrPublishing.c" +#line 4483 "FlickrPublishing.c" } @@ -4779,7 +4552,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj); -#line 4746 "FlickrPublishing.c" +#line 4519 "FlickrPublishing.c" } @@ -4822,115 +4595,115 @@ PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType GObject* _tmp20_ = NULL; GtkBox* _tmp21_ = NULL; GtkBox* _tmp22_ = NULL; -#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL); -#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPinEntryPane*) g_object_new (object_type, NULL); -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = builder; -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->builder = _tmp1_; -#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; -#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp2_ != NULL, "builder != null"); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = builder; -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = gtk_builder_get_objects (_tmp3_); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_slist_length (_tmp5_); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0"); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_slist_free0 (_tmp5_); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = builder; -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = gtk_builder_get_object (_tmp7_, "explanatory_text"); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->explanatory_text); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->explanatory_text = _tmp9_; -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = builder; -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = gtk_builder_get_object (_tmp10_, "pin_entry_caption"); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp11_) : NULL); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pin_entry_caption); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pin_entry_caption = _tmp12_; -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = builder; -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "pin_entry"); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pin_entry); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pin_entry = _tmp15_; -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = builder; -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "continue_button"); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->continue_button); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->continue_button = _tmp18_; -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = builder; -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = gtk_builder_get_object (_tmp19_, "pane_widget"); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_box_get_type ()) ? ((GtkBox*) _tmp20_) : NULL); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = _tmp21_; -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = self->priv->pane_widget; -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget)); -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (self); -#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4875 "FlickrPublishing.c" +#line 4648 "FlickrPublishing.c" } PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder) { -#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_pin_entry_pane_construct (PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, builder); -#line 4882 "FlickrPublishing.c" +#line 4655 "FlickrPublishing.c" } static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self) { GtkEntry* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self)); -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->pin_entry; -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "proceed", self, _tmp1_); -#line 4897 "FlickrPublishing.c" +#line 4670 "FlickrPublishing.c" } @@ -4939,19 +4712,19 @@ static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (Publ GtkEntry* _tmp1_ = NULL; guint _tmp2_ = 0U; guint _tmp3_ = 0U; -#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self)); -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->continue_button; -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->pin_entry; -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gtk_entry_get_text_length (_tmp1_); -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_; -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0)); -#line 4918 "FlickrPublishing.c" +#line 4691 "FlickrPublishing.c" } @@ -4960,44 +4733,44 @@ static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishi GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane); -#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4937 "FlickrPublishing.c" +#line 4710 "FlickrPublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingFlickrPinEntryPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane); -#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4950 "FlickrPublishing.c" +#line 4723 "FlickrPublishing.c" } static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_on_continue_clicked ((PublishingFlickrPinEntryPane*) self); -#line 4957 "FlickrPublishing.c" +#line 4730 "FlickrPublishing.c" } static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingFlickrPinEntryPane*) self); -#line 4964 "FlickrPublishing.c" +#line 4737 "FlickrPublishing.c" } @@ -5005,17 +4778,17 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublish PublishingFlickrPinEntryPane * self; GtkButton* _tmp0_ = NULL; GtkEntry* _tmp1_ = NULL; -#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane); -#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->continue_button; -#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp0_, "clicked", (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self, 0); -#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->pin_entry; -#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0); -#line 4982 "FlickrPublishing.c" +#line 4755 "FlickrPublishing.c" } @@ -5025,21 +4798,21 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPubli guint _tmp1_ = 0U; GtkEntry* _tmp2_ = NULL; guint _tmp3_ = 0U; -#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane); -#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->continue_button; -#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE); -#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self); -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->pin_entry; -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE); -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self); -#line 5006 "FlickrPublishing.c" +#line 4779 "FlickrPublishing.c" } @@ -5050,96 +4823,96 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (n_param_values == 3); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data1 = closure->data; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 5025 "FlickrPublishing.c" +#line 4798 "FlickrPublishing.c" } else { -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data1 = param_values->data[0].v_pointer; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data2 = closure->data; -#line 5031 "FlickrPublishing.c" +#line 4804 "FlickrPublishing.c" } -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 5037 "FlickrPublishing.c" +#line 4810 "FlickrPublishing.c" } static void publishing_flickr_pin_entry_pane_class_init (PublishingFlickrPinEntryPaneClass * klass) { -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_parent_class = g_type_class_peek_parent (klass); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrPinEntryPanePrivate)); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_pin_entry_pane_finalize; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_new ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING); -#line 5050 "FlickrPublishing.c" +#line 4823 "FlickrPublishing.c" } static void publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_widget; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_preferred_geometry; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_installed; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_uninstalled; -#line 5065 "FlickrPublishing.c" +#line 4838 "FlickrPublishing.c" } static void publishing_flickr_pin_entry_pane_instance_init (PublishingFlickrPinEntryPane * self) { -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE (self); -#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = NULL; -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->continue_button = NULL; -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pin_entry = NULL; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pin_entry_caption = NULL; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->explanatory_text = NULL; -#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->builder = NULL; -#line 5084 "FlickrPublishing.c" +#line 4857 "FlickrPublishing.c" } static void publishing_flickr_pin_entry_pane_finalize (GObject* obj) { PublishingFlickrPinEntryPane * self; -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane); -#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->continue_button); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pin_entry); -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pin_entry_caption); -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->explanatory_text); -#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_pin_entry_pane_parent_class)->finalize (obj); -#line 5106 "FlickrPublishing.c" +#line 4879 "FlickrPublishing.c" } @@ -5167,52 +4940,52 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje PublishingFlickrSession* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = method; -#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_); -#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = session; -#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_); -#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_; -#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp4_); -#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp4_); -#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1"); -#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0"); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob"); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = session; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp7_); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY); -#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5172 "FlickrPublishing.c" +#line 4945 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { -#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method); -#line 5179 "FlickrPublishing.c" +#line 4952 "FlickrPublishing.c" } @@ -5227,56 +5000,56 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G PublishingFlickrSession* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (uri != NULL, NULL); -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = uri; -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = method; -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrTransaction*) 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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = session; -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_); -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_); -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp5_); -#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1"); -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0"); -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob"); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = session; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp7_; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp8_); -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY); -#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5236 "FlickrPublishing.c" +#line 5009 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { -#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method); -#line 5243 "FlickrPublishing.c" +#line 5016 "FlickrPublishing.c" } @@ -5285,35 +5058,35 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra PublishingRESTSupportSession* _tmp0_ = NULL; PublishingFlickrSession* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction); -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 5272 "FlickrPublishing.c" +#line 5045 "FlickrPublishing.c" } else { -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 5280 "FlickrPublishing.c" +#line 5053 "FlickrPublishing.c" } } } @@ -5339,152 +5112,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; GError * _inner_error_ = NULL; -#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); -#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = doc; -#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); -#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" root = _tmp1_; -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = root; -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat"); -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" status = _tmp3_; -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = status; -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_ == NULL) { -#line 5324 "FlickrPublishing.c" +#line 5097 "FlickrPublishing.c" gchar* _tmp5_ = NULL; -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp5_; -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5334 "FlickrPublishing.c" +#line 5107 "FlickrPublishing.c" } -#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = status; -#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp6_, "ok") == 0) { -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = NULL; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5346 "FlickrPublishing.c" +#line 5119 "FlickrPublishing.c" } { xmlNode* _tmp7_ = NULL; PublishingRESTSupportXmlDocument* _tmp8_ = NULL; xmlNode* _tmp9_ = NULL; xmlNode* _tmp10_ = NULL; -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = doc; -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = root; -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_); -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp10_; -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5365 "FlickrPublishing.c" +#line 5138 "FlickrPublishing.c" goto __catch23_spit_publishing_publishing_error; } -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5376 "FlickrPublishing.c" +#line 5149 "FlickrPublishing.c" } -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" errcode = _tmp7_; -#line 5380 "FlickrPublishing.c" +#line 5153 "FlickrPublishing.c" } goto __finally23; __catch23_spit_publishing_publishing_error: { GError* err = NULL; gchar* _tmp11_ = NULL; -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = g_strdup ("No error code specified"); -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp11_; -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5401 "FlickrPublishing.c" +#line 5174 "FlickrPublishing.c" } __finally23: -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5414 "FlickrPublishing.c" +#line 5187 "FlickrPublishing.c" } -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = errcode; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg"); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _tmp13_; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = errcode; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code"); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _tmp16_; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _tmp18_; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp17_); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp14_); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp19_; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5442 "FlickrPublishing.c" +#line 5215 "FlickrPublishing.c" } static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) { gchar* result; result = publishing_flickr_transaction_validate_xml (doc); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5451 "FlickrPublishing.c" +#line 5224 "FlickrPublishing.c" } @@ -5492,26 +5265,26 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 5471 "FlickrPublishing.c" +#line 5244 "FlickrPublishing.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_error_copy (self) : NULL; -#line 5478 "FlickrPublishing.c" +#line 5251 "FlickrPublishing.c" } @@ -5519,50 +5292,50 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res PublishingRESTSupportXmlDocument* result = NULL; PublishingRESTSupportXmlDocument* _result_ = NULL; GError * _inner_error_ = NULL; -#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (xml != NULL, NULL); -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = NULL; -#line 5490 "FlickrPublishing.c" +#line 5263 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; PublishingRESTSupportXmlDocument* _tmp2_ = NULL; PublishingRESTSupportXmlDocument* _tmp3_ = NULL; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_rest_support_xml_document_parse_string (_tmp1_, _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _tmp2_; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5506 "FlickrPublishing.c" +#line 5279 "FlickrPublishing.c" goto __catch24_spit_publishing_publishing_error; } -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5517 "FlickrPublishing.c" +#line 5290 "FlickrPublishing.c" } -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp0_; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = NULL; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp3_; -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 5529 "FlickrPublishing.c" +#line 5302 "FlickrPublishing.c" } goto __finally24; __catch24_spit_publishing_publishing_error: @@ -5574,98 +5347,98 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res gchar* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = e; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_->message; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE); -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = string_contains (_tmp5_, _tmp7_); -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9_) { -#line 5561 "FlickrPublishing.c" +#line 5334 "FlickrPublishing.c" GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; GError* _tmp12_ = NULL; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = e; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_->message; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, _tmp11_); -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp12_; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5575 "FlickrPublishing.c" +#line 5348 "FlickrPublishing.c" goto __finally24; } else { GError* _tmp13_ = NULL; GError* _tmp14_ = NULL; -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = e; -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _g_error_copy0 (_tmp13_); -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp14_; -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5588 "FlickrPublishing.c" +#line 5361 "FlickrPublishing.c" goto __finally24; } -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5593 "FlickrPublishing.c" +#line 5366 "FlickrPublishing.c" } __finally24: -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5606 "FlickrPublishing.c" +#line 5379 "FlickrPublishing.c" } else { -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5616 "FlickrPublishing.c" +#line 5389 "FlickrPublishing.c" } } -#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; -#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5623 "FlickrPublishing.c" +#line 5396 "FlickrPublishing.c" } static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) { -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass); -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute; -#line 5632 "FlickrPublishing.c" +#line 5405 "FlickrPublishing.c" } @@ -5688,29 +5461,29 @@ GType publishing_flickr_transaction_get_type (void) { PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session) { PublishingFlickrAuthenticationRequestTransaction* self = NULL; PublishingFlickrSession* _tmp0_ = NULL; -#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrAuthenticationRequestTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); -#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5663 "FlickrPublishing.c" +#line 5436 "FlickrPublishing.c" } PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session) { -#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_authentication_request_transaction_construct (PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session); -#line 5670 "FlickrPublishing.c" +#line 5443 "FlickrPublishing.c" } static void publishing_flickr_authentication_request_transaction_class_init (PublishingFlickrAuthenticationRequestTransactionClass * klass) { -#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5677 "FlickrPublishing.c" +#line 5450 "FlickrPublishing.c" } @@ -5737,45 +5510,45 @@ PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetc PublishingFlickrSession* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (user_verifier != NULL, NULL); -#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrAccessTokenFetchTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = user_verifier; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = session; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_session_get_request_phase_token (_tmp2_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp4_); -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5728 "FlickrPublishing.c" +#line 5501 "FlickrPublishing.c" } PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier) { -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_access_token_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier); -#line 5735 "FlickrPublishing.c" +#line 5508 "FlickrPublishing.c" } static void publishing_flickr_access_token_fetch_transaction_class_init (PublishingFlickrAccessTokenFetchTransactionClass * klass) { -#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5742 "FlickrPublishing.c" +#line 5515 "FlickrPublishing.c" } @@ -5801,41 +5574,41 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc PublishingFlickrSession* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_flickr_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); -#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "flickr.people.getUploadStatus"); -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = session; -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_); -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_; -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp3_); -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp3_); -#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5788 "FlickrPublishing.c" +#line 5561 "FlickrPublishing.c" } PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) { -#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session); -#line 5795 "FlickrPublishing.c" +#line 5568 "FlickrPublishing.c" } static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) { -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5802 "FlickrPublishing.c" +#line 5575 "FlickrPublishing.c" } @@ -5856,23 +5629,23 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) { static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) { -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_parameters_ref (self) : NULL; -#line 5825 "FlickrPublishing.c" +#line 5598 "FlickrPublishing.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5832 "FlickrPublishing.c" +#line 5605 "FlickrPublishing.c" } static void _g_free0_ (gpointer var) { -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" var = (g_free (var), NULL); -#line 5839 "FlickrPublishing.c" +#line 5612 "FlickrPublishing.c" } @@ -5928,227 +5701,227 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc gchar* _tmp48_ = NULL; gchar* _tmp49_ = NULL; GHashTable* _tmp50_ = NULL; -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishable; -#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, "https://api.flickr.com/services/upload"); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = parameters; -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp3_; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = session; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_); -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->session = _tmp5_; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->auth_header_fields = _tmp6_; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->auth_header_fields_length1 = 0; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1; -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = session; -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_); -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_; -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_); -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp9_); -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1"); -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0"); -#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob"); -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = session; -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_); -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _tmp11_; -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_); -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp12_); -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY); -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = session; -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishing_flickr_session_get_access_phase_token (_tmp13_); -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _tmp14_; -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp15_); -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp15_); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = parameters; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _tmp16_->visibility_specification; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = _tmp17_->everyone_level; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = g_strdup_printf ("%d", _tmp18_); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = _tmp19_; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp20_); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp20_); -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = parameters; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = _tmp21_->visibility_specification; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = _tmp22_->friends_level; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = g_strdup_printf ("%d", _tmp23_); -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = _tmp24_; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp25_); -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp25_); -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = parameters; -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = _tmp26_->visibility_specification; -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = _tmp27_->family_level; -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = g_strdup_printf ("%d", _tmp28_); -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = _tmp29_; -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp30_); -#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp30_); -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = g_str_hash; -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = g_str_equal; -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp33_ = g_hash_table_new_full (_tmp31_, _tmp32_, _g_free0_, _g_free0_); -#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" disposition_table = _tmp33_; -#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = publishable; -#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = spit_publishing_publishable_get_publishing_name (_tmp34_); -#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" filename = _tmp35_; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = filename; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp37_ == NULL) { -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = TRUE; -#line 6033 "FlickrPublishing.c" +#line 5806 "FlickrPublishing.c" } else { const gchar* _tmp38_ = NULL; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = filename; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = g_strcmp0 (_tmp38_, "") == 0; -#line 6040 "FlickrPublishing.c" +#line 5813 "FlickrPublishing.c" } -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp36_) { -#line 6044 "FlickrPublishing.c" +#line 5817 "FlickrPublishing.c" SpitPublishingPublishable* _tmp39_ = NULL; gchar* _tmp40_ = NULL; -#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = publishable; -#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (filename); -#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" filename = _tmp40_; -#line 6055 "FlickrPublishing.c" +#line 5828 "FlickrPublishing.c" } -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = disposition_table; -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = g_strdup ("filename"); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = publishable; -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = _tmp44_; -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = soup_uri_encode (_tmp45_, NULL); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_insert (_tmp41_, _tmp42_, _tmp46_); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp45_); -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = disposition_table; -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strdup ("name"); -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = g_strdup ("photo"); -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_insert (_tmp47_, _tmp48_, _tmp49_); -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp50_ = disposition_table; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp50_); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (filename); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_hash_table_unref0 (disposition_table); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6091 "FlickrPublishing.c" +#line 5864 "FlickrPublishing.c" } PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 6098 "FlickrPublishing.c" +#line 5871 "FlickrPublishing.c" } static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 6109 "FlickrPublishing.c" +#line 5882 "FlickrPublishing.c" } -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6115 "FlickrPublishing.c" +#line 5888 "FlickrPublishing.c" } @@ -6158,53 +5931,53 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; PublishingRESTSupportArgument* _tmp3_ = NULL; -#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self)); -#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (key != NULL); -#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (value != NULL); -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->auth_header_fields; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = key; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = value; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add18 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 6143 "FlickrPublishing.c" +#line 5916 "FlickrPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 6150 "FlickrPublishing.c" +#line 5923 "FlickrPublishing.c" } -static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) { +static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) { PublishingRESTSupportArgument** result; int i; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = g_new0 (PublishingRESTSupportArgument*, length + 1); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 6161 "FlickrPublishing.c" +#line 5934 "FlickrPublishing.c" PublishingRESTSupportArgument* _tmp0_ = NULL; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 6167 "FlickrPublishing.c" +#line 5940 "FlickrPublishing.c" } -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6171 "FlickrPublishing.c" +#line 5944 "FlickrPublishing.c" } @@ -6216,31 +5989,31 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori gint _tmp1__length1 = 0; PublishingRESTSupportArgument** _tmp2_ = NULL; gint _tmp2__length1 = 0; -#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->auth_header_fields; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _tmp0__length1; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2__length1 = _tmp1__length1; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp2__length1; -#line 6201 "FlickrPublishing.c" +#line 5974 "FlickrPublishing.c" } -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6207 "FlickrPublishing.c" +#line 5980 "FlickrPublishing.c" } @@ -6248,25 +6021,25 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_ = NULL; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); -#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_strdup ("OAuth "); -#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 6221 "FlickrPublishing.c" +#line 5994 "FlickrPublishing.c" { gint i = 0; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 6226 "FlickrPublishing.c" +#line 5999 "FlickrPublishing.c" { gboolean _tmp1_ = FALSE; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = TRUE; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 6233 "FlickrPublishing.c" +#line 6006 "FlickrPublishing.c" gint _tmp3_ = 0; PublishingRESTSupportArgument** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6293,115 +6066,115 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub gint _tmp23_ = 0; PublishingRESTSupportArgument** _tmp24_ = NULL; gint _tmp24__length1 = 0; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp1_) { -#line 6262 "FlickrPublishing.c" +#line 6035 "FlickrPublishing.c" gint _tmp2_ = 0; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = i; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp2_ + 1; -#line 6268 "FlickrPublishing.c" +#line 6041 "FlickrPublishing.c" } -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = i; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->auth_header_fields; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4__length1 = self->priv->auth_header_fields_length1; -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!(_tmp3_ < _tmp4__length1)) { -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 6282 "FlickrPublishing.c" +#line 6055 "FlickrPublishing.c" } -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = self->priv->auth_header_fields; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6__length1 = self->priv->auth_header_fields_length1; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = i; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp6_[_tmp7_]; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_->key; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL); -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_result_); -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp10_; -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _result_; -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = g_strconcat (_tmp11_, "=", NULL); -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_result_); -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp12_; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _result_; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->auth_header_fields; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14__length1 = self->priv->auth_header_fields_length1; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = i; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _tmp14_[_tmp15_]; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _tmp16_->value; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = g_strconcat ("\"", _tmp17_, NULL); -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _tmp18_; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = g_strconcat (_tmp19_, "\"", NULL); -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _tmp20_; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL); -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_result_); -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp22_; -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp19_); -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = i; -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = self->priv->auth_header_fields; -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24__length1 = self->priv->auth_header_fields_length1; -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 6348 "FlickrPublishing.c" +#line 6121 "FlickrPublishing.c" const gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = _result_; -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = g_strconcat (_tmp25_, ", ", NULL); -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_result_); -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp26_; -#line 6359 "FlickrPublishing.c" +#line 6132 "FlickrPublishing.c" } } } } -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6368 "FlickrPublishing.c" +#line 6141 "FlickrPublishing.c" } @@ -6411,85 +6184,85 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup gchar* authorization_header = NULL; gchar* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); -#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->session; -#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_session_sign_transaction (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self); -#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" authorization_header = _tmp1_; -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:937: executing upload transaction: authorization" \ +#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:914: executing upload transaction: authorization" \ " header string = '%s'", authorization_header); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", authorization_header); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 6404 "FlickrPublishing.c" +#line 6177 "FlickrPublishing.c" } else { -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 6414 "FlickrPublishing.c" +#line 6187 "FlickrPublishing.c" } } -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 6419 "FlickrPublishing.c" +#line 6192 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) { -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass); -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate)); -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute; -#line 6432 "FlickrPublishing.c" +#line 6205 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) { -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 6439 "FlickrPublishing.c" +#line 6212 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { PublishingFlickrUploadTransaction * self; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); -#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj); -#line 6455 "FlickrPublishing.c" +#line 6228 "FlickrPublishing.c" } @@ -6507,18 +6280,18 @@ GType publishing_flickr_upload_transaction_get_type (void) { PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) { PublishingFlickrSession* self = NULL; -#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL); -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6477 "FlickrPublishing.c" +#line 6250 "FlickrPublishing.c" } PublishingFlickrSession* publishing_flickr_session_new (void) { -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION); -#line 6484 "FlickrPublishing.c" +#line 6257 "FlickrPublishing.c" } @@ -6528,43 +6301,43 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; const gchar* _tmp2_ = NULL; -#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->access_phase_token; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp2_ != NULL) { -#line 6500 "FlickrPublishing.c" +#line 6273 "FlickrPublishing.c" const gchar* _tmp3_ = NULL; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->access_phase_token_secret; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 6506 "FlickrPublishing.c" +#line 6279 "FlickrPublishing.c" } else { -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 6510 "FlickrPublishing.c" +#line 6283 "FlickrPublishing.c" } -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 6514 "FlickrPublishing.c" +#line 6287 "FlickrPublishing.c" const gchar* _tmp4_ = NULL; -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->username; -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 6520 "FlickrPublishing.c" +#line 6293 "FlickrPublishing.c" } else { -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = FALSE; -#line 6524 "FlickrPublishing.c" +#line 6297 "FlickrPublishing.c" } -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6530 "FlickrPublishing.c" +#line 6303 "FlickrPublishing.c" } @@ -6575,84 +6348,84 @@ void publishing_flickr_session_authenticate_from_persistent_credentials (Publish gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (token != NULL); -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (secret != NULL); -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (username != NULL); -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = token; -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token = _tmp1_; -#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = secret; -#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token_secret = _tmp3_; -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = username; -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup (_tmp4_); -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->username); -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = _tmp5_; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 6575 "FlickrPublishing.c" +#line 6348 "FlickrPublishing.c" } void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self) { -#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token = NULL; -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->username); -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = NULL; -#line 6594 "FlickrPublishing.c" +#line 6367 "FlickrPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 6601 "FlickrPublishing.c" +#line 6374 "FlickrPublishing.c" } static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 6612 "FlickrPublishing.c" +#line 6385 "FlickrPublishing.c" } -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6618 "FlickrPublishing.c" +#line 6391 "FlickrPublishing.c" } @@ -6713,51 +6486,51 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, gchar* _tmp76_ = NULL; const gchar* _tmp77_ = NULL; PublishingFlickrUploadTransaction* _tmp78_ = NULL; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = txn; -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_); -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_); -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" http_method = _tmp2_; -#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:979: signing transaction with parameters:"); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:956: signing transaction with parameters:"); +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = http_method; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:980: %s", _tmp5_); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:957: %s", _tmp5_); +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp5_); -#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = txn; -#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_); -#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" base_string_arguments = _tmp8_; -#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" base_string_arguments_length1 = _tmp7_; -#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _base_string_arguments_size_ = base_string_arguments_length1; -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = txn; -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION) ? ((PublishingFlickrUploadTransaction*) _tmp9_) : NULL); -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_txn = _tmp10_; -#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = upload_txn; -#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp11_ != NULL) { -#line 6723 "FlickrPublishing.c" +#line 6496 "FlickrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; PublishingFlickrUploadTransaction* _tmp12_ = NULL; gint _tmp13_ = 0; @@ -6766,97 +6539,97 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, gint _auth_header_args_size_ = 0; PublishingRESTSupportArgument** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:986: %s", "this transaction is an UploadTransaction; including Authorization head" \ +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:963: %s", "this transaction is an UploadTransaction; including Authorization head" \ "er " "fields in signature base string"); -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = upload_txn; -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_); -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_header_args = _tmp14_; -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_header_args_length1 = _tmp13_; -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _auth_header_args_size_ = auth_header_args_length1; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = auth_header_args; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15__length1 = auth_header_args_length1; -#line 6748 "FlickrPublishing.c" +#line 6521 "FlickrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; gint _arg_collection_size_ = 0; gint arg_it = 0; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arg_collection = _tmp15_; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arg_collection_length1 = _tmp15__length1; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) { -#line 6760 "FlickrPublishing.c" +#line 6533 "FlickrPublishing.c" PublishingRESTSupportArgument* _tmp16_ = NULL; PublishingRESTSupportArgument* arg = NULL; -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arg = _tmp16_; -#line 6767 "FlickrPublishing.c" +#line 6540 "FlickrPublishing.c" { PublishingRESTSupportArgument** _tmp17_ = NULL; gint _tmp17__length1 = 0; PublishingRESTSupportArgument* _tmp18_ = NULL; PublishingRESTSupportArgument* _tmp19_ = NULL; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = base_string_arguments; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17__length1 = base_string_arguments_length1; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = arg; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_); -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add19 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_); -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_argument_unref0 (arg); -#line 6785 "FlickrPublishing.c" +#line 6558 "FlickrPublishing.c" } } } -#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 6791 "FlickrPublishing.c" +#line 6564 "FlickrPublishing.c" } -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = base_string_arguments; -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20__length1 = base_string_arguments_length1; -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_); -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_args = _tmp22_; -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_args_length1 = _tmp21_; -#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _sorted_args_size_ = sorted_args_length1; -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = g_strdup (""); -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp23_; -#line 6809 "FlickrPublishing.c" +#line 6582 "FlickrPublishing.c" { gint i = 0; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 6814 "FlickrPublishing.c" +#line 6587 "FlickrPublishing.c" { gboolean _tmp24_ = FALSE; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = TRUE; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 6821 "FlickrPublishing.c" +#line 6594 "FlickrPublishing.c" gint _tmp26_ = 0; PublishingRESTSupportArgument** _tmp27_ = NULL; gint _tmp27__length1 = 0; @@ -6879,268 +6652,268 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, gint _tmp42_ = 0; PublishingRESTSupportArgument** _tmp43_ = NULL; gint _tmp43__length1 = 0; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp24_) { -#line 6846 "FlickrPublishing.c" +#line 6619 "FlickrPublishing.c" gint _tmp25_ = 0; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = i; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp25_ + 1; -#line 6852 "FlickrPublishing.c" +#line 6625 "FlickrPublishing.c" } -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = FALSE; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = i; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = sorted_args; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27__length1 = sorted_args_length1; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!(_tmp26_ < _tmp27__length1)) { -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 6866 "FlickrPublishing.c" +#line 6639 "FlickrPublishing.c" } -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = arguments_string; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = sorted_args; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29__length1 = sorted_args_length1; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = i; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = _tmp29_[_tmp30_]; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = _tmp31_->key; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp33_ = g_strconcat (_tmp32_, "=", NULL); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = _tmp33_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = sorted_args; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35__length1 = sorted_args_length1; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = i; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = _tmp35_[_tmp36_]; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = _tmp37_->value; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = _tmp39_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (arguments_string); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp41_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp40_); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp34_); -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = i; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = sorted_args; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43__length1 = sorted_args_length1; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp42_ < (_tmp43__length1 - 1)) { -#line 6916 "FlickrPublishing.c" +#line 6689 "FlickrPublishing.c" const gchar* _tmp44_ = NULL; gchar* _tmp45_ = NULL; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = arguments_string; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = g_strconcat (_tmp44_, "&", NULL); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (arguments_string); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp45_; -#line 6927 "FlickrPublishing.c" +#line 6700 "FlickrPublishing.c" } } } } -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = NULL; -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = self->priv->access_phase_token_secret; -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 6938 "FlickrPublishing.c" +#line 6711 "FlickrPublishing.c" const gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; -#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1008: access phase token secret available; using" \ -" it as signing key"); -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:985: access phase token secret available; using " \ +"it as signing key"); +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = self->priv->access_phase_token_secret; -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp47_, NULL); -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signing_key); -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp48_; -#line 6951 "FlickrPublishing.c" +#line 6724 "FlickrPublishing.c" } else { const gchar* _tmp49_ = NULL; -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = self->priv->request_phase_token_secret; -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp49_ != NULL) { -#line 6958 "FlickrPublishing.c" +#line 6731 "FlickrPublishing.c" const gchar* _tmp50_ = NULL; gchar* _tmp51_ = NULL; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1012: request phase token secret available; usin" \ -"g it as signing key"); -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:989: request phase token secret available; using" \ +" it as signing key"); +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp50_ = self->priv->request_phase_token_secret; -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp51_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp50_, NULL); -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signing_key); -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp51_; -#line 6971 "FlickrPublishing.c" +#line 6744 "FlickrPublishing.c" } else { gchar* _tmp52_ = NULL; -#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1016: %s", "neither access phase nor request phase token secrets available; using " \ +#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:993: %s", "neither access phase nor request phase token secrets available; using " \ "API " "key as signing key"); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp52_ = g_strdup (PUBLISHING_FLICKR_API_SECRET "&"); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signing_key); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp52_; -#line 6982 "FlickrPublishing.c" +#line 6755 "FlickrPublishing.c" } } -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp53_ = http_method; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = g_strconcat (_tmp53_, "&", NULL); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp55_ = _tmp54_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_ = txn; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp57_ = publishing_rest_support_transaction_get_endpoint_url (_tmp56_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp58_ = _tmp57_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59_ = soup_uri_encode (_tmp58_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp60_ = _tmp59_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = g_strconcat (_tmp55_, _tmp60_, NULL); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = _tmp61_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp63_ = g_strconcat (_tmp62_, "&", NULL); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp64_ = _tmp63_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp65_ = arguments_string; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp66_ = soup_uri_encode (_tmp65_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp67_ = _tmp66_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = g_strconcat (_tmp64_, _tmp67_, NULL); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp69_ = _tmp68_; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp67_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp64_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp62_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp60_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp58_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp55_); -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signature_base_string = _tmp69_; -#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp70_ = signature_base_string; -#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1026: signature base string = '%s'", _tmp70_); -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:1003: signature base string = '%s'", _tmp70_); +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp71_ = signing_key; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1028: signing key = '%s'", _tmp71_); -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:1005: signing key = '%s'", _tmp71_); +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp72_ = signing_key; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp73_ = signature_base_string; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp74_ = publishing_rest_support_hmac_sha1 (_tmp72_, _tmp73_); -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signature = _tmp74_; -#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp75_ = signature; -#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp76_ = soup_uri_encode (_tmp75_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature); -#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signature = _tmp76_; -#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp77_ = signature; -#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:1034: signature = '%s'", _tmp77_); -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:1011: signature = '%s'", _tmp77_); +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp78_ = upload_txn; -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp78_ != NULL) { -#line 7065 "FlickrPublishing.c" +#line 6838 "FlickrPublishing.c" PublishingFlickrUploadTransaction* _tmp79_ = NULL; const gchar* _tmp80_ = NULL; -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp79_ = upload_txn; -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp80_ = signature; -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (_tmp79_, "oauth_signature", _tmp80_); -#line 7074 "FlickrPublishing.c" +#line 6847 "FlickrPublishing.c" } else { PublishingRESTSupportTransaction* _tmp81_ = NULL; const gchar* _tmp82_ = NULL; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp81_ = txn; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp82_ = signature; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (_tmp81_, "oauth_signature", _tmp82_); -#line 7084 "FlickrPublishing.c" +#line 6857 "FlickrPublishing.c" } -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature_base_string); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signing_key); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (arguments_string); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (upload_txn); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (http_method); -#line 7102 "FlickrPublishing.c" +#line 6875 "FlickrPublishing.c" } @@ -7149,29 +6922,29 @@ void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSe gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (token != NULL); -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (secret != NULL); -#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = token; -#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->request_phase_token); -#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->request_phase_token = _tmp1_; -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = secret; -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->request_phase_token_secret); -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->request_phase_token_secret = _tmp3_; -#line 7133 "FlickrPublishing.c" +#line 6906 "FlickrPublishing.c" } @@ -7182,41 +6955,41 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (token != NULL); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (secret != NULL); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (username != NULL); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = token; -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token = _tmp1_; -#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = secret; -#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token_secret = _tmp3_; -#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = username; -#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup (_tmp4_); -#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->username); -#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = _tmp5_; -#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7178 "FlickrPublishing.c" +#line 6951 "FlickrPublishing.c" } @@ -7235,47 +7008,47 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_get_current_time (&currtime); -#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_get_current_time (&currtime); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = currtime; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp0_.tv_sec; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = g_strdup_printf ("%li", _tmp1_); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = currtime; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_.tv_usec; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_strdup_printf ("%li", _tmp5_); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp9_); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp3_); -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp11_; -#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7237 "FlickrPublishing.c" +#line 7010 "FlickrPublishing.c" } @@ -7286,39 +7059,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 7260 "FlickrPublishing.c" +#line 7033 "FlickrPublishing.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 7268 "FlickrPublishing.c" +#line 7041 "FlickrPublishing.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 7280 "FlickrPublishing.c" +#line 7053 "FlickrPublishing.c" } } @@ -7336,114 +7109,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 7304 "FlickrPublishing.c" +#line 7077 "FlickrPublishing.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 7310 "FlickrPublishing.c" +#line 7083 "FlickrPublishing.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 7314 "FlickrPublishing.c" +#line 7087 "FlickrPublishing.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 7318 "FlickrPublishing.c" +#line 7091 "FlickrPublishing.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 7330 "FlickrPublishing.c" +#line 7103 "FlickrPublishing.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 7340 "FlickrPublishing.c" +#line 7113 "FlickrPublishing.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 7346 "FlickrPublishing.c" +#line 7119 "FlickrPublishing.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 7360 "FlickrPublishing.c" +#line 7133 "FlickrPublishing.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 7370 "FlickrPublishing.c" +#line 7143 "FlickrPublishing.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 7376 "FlickrPublishing.c" +#line 7149 "FlickrPublishing.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 7385 "FlickrPublishing.c" +#line 7158 "FlickrPublishing.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 7405 "FlickrPublishing.c" +#line 7178 "FlickrPublishing.c" } @@ -7454,25 +7227,25 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_get_real_time (); -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_); -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_; -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10); -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_; -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp2_); -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp4_; -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7434 "FlickrPublishing.c" +#line 7207 "FlickrPublishing.c" } @@ -7481,21 +7254,21 @@ gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSessio const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->request_phase_token; -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp0_ != NULL, "request_phase_token != null"); -#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->request_phase_token; -#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; -#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7457 "FlickrPublishing.c" +#line 7230 "FlickrPublishing.c" } @@ -7504,21 +7277,21 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->access_phase_token; -#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp0_ != NULL, "access_phase_token != null"); -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->access_phase_token; -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7480 "FlickrPublishing.c" +#line 7253 "FlickrPublishing.c" } @@ -7527,21 +7300,21 @@ gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickr const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->access_phase_token_secret; -#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null"); -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->access_phase_token_secret; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7503 "FlickrPublishing.c" +#line 7276 "FlickrPublishing.c" } @@ -7550,71 +7323,71 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { gboolean _tmp0_ = FALSE; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp0_, "is_authenticated()"); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->username; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7526 "FlickrPublishing.c" +#line 7299 "FlickrPublishing.c" } static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) { -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_session_parent_class = g_type_class_peek_parent (klass); -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize; -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate)); -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated; -#line 7539 "FlickrPublishing.c" +#line 7312 "FlickrPublishing.c" } static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) { -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self); -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->request_phase_token = NULL; -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->request_phase_token_secret = NULL; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token = NULL; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = NULL; -#line 7556 "FlickrPublishing.c" +#line 7329 "FlickrPublishing.c" } static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) { PublishingFlickrSession * self; -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->request_phase_token); -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->request_phase_token_secret); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->priv->username); -#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj); -#line 7576 "FlickrPublishing.c" +#line 7349 "FlickrPublishing.c" } @@ -7631,30 +7404,30 @@ GType publishing_flickr_session_get_type (void) { static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 7595 "FlickrPublishing.c" +#line 7368 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 7602 "FlickrPublishing.c" +#line 7375 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 7609 "FlickrPublishing.c" +#line 7382 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 7616 "FlickrPublishing.c" +#line 7389 "FlickrPublishing.c" } @@ -7724,369 +7497,369 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane gboolean _tmp79_ = FALSE; GtkButton* _tmp80_ = NULL; GtkButton* _tmp81_ = NULL; -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL); -#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = builder; -#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->builder = _tmp1_; -#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; -#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp2_ != NULL, "builder != null"); -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = builder; -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = gtk_builder_get_objects (_tmp3_); -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_slist_length (_tmp5_); -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0"); -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_slist_free0 (_tmp5_); -#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->builder; -#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane"); -#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox)); -#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = _tmp9_; -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->builder; -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label"); -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_label_get_type (), GtkLabel)); -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_label); -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_label = _tmp12_; -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = self->priv->builder; -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label"); -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel)); -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->upload_info_label); -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->upload_info_label = _tmp15_; -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = self->priv->builder; -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button"); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton)); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->logout_button = _tmp18_; -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = self->priv->builder; -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button"); -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton)); -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publish_button = _tmp21_; -#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = self->priv->builder; -#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo"); -#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText)); -#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_combo); -#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_combo = _tmp24_; -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = self->priv->builder; -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo"); -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText)); -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_combo); -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_combo = _tmp27_; -#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = self->priv->builder; -#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = gtk_builder_get_object (_tmp28_, "size_label"); -#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel)); -#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_label); -#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_label = _tmp30_; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = self->priv->builder; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check"); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton)); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->strip_metadata_check); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata_check = _tmp33_; -#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = parameters; -#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = _publishing_flickr_publishing_parameters_ref0 (_tmp34_); -#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp35_; -#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = publisher; -#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = _g_object_ref0 (_tmp36_); -#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = _tmp37_; -#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = media_type; -#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->media_type = _tmp38_; -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_); -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL); -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = _tmp40_; -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = _tmp39_; -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_); -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL); -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = _tmp42_; -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = _tmp41_; -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = _ ("You are logged into Flickr as %s.\n\n"); -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = parameters; -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = _tmp44_->username; -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = g_strdup_printf (_tmp43_, _tmp45_); -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp46_; -#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = parameters; -#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = _tmp47_->user_kind; -#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp48_ == PUBLISHING_FLICKR_USER_KIND_FREE) { -#line 7864 "FlickrPublishing.c" +#line 7637 "FlickrPublishing.c" const gchar* _tmp49_ = NULL; - PublishingFlickrPublishingParameters* _tmp50_ = NULL; - gint _tmp51_ = 0; - const gchar* _tmp52_ = NULL; - PublishingFlickrPublishingParameters* _tmp53_ = NULL; - gint _tmp54_ = 0; + const gchar* _tmp50_ = NULL; + PublishingFlickrPublishingParameters* _tmp51_ = NULL; + gint64 _tmp52_ = 0LL; + gchar* _tmp53_ = NULL; + gchar* _tmp54_ = NULL; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; gchar* _tmp57_ = NULL; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = upload_label_text; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp50_ = parameters; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp51_ = _tmp50_->quota_free_mb; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp52_ = ngettext ("Your free Flickr account limits how much data you can upload per month" \ -".\n" \ -"This month you have %d megabyte remaining in your upload quota.", "Your free Flickr account limits how much data you can upload per month" \ +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp50_ = _ ("Your free Flickr account limits how much data you can upload per month" \ ".\n" \ -"This month you have %d megabytes remaining in your upload quota.", (gulong) _tmp51_); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp53_ = parameters; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp54_ = _tmp53_->quota_free_mb; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp55_ = g_strdup_printf (_tmp52_, _tmp54_); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +"This month you have %s remaining in your upload quota."); +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp51_ = parameters; +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp52_ = _tmp51_->quota_free_bytes; +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp53_ = g_format_size_full ((guint64) _tmp52_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS); +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp54_ = _tmp53_; +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp55_ = g_strdup_printf (_tmp50_, _tmp54_); +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_ = _tmp55_; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp57_ = g_strconcat (_tmp49_, _tmp56_, NULL); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp57_; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp56_); -#line 7898 "FlickrPublishing.c" +#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp54_); +#line 7673 "FlickrPublishing.c" } else { const gchar* _tmp58_ = NULL; const gchar* _tmp59_ = NULL; gchar* _tmp60_ = NULL; -#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp58_ = upload_label_text; -#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59_ = _ ("Your Flickr Pro account entitles you to unlimited uploads."); -#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp60_ = g_strconcat (_tmp58_, _tmp59_, NULL); -#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp60_; -#line 7913 "FlickrPublishing.c" +#line 7688 "FlickrPublishing.c" } -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = self->priv->upload_info_label; -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = upload_label_text; -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_label_set_label (_tmp61_, _tmp62_); -#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp63_ = _ ("Photos _visible to:"); -#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp64_ = g_strdup (_tmp63_); -#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp64_; -#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp65_ = media_type; -#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp65_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 7931 "FlickrPublishing.c" +#line 7706 "FlickrPublishing.c" const gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; -#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp66_ = _ ("Videos _visible to:"); -#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp67_ = g_strdup (_tmp66_); -#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp67_; -#line 7942 "FlickrPublishing.c" +#line 7717 "FlickrPublishing.c" } else { SpitPublishingPublisherMediaType _tmp68_ = 0; -#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = media_type; -#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp68_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 7949 "FlickrPublishing.c" +#line 7724 "FlickrPublishing.c" const gchar* _tmp69_ = NULL; gchar* _tmp70_ = NULL; -#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp69_ = _ ("Photos and videos _visible to:"); -#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp70_ = g_strdup (_tmp69_); -#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp70_; -#line 7960 "FlickrPublishing.c" +#line 7735 "FlickrPublishing.c" } } -#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp71_ = self->priv->visibility_label; -#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp72_ = visibility_label_text; -#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_label_set_label (_tmp71_, _tmp72_); -#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_visibility_combo (self); -#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp73_ = self->priv->visibility_combo; -#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0); -#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp74_ = media_type; -#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp74_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 7979 "FlickrPublishing.c" +#line 7754 "FlickrPublishing.c" GtkComboBoxText* _tmp75_ = NULL; -#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_size_combo (self); -#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp75_ = self->priv->size_combo; -#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 7987 "FlickrPublishing.c" +#line 7762 "FlickrPublishing.c" } else { GtkComboBoxText* _tmp76_ = NULL; GtkLabel* _tmp77_ = NULL; -#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp76_ = self->priv->size_combo; -#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp77_ = self->priv->size_label; -#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 7999 "FlickrPublishing.c" +#line 7774 "FlickrPublishing.c" } -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp78_ = self->priv->strip_metadata_check; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp79_ = strip_metadata; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp79_); -#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp80_ = self->priv->logout_button; -#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp80_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp81_ = self->priv->publish_button; -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp81_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 8021 "FlickrPublishing.c" +#line 7796 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { -#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata); -#line 8028 "FlickrPublishing.c" +#line 7803 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) { -#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 8037 "FlickrPublishing.c" +#line 7812 "FlickrPublishing.c" } static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) { -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_visibility_specification_ref (self) : NULL; -#line 8044 "FlickrPublishing.c" +#line 7819 "FlickrPublishing.c" } @@ -8102,33 +7875,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis SpitPublishingPublisherMediaType _tmp7_ = 0; GtkCheckButton* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->parameters; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->visibilities; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = self->priv->visibilities_length1; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->visibility_combo; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp1_[_tmp3_]; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_->specification; -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_); -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification); -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_->visibility_specification = _tmp6_; -#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->media_type; -#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 8086 "FlickrPublishing.c" +#line 7861 "FlickrPublishing.c" PublishingFlickrPublishingParameters* _tmp8_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL; gint _tmp9__length1 = 0; @@ -8136,116 +7909,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis gint _tmp11_ = 0; PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL; gint _tmp13_ = 0; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->parameters; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->sizes; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9__length1 = self->priv->sizes_length1; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->size_combo; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _tmp9_[_tmp11_]; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _tmp12_->size; -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_->photo_major_axis_size = _tmp13_; -#line 8110 "FlickrPublishing.c" +#line 7885 "FlickrPublishing.c" } -#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->strip_metadata_check; -#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "publish", _tmp15_); -#line 8118 "FlickrPublishing.c" +#line 7893 "FlickrPublishing.c" } static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8129 "FlickrPublishing.c" +#line 7904 "FlickrPublishing.c" } -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8135 "FlickrPublishing.c" +#line 7910 "FlickrPublishing.c" } static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8146 "FlickrPublishing.c" +#line 7921 "FlickrPublishing.c" } -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8152 "FlickrPublishing.c" +#line 7927 "FlickrPublishing.c" } static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8163 "FlickrPublishing.c" +#line 7938 "FlickrPublishing.c" } -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8169 "FlickrPublishing.c" +#line 7944 "FlickrPublishing.c" } static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8180 "FlickrPublishing.c" +#line 7955 "FlickrPublishing.c" } -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8186 "FlickrPublishing.c" +#line 7961 "FlickrPublishing.c" } static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8197 "FlickrPublishing.c" +#line 7972 "FlickrPublishing.c" } -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8203 "FlickrPublishing.c" +#line 7978 "FlickrPublishing.c" } @@ -8287,118 +8060,118 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_ PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL; gint _tmp26__length1 = 0; -#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); -#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1); -#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result__length1 = 0; -#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" __result__size_ = _result__length1; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _result_; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _ ("Everyone"); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp5_); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp4_); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _result_; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6__length1 = _result__length1; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _ ("Friends & family only"); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp10_); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp9_); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _result_; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11__length1 = _result__length1; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _ ("Family only"); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _tmp13_; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp15_); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp14_); -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _result_; -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16__length1 = _result__length1; -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _ ("Friends only"); -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0); -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _tmp18_; -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_); -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp20_); -#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp19_); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _result_; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21__length1 = _result__length1; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = _ ("Just me"); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = _tmp23_; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp25_); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp24_); -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = _result_; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26__length1 = _result__length1; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp26__length1; -#line 8343 "FlickrPublishing.c" +#line 8118 "FlickrPublishing.c" } -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp26_; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8349 "FlickrPublishing.c" +#line 8124 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL; -#line 8356 "FlickrPublishing.c" +#line 8131 "FlickrPublishing.c" } @@ -8410,165 +8183,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo GtkComboBoxText* _tmp8_ = NULL; PublishingFlickrFlickrPublisher* _tmp9_ = NULL; gint _tmp10_ = 0; -#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->visibilities; -#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->visibilities_length1; -#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 8376 "FlickrPublishing.c" +#line 8151 "FlickrPublishing.c" gint _tmp1_ = 0; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL; -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_); -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL); -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = _tmp2_; -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = _tmp1_; -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 8389 "FlickrPublishing.c" +#line 8164 "FlickrPublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->visibilities; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->visibilities_length1; -#line 8395 "FlickrPublishing.c" +#line 8170 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL; gint v_collection_length1 = 0; gint _v_collection_size_ = 0; gint v_it = 0; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v_collection = _tmp3_; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v_collection_length1 = _tmp3__length1; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) { -#line 8407 "FlickrPublishing.c" +#line 8182 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v = _tmp4_; -#line 8414 "FlickrPublishing.c" +#line 8189 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_ = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->visibility_combo; -#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = v; -#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_->title; -#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_text_append_text (_tmp5_, _tmp7_); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v); -#line 8429 "FlickrPublishing.c" +#line 8204 "FlickrPublishing.c" } } } -#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->visibility_combo; -#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->publisher; -#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_); -#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 8441 "FlickrPublishing.c" +#line 8216 "FlickrPublishing.c" } static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8452 "FlickrPublishing.c" +#line 8227 "FlickrPublishing.c" } -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8458 "FlickrPublishing.c" +#line 8233 "FlickrPublishing.c" } static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8469 "FlickrPublishing.c" +#line 8244 "FlickrPublishing.c" } -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8475 "FlickrPublishing.c" +#line 8250 "FlickrPublishing.c" } static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8486 "FlickrPublishing.c" +#line 8261 "FlickrPublishing.c" } -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8492 "FlickrPublishing.c" +#line 8267 "FlickrPublishing.c" } static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8503 "FlickrPublishing.c" +#line 8278 "FlickrPublishing.c" } -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8509 "FlickrPublishing.c" +#line 8284 "FlickrPublishing.c" } static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8520 "FlickrPublishing.c" +#line 8295 "FlickrPublishing.c" } -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8526 "FlickrPublishing.c" +#line 8301 "FlickrPublishing.c" } @@ -8600,88 +8373,88 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL; gint _tmp16__length1 = 0; -#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); -#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1); -#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result__length1 = 0; -#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" __result__size_ = _result__length1; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _result_; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _ ("500 × 375 pixels"); -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500); -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp3_); -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _result_; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4__length1 = _result__length1; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _ ("1024 × 768 pixels"); -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024); -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp6_); -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _result_; -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7__length1 = _result__length1; -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _ ("2048 × 1536 pixels"); -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048); -#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = _result_; -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10__length1 = _result__length1; -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _ ("4096 × 3072 pixels"); -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096); -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp12_); -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _result_; -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13__length1 = _result__length1; -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _ ("Original size"); -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE); -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp15_); -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _result_; -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16__length1 = _result__length1; -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp16__length1; -#line 8626 "FlickrPublishing.c" +#line 8401 "FlickrPublishing.c" } -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp16_; -#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8632 "FlickrPublishing.c" +#line 8407 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) { -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL; -#line 8639 "FlickrPublishing.c" +#line 8414 "FlickrPublishing.c" } @@ -8693,80 +8466,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi GtkComboBoxText* _tmp8_ = NULL; PublishingFlickrFlickrPublisher* _tmp9_ = NULL; gint _tmp10_ = 0; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->sizes; -#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->sizes_length1; -#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 8659 "FlickrPublishing.c" +#line 8434 "FlickrPublishing.c" gint _tmp1_ = 0; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL; -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_); -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL); -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = _tmp2_; -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = _tmp1_; -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 8672 "FlickrPublishing.c" +#line 8447 "FlickrPublishing.c" } -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->sizes; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->sizes_length1; -#line 8678 "FlickrPublishing.c" +#line 8453 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; gint _e_collection_size_ = 0; gint e_it = 0; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e_collection = _tmp3_; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e_collection_length1 = _tmp3__length1; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) { -#line 8690 "FlickrPublishing.c" +#line 8465 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]); -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _tmp4_; -#line 8697 "FlickrPublishing.c" +#line 8472 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->size_combo; -#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = e; -#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_->title; -#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_text_append_text (_tmp5_, _tmp7_); -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_size_entry_unref0 (e); -#line 8712 "FlickrPublishing.c" +#line 8487 "FlickrPublishing.c" } } } -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->size_combo; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->publisher; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_); -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 8724 "FlickrPublishing.c" +#line 8499 "FlickrPublishing.c" } @@ -8774,17 +8547,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin PublishingFlickrFlickrPublisher* _tmp0_ = NULL; GtkComboBoxText* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->size_combo; -#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 8742 "FlickrPublishing.c" +#line 8517 "FlickrPublishing.c" } @@ -8792,41 +8565,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub PublishingFlickrFlickrPublisher* _tmp0_ = NULL; GtkComboBoxText* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->visibility_combo; -#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_); -#line 8760 "FlickrPublishing.c" +#line 8535 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) { GtkCheckButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->strip_metadata_check; -#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "publish", _tmp1_); -#line 8775 "FlickrPublishing.c" +#line 8550 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) { -#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 8784 "FlickrPublishing.c" +#line 8559 "FlickrPublishing.c" } @@ -8835,56 +8608,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8803 "FlickrPublishing.c" +#line 8578 "FlickrPublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8816 "FlickrPublishing.c" +#line 8591 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { -#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self); -#line 8823 "FlickrPublishing.c" +#line 8598 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { -#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self); -#line 8830 "FlickrPublishing.c" +#line 8605 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; -#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0); -#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 8842 "FlickrPublishing.c" +#line 8617 "FlickrPublishing.c" } @@ -8892,17 +8665,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( PublishingFlickrPublishingOptionsPane * self; guint _tmp0_ = 0U; guint _tmp1_ = 0U; -#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE); -#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self); -#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self); -#line 8860 "FlickrPublishing.c" +#line 8635 "FlickrPublishing.c" } @@ -8911,240 +8684,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); -#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type); -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = creator_title; -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->title = _tmp1_; -#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = creator_size; -#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->size = _tmp2_; -#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 8887 "FlickrPublishing.c" +#line 8662 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) { -#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size); -#line 8894 "FlickrPublishing.c" +#line 8669 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 8901 "FlickrPublishing.c" +#line 8676 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer); -#line 8910 "FlickrPublishing.c" +#line 8685 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer); -#line 8920 "FlickrPublishing.c" +#line 8695 "FlickrPublishing.c" } else { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 8924 "FlickrPublishing.c" +#line 8699 "FlickrPublishing.c" } } static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 8932 "FlickrPublishing.c" +#line 8707 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 8939 "FlickrPublishing.c" +#line 8714 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry* object; object = collect_values[0].v_pointer; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8946 "FlickrPublishing.c" +#line 8721 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 8950 "FlickrPublishing.c" +#line 8725 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object); -#line 8954 "FlickrPublishing.c" +#line 8729 "FlickrPublishing.c" } else { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 8958 "FlickrPublishing.c" +#line 8733 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 8962 "FlickrPublishing.c" +#line 8737 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingFlickrPublishingOptionsPaneSizeEntry** object_p; object_p = collect_values[0].v_pointer; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8973 "FlickrPublishing.c" +#line 8748 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 8979 "FlickrPublishing.c" +#line 8754 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 8983 "FlickrPublishing.c" +#line 8758 "FlickrPublishing.c" } else { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 8987 "FlickrPublishing.c" +#line 8762 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 8991 "FlickrPublishing.c" +#line 8766 "FlickrPublishing.c" } static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry* spec; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 9005 "FlickrPublishing.c" +#line 8780 "FlickrPublishing.c" } static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9014 "FlickrPublishing.c" +#line 8789 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneSizeEntry* old; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 9034 "FlickrPublishing.c" +#line 8809 "FlickrPublishing.c" } else { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9038 "FlickrPublishing.c" +#line 8813 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 9044 "FlickrPublishing.c" +#line 8819 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneSizeEntry* old; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY)); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 9063 "FlickrPublishing.c" +#line 8838 "FlickrPublishing.c" } else { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9067 "FlickrPublishing.c" +#line 8842 "FlickrPublishing.c" } -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 9073 "FlickrPublishing.c" +#line 8848 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize; -#line 9083 "FlickrPublishing.c" +#line 8858 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 9090 "FlickrPublishing.c" +#line 8865 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) { PublishingFlickrPublishingOptionsPaneSizeEntry * self; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 9102 "FlickrPublishing.c" +#line 8877 "FlickrPublishing.c" } @@ -9165,24 +8938,24 @@ static GType publishing_flickr_publishing_options_pane_size_entry_get_type (void static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpointer instance) { PublishingFlickrPublishingOptionsPaneSizeEntry* self; self = instance; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 9127 "FlickrPublishing.c" +#line 8902 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) { PublishingFlickrPublishingOptionsPaneSizeEntry* self; self = instance; -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self); -#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9140 "FlickrPublishing.c" +#line 8915 "FlickrPublishing.c" } } @@ -9193,248 +8966,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p PublishingFlickrVisibilitySpecification* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); -#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL); -#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type); -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = creator_specification; -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_); -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->specification); -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->specification = _tmp1_; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = creator_title; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->title = _tmp3_; -#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 9175 "FlickrPublishing.c" +#line 8950 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { -#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification); -#line 9182 "FlickrPublishing.c" +#line 8957 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9189 "FlickrPublishing.c" +#line 8964 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer); -#line 9198 "FlickrPublishing.c" +#line 8973 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer); -#line 9208 "FlickrPublishing.c" +#line 8983 "FlickrPublishing.c" } else { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9212 "FlickrPublishing.c" +#line 8987 "FlickrPublishing.c" } } static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9220 "FlickrPublishing.c" +#line 8995 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 9227 "FlickrPublishing.c" +#line 9002 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry* object; object = collect_values[0].v_pointer; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9234 "FlickrPublishing.c" +#line 9009 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 9238 "FlickrPublishing.c" +#line 9013 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object); -#line 9242 "FlickrPublishing.c" +#line 9017 "FlickrPublishing.c" } else { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9246 "FlickrPublishing.c" +#line 9021 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 9250 "FlickrPublishing.c" +#line 9025 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingFlickrPublishingOptionsPaneVisibilityEntry** object_p; object_p = collect_values[0].v_pointer; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9261 "FlickrPublishing.c" +#line 9036 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 9267 "FlickrPublishing.c" +#line 9042 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 9271 "FlickrPublishing.c" +#line 9046 "FlickrPublishing.c" } else { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 9275 "FlickrPublishing.c" +#line 9050 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 9279 "FlickrPublishing.c" +#line 9054 "FlickrPublishing.c" } static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibility_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry* spec; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 9293 "FlickrPublishing.c" +#line 9068 "FlickrPublishing.c" } static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9302 "FlickrPublishing.c" +#line 9077 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 9322 "FlickrPublishing.c" +#line 9097 "FlickrPublishing.c" } else { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9326 "FlickrPublishing.c" +#line 9101 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 9332 "FlickrPublishing.c" +#line 9107 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY)); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 9351 "FlickrPublishing.c" +#line 9126 "FlickrPublishing.c" } else { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9355 "FlickrPublishing.c" +#line 9130 "FlickrPublishing.c" } -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 9361 "FlickrPublishing.c" +#line 9136 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize; -#line 9371 "FlickrPublishing.c" +#line 9146 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 9378 "FlickrPublishing.c" +#line 9153 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->specification); -#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 9392 "FlickrPublishing.c" +#line 9167 "FlickrPublishing.c" } @@ -9455,134 +9228,134 @@ static GType publishing_flickr_publishing_options_pane_visibility_entry_get_type static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* self; self = instance; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 9417 "FlickrPublishing.c" +#line 9192 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* self; self = instance; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self); -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9430 "FlickrPublishing.c" +#line 9205 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) { -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate)); -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9446 "FlickrPublishing.c" +#line 9221 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; -#line 9461 "FlickrPublishing.c" +#line 9236 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) { -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = NULL; -#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_label = NULL; -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->upload_info_label = NULL; -#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_label = NULL; -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->logout_button = NULL; -#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publish_button = NULL; -#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_combo = NULL; -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_combo = NULL; -#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata_check = NULL; -#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = NULL; -#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = 0; -#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = NULL; -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = 0; -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = NULL; -#line 9502 "FlickrPublishing.c" +#line 9277 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { PublishingFlickrPublishingOptionsPane * self; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_label); -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->upload_info_label); -#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_label); -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_combo); -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_combo); -#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->strip_metadata_check); -#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = (_vala_array_free (self->priv->visibilities, self->priv->visibilities_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_visibility_entry_unref), NULL); -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL); -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj); -#line 9540 "FlickrPublishing.c" +#line 9315 "FlickrPublishing.c" } @@ -9608,57 +9381,57 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ PublishingFlickrPublishingParameters* _tmp2_ = NULL; PublishingFlickrPublishingParameters* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishables; -#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = publishables_length1; -#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1); -#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = parameters; -#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_); -#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp3_; -#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = strip_metadata; -#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata = _tmp4_; -#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 9592 "FlickrPublishing.c" +#line 9367 "FlickrPublishing.c" } PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { -#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata); -#line 9599 "FlickrPublishing.c" +#line 9374 "FlickrPublishing.c" } static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value) { -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 9610 "FlickrPublishing.c" +#line 9385 "FlickrPublishing.c" } -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 9616 "FlickrPublishing.c" +#line 9391 "FlickrPublishing.c" } @@ -9676,25 +9449,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GExiv2Metadata* _tmp32_ = NULL; gboolean _tmp33_ = FALSE; GError * _inner_error_ = NULL; -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self)); -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable)); -#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishable; -#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_); -#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9646 "FlickrPublishing.c" +#line 9421 "FlickrPublishing.c" } -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gexiv2_metadata_new (); -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishable_metadata = _tmp2_; -#line 9652 "FlickrPublishing.c" +#line 9427 "FlickrPublishing.c" { GExiv2Metadata* _tmp3_ = NULL; SpitPublishingPublishable* _tmp4_ = NULL; @@ -9702,27 +9475,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishable_metadata; -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishable; -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _tmp5_; -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = g_file_get_path (_tmp6_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp7_; -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp8_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp6_); -#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9680 "FlickrPublishing.c" +#line 9455 "FlickrPublishing.c" goto __catch25_g_error; } } @@ -9735,129 +9508,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp11_ = NULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = publishable; -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_); -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_; -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _tmp12_; -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:1305: couldn't read metadata from file '%s' for " \ +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:1279: couldn't read metadata from file '%s' for " \ "upload preprocessing.", _tmp13_); -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp13_); -#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp11_); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 9715 "FlickrPublishing.c" +#line 9490 "FlickrPublishing.c" } __finally25: -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9728 "FlickrPublishing.c" +#line 9503 "FlickrPublishing.c" } -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishable_metadata; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = gexiv2_metadata_has_iptc (_tmp14_); -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp15_) { -#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9740 "FlickrPublishing.c" +#line 9515 "FlickrPublishing.c" } -#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishable_metadata; -#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption"); -#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp17_) { -#line 9748 "FlickrPublishing.c" +#line 9523 "FlickrPublishing.c" GExiv2Metadata* _tmp18_ = NULL; GExiv2Metadata* _tmp19_ = NULL; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = publishable_metadata; -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = publishable_metadata; -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption"); -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _tmp20_; -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = publishing_rest_support_asciify_string (_tmp21_); -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = _tmp22_; -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_); -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp23_); -#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 9773 "FlickrPublishing.c" +#line 9548 "FlickrPublishing.c" } -#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = publishable_metadata; -#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline"); -#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp25_) { -#line 9781 "FlickrPublishing.c" +#line 9556 "FlickrPublishing.c" GExiv2Metadata* _tmp26_ = NULL; GExiv2Metadata* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = publishable_metadata; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = publishable_metadata; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline"); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = _tmp28_; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = publishing_rest_support_asciify_string (_tmp29_); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = _tmp30_; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp31_); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp29_); -#line 9806 "FlickrPublishing.c" +#line 9581 "FlickrPublishing.c" } -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = publishable_metadata; -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords"); -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp33_) { -#line 9814 "FlickrPublishing.c" +#line 9589 "FlickrPublishing.c" GeeSet* keyword_set = NULL; GeeHashSet* _tmp34_ = NULL; gchar** iptc_keywords = NULL; @@ -9897,179 +9670,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GExiv2Metadata* _tmp60_ = NULL; gchar** _tmp61_ = NULL; gint _tmp61__length1 = 0; -#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet); -#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = publishable_metadata; -#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords"); -#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = _tmp37_; -#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords_length1 = _vala_array_length (_tmp36_); -#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _iptc_keywords_size_ = iptc_keywords_length1; -#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = iptc_keywords; -#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38__length1 = iptc_keywords_length1; -#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_ != NULL) { -#line 9874 "FlickrPublishing.c" +#line 9649 "FlickrPublishing.c" gchar** _tmp39_ = NULL; gint _tmp39__length1 = 0; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = iptc_keywords; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39__length1 = iptc_keywords_length1; -#line 9881 "FlickrPublishing.c" +#line 9656 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; gint _keyword_collection_size_ = 0; gint keyword_it = 0; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection = _tmp39_; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection_length1 = _tmp39__length1; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) { -#line 9893 "FlickrPublishing.c" +#line 9668 "FlickrPublishing.c" gchar* _tmp40_ = NULL; gchar* keyword = NULL; -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = g_strdup (keyword_collection[keyword_it]); -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp40_; -#line 9900 "FlickrPublishing.c" +#line 9675 "FlickrPublishing.c" { GeeSet* _tmp41_ = NULL; const gchar* _tmp42_ = NULL; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = keyword_set; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = keyword; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); -#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 9912 "FlickrPublishing.c" +#line 9687 "FlickrPublishing.c" } } } } -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = publishable_metadata; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject"); -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = _tmp45_; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords_length1 = _vala_array_length (_tmp44_); -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _xmp_keywords_size_ = xmp_keywords_length1; -#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = xmp_keywords; -#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46__length1 = xmp_keywords_length1; -#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 9933 "FlickrPublishing.c" +#line 9708 "FlickrPublishing.c" gchar** _tmp47_ = NULL; gint _tmp47__length1 = 0; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = xmp_keywords; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47__length1 = xmp_keywords_length1; -#line 9940 "FlickrPublishing.c" +#line 9715 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; gint _keyword_collection_size_ = 0; gint keyword_it = 0; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection = _tmp47_; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection_length1 = _tmp47__length1; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) { -#line 9952 "FlickrPublishing.c" +#line 9727 "FlickrPublishing.c" gchar* _tmp48_ = NULL; gchar* keyword = NULL; -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strdup (keyword_collection[keyword_it]); -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp48_; -#line 9959 "FlickrPublishing.c" +#line 9734 "FlickrPublishing.c" { GeeSet* _tmp49_ = NULL; const gchar* _tmp50_ = NULL; -#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = keyword_set; -#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp50_ = keyword; -#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 9971 "FlickrPublishing.c" +#line 9746 "FlickrPublishing.c" } } } } -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp51_ = keyword_set; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp53_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp52_); -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = _tmp53_; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords_length1 = _tmp52_; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _all_keywords_size_ = all_keywords_length1; -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = all_keywords; -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54__length1 = all_keywords_length1; -#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL); -#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp55_ = g_new0 (gchar*, 1 + 1); -#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = _tmp55_; -#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords_length1 = 1; -#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _no_keywords_size_ = no_keywords_length1; -#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_ = no_keywords; -#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56__length1 = no_keywords_length1; -#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp56_[0]); -#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_[0] = NULL; -#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp57_ = _tmp56_[0]; -#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp58_ = publishable_metadata; -#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59_ = all_keywords; -#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59__length1 = all_keywords_length1; -#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_); -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp60_ = publishable_metadata; -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = no_keywords; -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61__length1 = no_keywords_length1; -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_); -#line 10026 "FlickrPublishing.c" +#line 9801 "FlickrPublishing.c" { GExiv2Metadata* _tmp62_ = NULL; SpitPublishingPublishable* _tmp63_ = NULL; @@ -10077,27 +9850,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp65_ = NULL; gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = publishable_metadata; -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp63_ = publishable; -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_); -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp65_ = _tmp64_; -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp66_ = g_file_get_path (_tmp65_); -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp67_ = _tmp66_; -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_); -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp67_); -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp65_); -#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10054 "FlickrPublishing.c" +#line 9829 "FlickrPublishing.c" goto __catch26_g_error; } } @@ -10110,69 +9883,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp70_ = NULL; gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = publishable; -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_); -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp70_ = _tmp69_; -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp71_ = g_file_get_path (_tmp70_); -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp72_ = _tmp71_; -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:1358: couldn't write metadata to file '%s' for u" \ +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:1332: couldn't write metadata to file '%s' for u" \ "pload preprocessing.", _tmp72_); -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp72_); -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp70_); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 10089 "FlickrPublishing.c" +#line 9864 "FlickrPublishing.c" } __finally26: -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 10112 "FlickrPublishing.c" +#line 9887 "FlickrPublishing.c" } -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 10124 "FlickrPublishing.c" +#line 9899 "FlickrPublishing.c" } -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 10128 "FlickrPublishing.c" +#line 9903 "FlickrPublishing.c" } @@ -10188,73 +9961,73 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_ SpitPublishingPublishable* _tmp6_ = NULL; PublishingFlickrUploadTransaction* _tmp7_ = NULL; PublishingRESTSupportTransaction* _tmp8_ = NULL; -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp0_; -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_uploader_preprocess_publishable (self, _tmp1_); -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp1_); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->parameters; -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _tmp5_; -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp6_); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (_tmp3_); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp8_; -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 10178 "FlickrPublishing.c" +#line 9953 "FlickrPublishing.c" } static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) { -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize; -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate)); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction; -#line 10191 "FlickrPublishing.c" +#line 9966 "FlickrPublishing.c" } static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) { -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self); -#line 10198 "FlickrPublishing.c" +#line 9973 "FlickrPublishing.c" } static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { PublishingFlickrUploader * self; -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); -#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj); -#line 10210 "FlickrPublishing.c" +#line 9985 "FlickrPublishing.c" } diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala index c214ce9..1702288 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.vala +++ b/plugins/shotwell-publishing/FlickrPublishing.vala @@ -87,7 +87,7 @@ internal class VisibilitySpecification { // not a struct because we want reference semantics internal class PublishingParameters { public UserKind user_kind; - public int quota_free_mb; + public int64 quota_free_bytes; public int photo_major_axis_size; public string username; public VisibilitySpecification visibility_specification; @@ -389,20 +389,10 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { string? oauth_token = null; string? oauth_token_secret = null; - - string[] key_value_pairs = response.split("&"); - foreach (string pair in key_value_pairs) { - string[] split_pair = pair.split("="); - - if (split_pair.length != 2) - host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( - "'%s' isn't a valid response to an OAuth authentication request", response)); - - if (split_pair[0] == "oauth_token") - oauth_token = split_pair[1]; - else if (split_pair[0] == "oauth_token_secret") - oauth_token_secret = split_pair[1]; - } + + var data = Soup.Form.decode(response); + data.lookup_extended("oauth_token", null, out oauth_token); + data.lookup_extended("oauth_token_secret", null, out oauth_token_secret); if (oauth_token == null || oauth_token_secret == null) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( @@ -469,32 +459,19 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { private void do_extract_access_phase_credentials_from_reponse(string response) { debug("ACTION: extracting access phase credentials from '%s'", response); - - string[] key_value_pairs = response.split("&"); string? token = null; string? token_secret = null; string? username = null; - foreach (string key_value_pair in key_value_pairs) { - string[] split_pair = key_value_pair.split("="); - if (split_pair.length != 2) - continue; + var data = Soup.Form.decode(response); + data.lookup_extended("oauth_token", null, out token); + data.lookup_extended("oauth_token_secret", null, out token_secret); + data.lookup_extended("username", null, out username); - string key = split_pair[0]; - string value = split_pair[1]; - - if (key == "oauth_token") - token = value; - else if (key == "oauth_token_secret") - token_secret = value; - else if (key == "username") - username = value; - } - debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }", token, token_secret, username); - + if (token == null || token_secret == null || username == null) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " + "access phase credentials to contain token, token secret, and username but at " + @@ -543,9 +520,9 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object { throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( "Unable to determine if user has free or pro account"); - int quota_mb_left = int.parse(remaining_kb_str) / 1024; + var quota_bytes_left = int64.parse(remaining_kb_str) * 1024; - parameters.quota_free_mb = quota_mb_left; + parameters.quota_free_bytes = quota_bytes_left; parameters.user_kind = user_kind; } catch (Spit.Publishing.PublishingError err) { @@ -1151,10 +1128,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { string upload_label_text = _("You are logged into Flickr as %s.\n\n").printf(parameters.username); if (parameters.user_kind == UserKind.FREE) { - upload_label_text += ngettext( - "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabyte remaining in your upload quota.", - "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabytes remaining in your upload quota.", - parameters.quota_free_mb).printf(parameters.quota_free_mb); + upload_label_text += _("Your free Flickr account limits how much data you can upload per month.\nThis month you have %s remaining in your upload quota.").printf(GLib.format_size(parameters.quota_free_bytes, FormatSizeFlags.LONG_FORMAT | FormatSizeFlags.IEC_UNITS)); } else { upload_label_text += _("Your Flickr Pro account entitles you to unlimited uploads."); } diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c index 354eaca..5adb572 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.c +++ b/plugins/shotwell-publishing/PicasaPublishing.c @@ -1,4 +1,4 @@ -/* PicasaPublishing.c generated by valac 0.32.1, the Vala compiler +/* PicasaPublishing.c generated by valac 0.34.4, the Vala compiler * generated from PicasaPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -485,7 +485,6 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (Pub PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable); gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self); static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static guint8* _vala_array_dup5 (guint8* self, int length); static void _vala_SoupBuffer_free (SoupBuffer* self); static void _vala_SoupMultipart_free (SoupMultipart* self); static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); @@ -543,8 +542,8 @@ enum { PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY }; gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self); +static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length); static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length); -static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length); static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj); #define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate)) enum { @@ -571,7 +570,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = picasa_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp0_ == NULL) { -#line 563 "PicasaPublishing.c" +#line 562 "PicasaPublishing.c" gint _tmp1_ = 0; GdkPixbuf** _tmp2_ = NULL; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -584,18 +583,18 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire picasa_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1; -#line 576 "PicasaPublishing.c" +#line 575 "PicasaPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 580 "PicasaPublishing.c" +#line 579 "PicasaPublishing.c" } PicasaService* picasa_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory); -#line 587 "PicasaPublishing.c" +#line 586 "PicasaPublishing.c" } @@ -617,7 +616,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 609 "PicasaPublishing.c" +#line 608 "PicasaPublishing.c" } @@ -630,7 +629,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.picasa"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 622 "PicasaPublishing.c" +#line 621 "PicasaPublishing.c" } @@ -643,14 +642,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base) result = "Picasa Web Albums"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 635 "PicasaPublishing.c" +#line 634 "PicasaPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 642 "PicasaPublishing.c" +#line 641 "PicasaPublishing.c" } @@ -661,17 +660,17 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 653 "PicasaPublishing.c" +#line 652 "PicasaPublishing.c" GdkPixbuf* _tmp0_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 659 "PicasaPublishing.c" +#line 658 "PicasaPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 663 "PicasaPublishing.c" +#line 662 "PicasaPublishing.c" } @@ -753,7 +752,7 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo (*info).icons = _tmp9_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*info).icons_length1 = _tmp9__length1; -#line 745 "PicasaPublishing.c" +#line 744 "PicasaPublishing.c" } @@ -774,7 +773,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 766 "PicasaPublishing.c" +#line 765 "PicasaPublishing.c" } @@ -787,7 +786,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 779 "PicasaPublishing.c" +#line 778 "PicasaPublishing.c" } @@ -795,7 +794,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable PicasaService * self; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService); -#line 787 "PicasaPublishing.c" +#line 786 "PicasaPublishing.c" } @@ -804,7 +803,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) { picasa_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize; -#line 796 "PicasaPublishing.c" +#line 795 "PicasaPublishing.c" } @@ -821,7 +820,7 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation; -#line 813 "PicasaPublishing.c" +#line 812 "PicasaPublishing.c" } @@ -832,7 +831,7 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media; -#line 824 "PicasaPublishing.c" +#line 823 "PicasaPublishing.c" } @@ -846,7 +845,7 @@ static void picasa_service_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj); -#line 838 "PicasaPublishing.c" +#line 837 "PicasaPublishing.c" } @@ -906,7 +905,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G _tmp4_ = host; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_); -#line 898 "PicasaPublishing.c" +#line 897 "PicasaPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -918,14 +917,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G p_collection_length1 = _tmp5_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) { -#line 910 "PicasaPublishing.c" +#line 909 "PicasaPublishing.c" SpitPublishingPublishable* _tmp7_ = NULL; SpitPublishingPublishable* p = NULL; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp7_ = _g_object_ref0 (p_collection[p_it]); #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" p = _tmp7_; -#line 917 "PicasaPublishing.c" +#line 916 "PicasaPublishing.c" { SpitPublishingPublisherMediaType _tmp8_ = 0; SpitPublishingPublishable* _tmp9_ = NULL; @@ -940,12 +939,12 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G media_type = _tmp8_ | _tmp10_; #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (p); -#line 932 "PicasaPublishing.c" +#line 931 "PicasaPublishing.c" } } #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL); -#line 937 "PicasaPublishing.c" +#line 936 "PicasaPublishing.c" } #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp11_ = self->priv->publishing_parameters; @@ -977,14 +976,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G self->priv->progress_reporter_target_destroy_notify = NULL; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 969 "PicasaPublishing.c" +#line 968 "PicasaPublishing.c" } PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host); -#line 976 "PicasaPublishing.c" +#line 975 "PicasaPublishing.c" } @@ -995,13 +994,13 @@ static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* *size = (*size) ? (2 * (*size)) : 4; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1); -#line 987 "PicasaPublishing.c" +#line 986 "PicasaPublishing.c" } #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 993 "PicasaPublishing.c" +#line 992 "PicasaPublishing.c" } @@ -1035,7 +1034,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp2_ = _tmp1_->name; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp2_, "feed") == 0) { -#line 1027 "PicasaPublishing.c" +#line 1026 "PicasaPublishing.c" xmlNode* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1044,7 +1043,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp4_ = _tmp3_->children; #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" doc_node_iter = _tmp4_; -#line 1036 "PicasaPublishing.c" +#line 1035 "PicasaPublishing.c" } else { xmlNode* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -1054,13 +1053,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp6_ = _tmp5_->name; #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp6_, "entry") == 0) { -#line 1046 "PicasaPublishing.c" +#line 1045 "PicasaPublishing.c" xmlNode* _tmp7_ = NULL; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp7_ = document_root; #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" doc_node_iter = _tmp7_; -#line 1052 "PicasaPublishing.c" +#line 1051 "PicasaPublishing.c" } else { GError* _tmp8_ = NULL; #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1075,7 +1074,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 1067 "PicasaPublishing.c" +#line 1066 "PicasaPublishing.c" } else { #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); @@ -1085,7 +1084,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums g_clear_error (&_inner_error_); #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 1077 "PicasaPublishing.c" +#line 1076 "PicasaPublishing.c" } } } @@ -1095,7 +1094,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp9_ = TRUE; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 1087 "PicasaPublishing.c" +#line 1086 "PicasaPublishing.c" xmlNode* _tmp12_ = NULL; xmlNode* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -1111,7 +1110,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums PublishingPicasaAlbum* _tmp35_ = NULL; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp9_) { -#line 1103 "PicasaPublishing.c" +#line 1102 "PicasaPublishing.c" xmlNode* _tmp10_ = NULL; xmlNode* _tmp11_ = NULL; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1120,7 +1119,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp11_ = _tmp10_->next; #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" doc_node_iter = _tmp11_; -#line 1112 "PicasaPublishing.c" +#line 1111 "PicasaPublishing.c" } #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp9_ = FALSE; @@ -1130,7 +1129,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums if (!(_tmp12_ != NULL)) { #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 1122 "PicasaPublishing.c" +#line 1121 "PicasaPublishing.c" } #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp13_ = doc_node_iter; @@ -1140,7 +1139,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums if (g_strcmp0 (_tmp14_, "entry") != 0) { #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" continue; -#line 1132 "PicasaPublishing.c" +#line 1131 "PicasaPublishing.c" } #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" name_val = NULL; @@ -1152,20 +1151,20 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp16_ = _tmp15_->children; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" album_node_iter = _tmp16_; -#line 1144 "PicasaPublishing.c" +#line 1143 "PicasaPublishing.c" { gboolean _tmp17_ = FALSE; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = TRUE; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 1151 "PicasaPublishing.c" +#line 1150 "PicasaPublishing.c" xmlNode* _tmp20_ = NULL; xmlNode* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp17_) { -#line 1157 "PicasaPublishing.c" +#line 1156 "PicasaPublishing.c" xmlNode* _tmp18_ = NULL; xmlNode* _tmp19_ = NULL; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1174,7 +1173,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp19_ = _tmp18_->next; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" album_node_iter = _tmp19_; -#line 1166 "PicasaPublishing.c" +#line 1165 "PicasaPublishing.c" } #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = FALSE; @@ -1184,7 +1183,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums if (!(_tmp20_ != NULL)) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 1176 "PicasaPublishing.c" +#line 1175 "PicasaPublishing.c" } #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp21_ = album_node_iter; @@ -1192,7 +1191,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp22_ = _tmp21_->name; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp22_, "title") == 0) { -#line 1184 "PicasaPublishing.c" +#line 1183 "PicasaPublishing.c" xmlNode* _tmp23_ = NULL; gchar* _tmp24_ = NULL; #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1203,7 +1202,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _g_free0 (name_val); #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" name_val = _tmp24_; -#line 1195 "PicasaPublishing.c" +#line 1194 "PicasaPublishing.c" } else { xmlNode* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; @@ -1213,7 +1212,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _tmp26_ = _tmp25_->name; #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp26_, "id") == 0) { -#line 1205 "PicasaPublishing.c" +#line 1204 "PicasaPublishing.c" xmlNode* _tmp27_ = NULL; xmlNs* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -1229,7 +1228,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums if (_tmp29_ != NULL) { #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" continue; -#line 1221 "PicasaPublishing.c" +#line 1220 "PicasaPublishing.c" } #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp30_ = album_node_iter; @@ -1239,7 +1238,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _g_free0 (url_val); #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" url_val = _tmp31_; -#line 1231 "PicasaPublishing.c" +#line 1230 "PicasaPublishing.c" } } } @@ -1260,7 +1259,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums _g_free0 (url_val); #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (name_val); -#line 1252 "PicasaPublishing.c" +#line 1251 "PicasaPublishing.c" } } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1271,13 +1270,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums if (result_length1) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *result_length1 = _tmp36__length1; -#line 1263 "PicasaPublishing.c" +#line 1262 "PicasaPublishing.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = _tmp36_; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 1269 "PicasaPublishing.c" +#line 1268 "PicasaPublishing.c" } @@ -1324,7 +1323,7 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp9_); -#line 1316 "PicasaPublishing.c" +#line 1315 "PicasaPublishing.c" } @@ -1371,7 +1370,7 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_ spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp9_); -#line 1363 "PicasaPublishing.c" +#line 1362 "PicasaPublishing.c" } @@ -1389,13 +1388,13 @@ static void publishing_picasa_picasa_publisher_on_service_welcome_login (Publish if (!_tmp0_) { #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1380 "PicasaPublishing.c" +#line 1379 "PicasaPublishing.c" } #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = self->priv->refresh_token; #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_); -#line 1386 "PicasaPublishing.c" +#line 1385 "PicasaPublishing.c" } @@ -1449,21 +1448,21 @@ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (Publ _publishing_rest_support_session_unref0 (_tmp7_); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_fetch_account_information (self); -#line 1440 "PicasaPublishing.c" +#line 1439 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender); -#line 1447 "PicasaPublishing.c" +#line 1446 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err); -#line 1454 "PicasaPublishing.c" +#line 1453 "PicasaPublishing.c" } @@ -1496,7 +1495,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ( if (!_tmp4_) { #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1487 "PicasaPublishing.c" +#line 1486 "PicasaPublishing.c" } #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \ @@ -1505,7 +1504,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ( _tmp5_ = txn; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction)); -#line 1495 "PicasaPublishing.c" +#line 1494 "PicasaPublishing.c" } @@ -1543,7 +1542,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub if (!_tmp4_) { #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1533 "PicasaPublishing.c" +#line 1532 "PicasaPublishing.c" } #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = bad_txn; @@ -1564,7 +1563,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub if (_tmp10_ == ((guint) 403)) { #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp8_ = TRUE; -#line 1553 "PicasaPublishing.c" +#line 1552 "PicasaPublishing.c" } else { PublishingRESTSupportTransaction* _tmp11_ = NULL; guint _tmp12_ = 0U; @@ -1574,13 +1573,13 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub _tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_); #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp8_ = _tmp12_ == ((guint) 404); -#line 1563 "PicasaPublishing.c" +#line 1562 "PicasaPublishing.c" } #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp8_) { #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); -#line 1569 "PicasaPublishing.c" +#line 1568 "PicasaPublishing.c" } else { SpitPublishingPluginHost* _tmp13_ = NULL; GError* _tmp14_ = NULL; @@ -1590,7 +1589,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub _tmp14_ = err; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_); -#line 1579 "PicasaPublishing.c" +#line 1578 "PicasaPublishing.c" } } @@ -1605,14 +1604,14 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_logout (Pub if (!_tmp0_) { #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1594 "PicasaPublishing.c" +#line 1593 "PicasaPublishing.c" } #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_debug ("PicasaPublishing.vala:189: EVENT: user clicked 'Logout' in the publish" \ "ing options pane."); #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); -#line 1600 "PicasaPublishing.c" +#line 1599 "PicasaPublishing.c" } @@ -1629,7 +1628,7 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu if (!_tmp0_) { #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1617 "PicasaPublishing.c" +#line 1616 "PicasaPublishing.c" } #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_debug ("PicasaPublishing.vala:198: EVENT: user clicked 'Publish' in the publis" \ @@ -1646,11 +1645,11 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu if (_tmp3_) { #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_create_album (self); -#line 1633 "PicasaPublishing.c" +#line 1632 "PicasaPublishing.c" } else { #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_upload (self); -#line 1637 "PicasaPublishing.c" +#line 1636 "PicasaPublishing.c" } } @@ -1658,21 +1657,21 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_album_creation_complete ((PublishingPicasaPicasaPublisher*) self, _sender); -#line 1645 "PicasaPublishing.c" +#line 1644 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_album_creation_error ((PublishingPicasaPicasaPublisher*) self, _sender, err); -#line 1652 "PicasaPublishing.c" +#line 1651 "PicasaPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 1659 "PicasaPublishing.c" +#line 1658 "PicasaPublishing.c" } @@ -1681,7 +1680,7 @@ static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publis result = publishing_picasa_album_directory_transaction_validate_xml (doc); #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 1668 "PicasaPublishing.c" +#line 1667 "PicasaPublishing.c" } @@ -1728,7 +1727,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi if (!_tmp4_) { #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1715 "PicasaPublishing.c" +#line 1714 "PicasaPublishing.c" } #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_debug ("PicasaPublishing.vala:216: EVENT: finished creating album on remote se" \ @@ -1739,7 +1738,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _tmp6_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction)); #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" downcast_txn = _tmp6_; -#line 1725 "PicasaPublishing.c" +#line 1724 "PicasaPublishing.c" { PublishingRESTSupportXmlDocument* _tmp7_ = NULL; PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL; @@ -1766,7 +1765,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1752 "PicasaPublishing.c" +#line 1751 "PicasaPublishing.c" goto __catch7_spit_publishing_publishing_error; } #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1779,7 +1778,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi g_clear_error (&_inner_error_); #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1765 "PicasaPublishing.c" +#line 1764 "PicasaPublishing.c" } #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp13_ = _tmp7_; @@ -1791,7 +1790,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi response_doc = _tmp13_; #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp7_); -#line 1777 "PicasaPublishing.c" +#line 1776 "PicasaPublishing.c" } goto __finally7; __catch7_spit_publishing_publishing_error: @@ -1817,7 +1816,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _publishing_rest_support_transaction_unref0 (downcast_txn); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1803 "PicasaPublishing.c" +#line 1802 "PicasaPublishing.c" } __finally7: #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1832,7 +1831,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi g_clear_error (&_inner_error_); #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1818 "PicasaPublishing.c" +#line 1817 "PicasaPublishing.c" } { PublishingPicasaAlbum** _tmp16_ = NULL; @@ -1860,7 +1859,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1846 "PicasaPublishing.c" +#line 1845 "PicasaPublishing.c" goto __catch8_spit_publishing_publishing_error; } #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1875,7 +1874,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi g_clear_error (&_inner_error_); #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1861 "PicasaPublishing.c" +#line 1860 "PicasaPublishing.c" } #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp21_ = _tmp16_; @@ -1895,7 +1894,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _response_albums_size_ = response_albums_length1; #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 1881 "PicasaPublishing.c" +#line 1880 "PicasaPublishing.c" } goto __finally8; __catch8_spit_publishing_publishing_error: @@ -1923,7 +1922,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _publishing_rest_support_transaction_unref0 (downcast_txn); #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1909 "PicasaPublishing.c" +#line 1908 "PicasaPublishing.c" } __finally8: #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -1940,7 +1939,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi g_clear_error (&_inner_error_); #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1926 "PicasaPublishing.c" +#line 1925 "PicasaPublishing.c" } #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp24_ = response_albums; @@ -1948,7 +1947,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _tmp24__length1 = response_albums_length1; #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp24__length1 != 1) { -#line 1934 "PicasaPublishing.c" +#line 1933 "PicasaPublishing.c" SpitPublishingPluginHost* _tmp25_ = NULL; GError* _tmp26_ = NULL; GError* _tmp27_ = NULL; @@ -1971,7 +1970,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _publishing_rest_support_transaction_unref0 (downcast_txn); #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 1956 "PicasaPublishing.c" +#line 1955 "PicasaPublishing.c" } #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp28_ = self->priv->publishing_parameters; @@ -1993,7 +1992,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi _publishing_rest_support_xml_document_unref0 (response_doc); #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_transaction_unref0 (downcast_txn); -#line 1978 "PicasaPublishing.c" +#line 1977 "PicasaPublishing.c" } @@ -2030,7 +2029,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi if (!_tmp4_) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2015 "PicasaPublishing.c" +#line 2014 "PicasaPublishing.c" } #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = bad_txn; @@ -2049,7 +2048,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi _tmp9_ = err; #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_); -#line 2033 "PicasaPublishing.c" +#line 2032 "PicasaPublishing.c" } @@ -2070,7 +2069,7 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2054 "PicasaPublishing.c" +#line 2053 "PicasaPublishing.c" } #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = completed_fraction; @@ -2093,21 +2092,21 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 2076 "PicasaPublishing.c" +#line 2075 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published); -#line 2083 "PicasaPublishing.c" +#line 2082 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err); -#line 2090 "PicasaPublishing.c" +#line 2089 "PicasaPublishing.c" } @@ -2128,7 +2127,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic if (!_tmp0_) { #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2111 "PicasaPublishing.c" +#line 2110 "PicasaPublishing.c" } #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = num_published; @@ -2149,7 +2148,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_show_success_pane (self); -#line 2131 "PicasaPublishing.c" +#line 2130 "PicasaPublishing.c" } @@ -2173,7 +2172,7 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa if (!_tmp0_) { #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2155 "PicasaPublishing.c" +#line 2154 "PicasaPublishing.c" } #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = err; @@ -2200,14 +2199,14 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa _tmp8_ = err; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 2181 "PicasaPublishing.c" +#line 2180 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) { #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_service_welcome_login ((PublishingPicasaPicasaPublisher*) self); -#line 2188 "PicasaPublishing.c" +#line 2187 "PicasaPublishing.c" } @@ -2221,7 +2220,7 @@ static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (Pub _tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE, _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback, self); -#line 2202 "PicasaPublishing.c" +#line 2201 "PicasaPublishing.c" } @@ -2263,7 +2262,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 2243 "PicasaPublishing.c" +#line 2242 "PicasaPublishing.c" { #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2271,7 +2270,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub if (G_UNLIKELY (_inner_error_ != NULL)) { #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2251 "PicasaPublishing.c" +#line 2250 "PicasaPublishing.c" goto __catch9_spit_publishing_publishing_error; } #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2282,7 +2281,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub g_clear_error (&_inner_error_); #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2262 "PicasaPublishing.c" +#line 2261 "PicasaPublishing.c" } } goto __finally9; @@ -2300,7 +2299,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (err); -#line 2280 "PicasaPublishing.c" +#line 2279 "PicasaPublishing.c" } __finally9: #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2313,11 +2312,11 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub g_clear_error (&_inner_error_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2293 "PicasaPublishing.c" +#line 2292 "PicasaPublishing.c" } #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_transaction_unref0 (directory_trans); -#line 2297 "PicasaPublishing.c" +#line 2296 "PicasaPublishing.c" } @@ -2331,7 +2330,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_debug ("PicasaPublishing.vala:327: ACTION: parsing account and album informati" \ "on from server response XML"); -#line 2310 "PicasaPublishing.c" +#line 2309 "PicasaPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL; @@ -2358,7 +2357,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info if (G_UNLIKELY (_inner_error_ != NULL)) { #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2337 "PicasaPublishing.c" +#line 2336 "PicasaPublishing.c" goto __catch10_spit_publishing_publishing_error; } #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2369,7 +2368,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info g_clear_error (&_inner_error_); #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2348 "PicasaPublishing.c" +#line 2347 "PicasaPublishing.c" } #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = _tmp0_; @@ -2381,7 +2380,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info response_doc = _tmp6_; #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 2360 "PicasaPublishing.c" +#line 2359 "PicasaPublishing.c" } goto __finally10; __catch10_spit_publishing_publishing_error: @@ -2405,7 +2404,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info _publishing_rest_support_xml_document_unref0 (response_doc); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2384 "PicasaPublishing.c" +#line 2383 "PicasaPublishing.c" } __finally10: #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2418,7 +2417,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info g_clear_error (&_inner_error_); #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2397 "PicasaPublishing.c" +#line 2396 "PicasaPublishing.c" } { PublishingPicasaAlbum** _tmp9_ = NULL; @@ -2445,7 +2444,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info if (G_UNLIKELY (_inner_error_ != NULL)) { #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2424 "PicasaPublishing.c" +#line 2423 "PicasaPublishing.c" goto __catch11_spit_publishing_publishing_error; } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2456,7 +2455,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info g_clear_error (&_inner_error_); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2435 "PicasaPublishing.c" +#line 2434 "PicasaPublishing.c" } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = self->priv->publishing_parameters; @@ -2464,7 +2463,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1); #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 2443 "PicasaPublishing.c" +#line 2442 "PicasaPublishing.c" } goto __finally11; __catch11_spit_publishing_publishing_error: @@ -2488,7 +2487,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info _publishing_rest_support_xml_document_unref0 (response_doc); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2467 "PicasaPublishing.c" +#line 2466 "PicasaPublishing.c" } __finally11: #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2501,27 +2500,27 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info g_clear_error (&_inner_error_); #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2480 "PicasaPublishing.c" +#line 2479 "PicasaPublishing.c" } #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self); #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 2486 "PicasaPublishing.c" +#line 2485 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) { #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self); -#line 2493 "PicasaPublishing.c" +#line 2492 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) { #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self); -#line 2500 "PicasaPublishing.c" +#line 2499 "PicasaPublishing.c" } @@ -2546,7 +2545,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( _tmp0_ = gtk_builder_new (); #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" builder = _tmp0_; -#line 2525 "PicasaPublishing.c" +#line 2524 "PicasaPublishing.c" { GtkBuilder* _tmp1_ = NULL; #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2555,7 +2554,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_); #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2534 "PicasaPublishing.c" +#line 2533 "PicasaPublishing.c" goto __catch12_g_error; } } @@ -2598,7 +2597,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( _g_object_unref0 (builder); #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2576 "PicasaPublishing.c" +#line 2575 "PicasaPublishing.c" } __finally12: #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2611,7 +2610,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( g_clear_error (&_inner_error_); #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2589 "PicasaPublishing.c" +#line 2588 "PicasaPublishing.c" } #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp8_ = builder; @@ -2643,7 +2642,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane ( _g_object_unref0 (opts_pane); #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (builder); -#line 2621 "PicasaPublishing.c" +#line 2620 "PicasaPublishing.c" } @@ -2710,7 +2709,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self, 0); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self, 0); -#line 2687 "PicasaPublishing.c" +#line 2686 "PicasaPublishing.c" { #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2718,7 +2717,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2695 "PicasaPublishing.c" +#line 2694 "PicasaPublishing.c" goto __catch13_spit_publishing_publishing_error; } #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2729,7 +2728,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa g_clear_error (&_inner_error_); #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2706 "PicasaPublishing.c" +#line 2705 "PicasaPublishing.c" } } goto __finally13; @@ -2750,7 +2749,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (err); -#line 2727 "PicasaPublishing.c" +#line 2726 "PicasaPublishing.c" } __finally13: #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -2763,18 +2762,18 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa g_clear_error (&_inner_error_); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2740 "PicasaPublishing.c" +#line 2739 "PicasaPublishing.c" } #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_rest_support_transaction_unref0 (creation_trans); -#line 2744 "PicasaPublishing.c" +#line 2743 "PicasaPublishing.c" } static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete); -#line 2751 "PicasaPublishing.c" +#line 2750 "PicasaPublishing.c" } @@ -2847,7 +2846,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa if (!_tmp9_) { #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2823 "PicasaPublishing.c" +#line 2822 "PicasaPublishing.c" } #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -2893,7 +2892,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa _publishing_rest_support_batch_uploader_unref0 (uploader); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2869 "PicasaPublishing.c" +#line 2868 "PicasaPublishing.c" } @@ -2912,7 +2911,7 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 2888 "PicasaPublishing.c" +#line 2887 "PicasaPublishing.c" } @@ -2943,7 +2942,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token"); #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self); -#line 2919 "PicasaPublishing.c" +#line 2918 "PicasaPublishing.c" } @@ -2959,7 +2958,7 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE result = _tmp0_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 2935 "PicasaPublishing.c" +#line 2934 "PicasaPublishing.c" } @@ -2977,7 +2976,7 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport if (_tmp0_) { #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 2953 "PicasaPublishing.c" +#line 2952 "PicasaPublishing.c" } #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->running = TRUE; @@ -2987,14 +2986,14 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport if (_tmp1_ == NULL) { #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self); -#line 2963 "PicasaPublishing.c" +#line 2962 "PicasaPublishing.c" } else { const gchar* _tmp2_ = NULL; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = self->priv->refresh_token; #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_); -#line 2970 "PicasaPublishing.c" +#line 2969 "PicasaPublishing.c" } } @@ -3017,7 +3016,7 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG _publishing_rest_support_session_unref0 (_tmp1_); #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->running = FALSE; -#line 2993 "PicasaPublishing.c" +#line 2992 "PicasaPublishing.c" } @@ -3038,14 +3037,14 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas ((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop; #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize; -#line 3014 "PicasaPublishing.c" +#line 3013 "PicasaPublishing.c" } static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) { #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self); -#line 3021 "PicasaPublishing.c" +#line 3020 "PicasaPublishing.c" } @@ -3067,7 +3066,7 @@ static void publishing_picasa_picasa_publisher_finalize (GObject* obj) { _g_free0 (self->priv->refresh_token); #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj); -#line 3043 "PicasaPublishing.c" +#line 3042 "PicasaPublishing.c" } @@ -3113,21 +3112,21 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con self->url = _tmp3_; #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 3089 "PicasaPublishing.c" +#line 3088 "PicasaPublishing.c" } PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) { #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url); -#line 3096 "PicasaPublishing.c" +#line 3095 "PicasaPublishing.c" } static void publishing_picasa_value_album_init (GValue* value) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 3103 "PicasaPublishing.c" +#line 3102 "PicasaPublishing.c" } @@ -3136,7 +3135,7 @@ static void publishing_picasa_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (value->data[0].v_pointer); -#line 3112 "PicasaPublishing.c" +#line 3111 "PicasaPublishing.c" } } @@ -3146,11 +3145,11 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G if (src_value->data[0].v_pointer) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer); -#line 3122 "PicasaPublishing.c" +#line 3121 "PicasaPublishing.c" } else { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 3126 "PicasaPublishing.c" +#line 3125 "PicasaPublishing.c" } } @@ -3158,37 +3157,37 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 3134 "PicasaPublishing.c" +#line 3133 "PicasaPublishing.c" } static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 3141 "PicasaPublishing.c" +#line 3140 "PicasaPublishing.c" PublishingPicasaAlbum* object; object = collect_values[0].v_pointer; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3148 "PicasaPublishing.c" +#line 3147 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3152 "PicasaPublishing.c" +#line 3151 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_album_ref (object); -#line 3156 "PicasaPublishing.c" +#line 3155 "PicasaPublishing.c" } else { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 3160 "PicasaPublishing.c" +#line 3159 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 3164 "PicasaPublishing.c" +#line 3163 "PicasaPublishing.c" } @@ -3199,25 +3198,25 @@ static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, gu if (!object_p) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3175 "PicasaPublishing.c" +#line 3174 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 3181 "PicasaPublishing.c" +#line 3180 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 3185 "PicasaPublishing.c" +#line 3184 "PicasaPublishing.c" } else { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_album_ref (value->data[0].v_pointer); -#line 3189 "PicasaPublishing.c" +#line 3188 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 3193 "PicasaPublishing.c" +#line 3192 "PicasaPublishing.c" } @@ -3231,7 +3230,7 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 3207 "PicasaPublishing.c" +#line 3206 "PicasaPublishing.c" } @@ -3240,7 +3239,7 @@ gpointer publishing_picasa_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 3216 "PicasaPublishing.c" +#line 3215 "PicasaPublishing.c" } @@ -3260,17 +3259,17 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_ref (value->data[0].v_pointer); -#line 3236 "PicasaPublishing.c" +#line 3235 "PicasaPublishing.c" } else { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 3240 "PicasaPublishing.c" +#line 3239 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (old); -#line 3246 "PicasaPublishing.c" +#line 3245 "PicasaPublishing.c" } } @@ -3289,17 +3288,17 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 3265 "PicasaPublishing.c" +#line 3264 "PicasaPublishing.c" } else { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 3269 "PicasaPublishing.c" +#line 3268 "PicasaPublishing.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_unref (old); -#line 3275 "PicasaPublishing.c" +#line 3274 "PicasaPublishing.c" } } @@ -3309,14 +3308,14 @@ static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * kla publishing_picasa_album_parent_class = g_type_class_peek_parent (klass); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize; -#line 3285 "PicasaPublishing.c" +#line 3284 "PicasaPublishing.c" } static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 3292 "PicasaPublishing.c" +#line 3291 "PicasaPublishing.c" } @@ -3330,7 +3329,7 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) { _g_free0 (self->name); #line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (self->url); -#line 3306 "PicasaPublishing.c" +#line 3305 "PicasaPublishing.c" } @@ -3355,7 +3354,7 @@ gpointer publishing_picasa_album_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 3331 "PicasaPublishing.c" +#line 3330 "PicasaPublishing.c" } @@ -3368,7 +3367,7 @@ void publishing_picasa_album_unref (gpointer instance) { PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3344 "PicasaPublishing.c" +#line 3343 "PicasaPublishing.c" } } @@ -3384,14 +3383,14 @@ PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_tra self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 3360 "PicasaPublishing.c" +#line 3359 "PicasaPublishing.c" } PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) { #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session); -#line 3367 "PicasaPublishing.c" +#line 3366 "PicasaPublishing.c" } @@ -3419,7 +3418,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES if (g_strcmp0 (_tmp4_, "feed") == 0) { #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = TRUE; -#line 3395 "PicasaPublishing.c" +#line 3394 "PicasaPublishing.c" } else { xmlNode* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -3429,7 +3428,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES _tmp6_ = _tmp5_->name; #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0; -#line 3405 "PicasaPublishing.c" +#line 3404 "PicasaPublishing.c" } #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp2_) { @@ -3437,7 +3436,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES result = NULL; #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 3413 "PicasaPublishing.c" +#line 3412 "PicasaPublishing.c" } else { gchar* _tmp7_ = NULL; #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -3446,7 +3445,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES result = _tmp7_; #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 3422 "PicasaPublishing.c" +#line 3421 "PicasaPublishing.c" } } @@ -3454,7 +3453,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) { #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3430 "PicasaPublishing.c" +#line 3429 "PicasaPublishing.c" } @@ -3504,11 +3503,11 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans if (_tmp3_) { #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = "public"; -#line 3480 "PicasaPublishing.c" +#line 3479 "PicasaPublishing.c" } else { #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1_ = "private"; -#line 3484 "PicasaPublishing.c" +#line 3483 "PicasaPublishing.c" } #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp4_ = parameters; @@ -3536,21 +3535,21 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans _g_free0 (post_body); #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 3512 "PicasaPublishing.c" +#line 3511 "PicasaPublishing.c" } PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) { #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_album_creation_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, session, parameters); -#line 3519 "PicasaPublishing.c" +#line 3518 "PicasaPublishing.c" } static void publishing_picasa_album_creation_transaction_class_init (PublishingPicasaAlbumCreationTransactionClass * klass) { #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_album_creation_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3526 "PicasaPublishing.c" +#line 3525 "PicasaPublishing.c" } @@ -3573,14 +3572,14 @@ GType publishing_picasa_album_creation_transaction_get_type (void) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3549 "PicasaPublishing.c" +#line 3548 "PicasaPublishing.c" } static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) { #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_publishing_parameters_ref (self) : NULL; -#line 3556 "PicasaPublishing.c" +#line 3555 "PicasaPublishing.c" } @@ -3658,11 +3657,11 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc if (_tmp14_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp12_ = "video/mpeg"; -#line 3634 "PicasaPublishing.c" +#line 3633 "PicasaPublishing.c" } else { #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp12_ = "image/jpeg"; -#line 3638 "PicasaPublishing.c" +#line 3637 "PicasaPublishing.c" } #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp15_ = g_strdup (_tmp12_); @@ -3672,14 +3671,14 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc self->priv->mime_type = _tmp15_; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 3648 "PicasaPublishing.c" +#line 3647 "PicasaPublishing.c" } PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 3655 "PicasaPublishing.c" +#line 3654 "PicasaPublishing.c" } @@ -3690,39 +3689,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 3678 "PicasaPublishing.c" +#line 3677 "PicasaPublishing.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 3686 "PicasaPublishing.c" +#line 3685 "PicasaPublishing.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 3698 "PicasaPublishing.c" +#line 3697 "PicasaPublishing.c" } } @@ -3740,114 +3739,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 3722 "PicasaPublishing.c" +#line 3721 "PicasaPublishing.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 3728 "PicasaPublishing.c" +#line 3727 "PicasaPublishing.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 3732 "PicasaPublishing.c" +#line 3731 "PicasaPublishing.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 3736 "PicasaPublishing.c" +#line 3735 "PicasaPublishing.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 3748 "PicasaPublishing.c" +#line 3747 "PicasaPublishing.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 3758 "PicasaPublishing.c" +#line 3757 "PicasaPublishing.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 3764 "PicasaPublishing.c" +#line 3763 "PicasaPublishing.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 3778 "PicasaPublishing.c" +#line 3777 "PicasaPublishing.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 3788 "PicasaPublishing.c" +#line 3787 "PicasaPublishing.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 3794 "PicasaPublishing.c" +#line 3793 "PicasaPublishing.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 3803 "PicasaPublishing.c" +#line 3802 "PicasaPublishing.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 3823 "PicasaPublishing.c" +#line 3822 "PicasaPublishing.c" } @@ -3858,74 +3857,74 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; -#line 3840 "PicasaPublishing.c" +#line 3839 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 3850 "PicasaPublishing.c" +#line 3849 "PicasaPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 3860 "PicasaPublishing.c" +#line 3859 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3866 "PicasaPublishing.c" +#line 3865 "PicasaPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 3877 "PicasaPublishing.c" +#line 3876 "PicasaPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 3889 "PicasaPublishing.c" +#line 3888 "PicasaPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 3893 "PicasaPublishing.c" +#line 3892 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 3897 "PicasaPublishing.c" +#line 3896 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 3901 "PicasaPublishing.c" +#line 3900 "PicasaPublishing.c" gint i = 0; gsize len = 0UL; gint _tmp31_ = 0; @@ -3946,18 +3945,18 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 3924 "PicasaPublishing.c" +#line 3923 "PicasaPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 3933 "PicasaPublishing.c" +#line 3932 "PicasaPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; gchar** _tmp13_ = NULL; @@ -3968,192 +3967,192 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 3946 "PicasaPublishing.c" +#line 3945 "PicasaPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 3952 "PicasaPublishing.c" +#line 3951 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 3962 "PicasaPublishing.c" +#line 3961 "PicasaPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 3974 "PicasaPublishing.c" +#line 3973 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 3978 "PicasaPublishing.c" +#line 3977 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 3984 "PicasaPublishing.c" +#line 3983 "PicasaPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 3995 "PicasaPublishing.c" +#line 3994 "PicasaPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 4010 "PicasaPublishing.c" +#line 4009 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 4014 "PicasaPublishing.c" +#line 4013 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 4018 "PicasaPublishing.c" +#line 4017 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 4024 "PicasaPublishing.c" +#line 4023 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 4036 "PicasaPublishing.c" +#line 4035 "PicasaPublishing.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 4057 "PicasaPublishing.c" +#line 4056 "PicasaPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 4061 "PicasaPublishing.c" +#line 4060 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 4067 "PicasaPublishing.c" +#line 4066 "PicasaPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 4074 "PicasaPublishing.c" +#line 4073 "PicasaPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4082 "PicasaPublishing.c" +#line 4081 "PicasaPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 4120 "PicasaPublishing.c" +#line 4119 "PicasaPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 4129 "PicasaPublishing.c" +#line 4128 "PicasaPublishing.c" gint _tmp48_ = 0; gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; @@ -4167,96 +4166,96 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 4145 "PicasaPublishing.c" +#line 4144 "PicasaPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 4151 "PicasaPublishing.c" +#line 4150 "PicasaPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 4165 "PicasaPublishing.c" +#line 4164 "PicasaPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 4185 "PicasaPublishing.c" +#line 4184 "PicasaPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 4200 "PicasaPublishing.c" +#line 4199 "PicasaPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 4204 "PicasaPublishing.c" +#line 4203 "PicasaPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 4212 "PicasaPublishing.c" +#line 4211 "PicasaPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4223 "PicasaPublishing.c" +#line 4222 "PicasaPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 4232 "PicasaPublishing.c" +#line 4231 "PicasaPublishing.c" } } @@ -4273,62 +4272,55 @@ 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 4277 "PicasaPublishing.c" +#line 4276 "PicasaPublishing.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 4283 "PicasaPublishing.c" -} - - -static guint8* _vala_array_dup5 (guint8* self, int length) { -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 4290 "PicasaPublishing.c" +#line 4282 "PicasaPublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 4297 "PicasaPublishing.c" +#line 4289 "PicasaPublishing.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 4304 "PicasaPublishing.c" +#line 4296 "PicasaPublishing.c" } @@ -4368,40 +4360,38 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup gint _tmp61__length1 = 0; guint8* _tmp62_ = NULL; gint _tmp62__length1 = 0; - guint8* _tmp63_ = NULL; - gint _tmp63__length1 = 0; - SoupBuffer* _tmp64_ = NULL; - SoupMultipart* _tmp65_ = NULL; - SoupBuffer* _tmp66_ = NULL; + SoupBuffer* _tmp63_ = NULL; + SoupMultipart* _tmp64_ = NULL; + SoupBuffer* _tmp65_ = NULL; guint8* photo_data = NULL; - GMappedFile* _tmp88_ = NULL; - gchar* _tmp89_ = NULL; + GMappedFile* _tmp87_ = NULL; + gchar* _tmp88_ = NULL; gint photo_data_length1 = 0; gint _photo_data_size_ = 0; - GMappedFile* _tmp90_ = NULL; - gsize _tmp91_ = 0UL; - gint _tmp92_ = 0; + GMappedFile* _tmp89_ = NULL; + gsize _tmp90_ = 0UL; + gint _tmp91_ = 0; SoupBuffer* bindable_data = NULL; - SoupBuffer* _tmp93_ = NULL; - SoupMultipart* _tmp94_ = NULL; - SpitPublishingPublishable* _tmp95_ = NULL; + SoupBuffer* _tmp92_ = NULL; + SoupMultipart* _tmp93_ = NULL; + SpitPublishingPublishable* _tmp94_ = NULL; + GFile* _tmp95_ = NULL; GFile* _tmp96_ = NULL; - GFile* _tmp97_ = NULL; + gchar* _tmp97_ = NULL; gchar* _tmp98_ = NULL; - gchar* _tmp99_ = NULL; - const gchar* _tmp100_ = NULL; + const gchar* _tmp99_ = NULL; SoupMessage* outbound_message = NULL; + gchar* _tmp100_ = NULL; gchar* _tmp101_ = NULL; - gchar* _tmp102_ = NULL; - SoupMultipart* _tmp103_ = NULL; + SoupMultipart* _tmp102_ = NULL; + SoupMessage* _tmp103_ = NULL; SoupMessage* _tmp104_ = NULL; - SoupMessage* _tmp105_ = NULL; - SoupMessageHeaders* _tmp106_ = NULL; - PublishingRESTSupportGoogleSession* _tmp107_ = NULL; + SoupMessageHeaders* _tmp105_ = NULL; + PublishingRESTSupportGoogleSession* _tmp106_ = NULL; + gchar* _tmp107_ = NULL; gchar* _tmp108_ = NULL; gchar* _tmp109_ = NULL; gchar* _tmp110_ = NULL; - gchar* _tmp111_ = NULL; GError * _inner_error_ = NULL; #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction); @@ -4425,7 +4415,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (_tmp4_); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp5_) { -#line 4401 "PicasaPublishing.c" +#line 4391 "PicasaPublishing.c" SpitPublishingPublishable* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -4452,7 +4442,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (_tmp10_); #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp8_); -#line 4428 "PicasaPublishing.c" +#line 4418 "PicasaPublishing.c" } #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp12_ = self->priv->publishable; @@ -4474,7 +4464,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp16__length1 = keywords_length1; #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp16__length1 > 0) { -#line 4450 "PicasaPublishing.c" +#line 4440 "PicasaPublishing.c" const gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; const gchar* _tmp49_ = NULL; @@ -4483,14 +4473,14 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup gint i = 0; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = 0; -#line 4459 "PicasaPublishing.c" +#line 4449 "PicasaPublishing.c" { gboolean _tmp17_ = FALSE; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = TRUE; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 4466 "PicasaPublishing.c" +#line 4456 "PicasaPublishing.c" gint _tmp19_ = 0; gchar** _tmp20_ = NULL; gint _tmp20__length1 = 0; @@ -4507,13 +4497,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup gint _tmp39_ = 0; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp17_) { -#line 4483 "PicasaPublishing.c" +#line 4473 "PicasaPublishing.c" gint _tmp18_ = 0; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp18_ = i; #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = _tmp18_ + 1; -#line 4489 "PicasaPublishing.c" +#line 4479 "PicasaPublishing.c" } #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp17_ = FALSE; @@ -4527,7 +4517,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup if (!(_tmp19_ < _tmp20__length1)) { #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 4503 "PicasaPublishing.c" +#line 4493 "PicasaPublishing.c" } #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp21_ = keywords; @@ -4541,7 +4531,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp24_ = g_str_has_prefix (_tmp23_, "/"); #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp24_) { -#line 4517 "PicasaPublishing.c" +#line 4507 "PicasaPublishing.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; @@ -4574,7 +4564,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp_size_ = tmp_length1; #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp29_); -#line 4550 "PicasaPublishing.c" +#line 4540 "PicasaPublishing.c" } else { gchar** _tmp32_ = NULL; gint _tmp32__length1 = 0; @@ -4600,7 +4590,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup tmp_length1 = _vala_array_length (_tmp35_); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp_size_ = tmp_length1; -#line 4576 "PicasaPublishing.c" +#line 4566 "PicasaPublishing.c" } #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp37_ = keywords_string; @@ -4610,7 +4600,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _tmp39_ = _tmp38_; #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp39_ > 0) { -#line 4586 "PicasaPublishing.c" +#line 4576 "PicasaPublishing.c" const gchar* _tmp40_ = NULL; gchar** _tmp41_ = NULL; gint _tmp41__length1 = 0; @@ -4635,7 +4625,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup keywords_string = _tmp44_; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (_tmp43_); -#line 4611 "PicasaPublishing.c" +#line 4601 "PicasaPublishing.c" } else { gchar** _tmp45_ = NULL; gint _tmp45__length1 = 0; @@ -4650,11 +4640,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (keywords_string); #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" keywords_string = _tmp46_; -#line 4626 "PicasaPublishing.c" +#line 4616 "PicasaPublishing.c" } #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL); -#line 4630 "PicasaPublishing.c" +#line 4620 "PicasaPublishing.c" } } } @@ -4674,7 +4664,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (keywords_string); #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" keywords_string = _tmp50_; -#line 4650 "PicasaPublishing.c" +#line 4640 "PicasaPublishing.c" } #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp51_ = self->priv->publishable; @@ -4709,55 +4699,51 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp62__length1 = _tmp61__length1; #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp63_ = (_tmp62_ != NULL) ? _vala_array_dup5 (_tmp62_, _tmp62__length1) : ((gpointer) _tmp62_); -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp63__length1 = _tmp62__length1; + _tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1); #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp64_ = soup_buffer_new_take (_tmp63_, _tmp63__length1); -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - metadata_buffer = _tmp64_; + metadata_buffer = _tmp63_; #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp65_ = message_parts; + _tmp64_ = message_parts; #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp66_ = metadata_buffer; + _tmp65_ = metadata_buffer; #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - soup_multipart_append_form_file (_tmp65_, "", "", "application/atom+xml", _tmp66_); -#line 4698 "PicasaPublishing.c" + soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_); +#line 4684 "PicasaPublishing.c" { - GMappedFile* _tmp67_ = NULL; - SpitPublishingPublishable* _tmp68_ = NULL; + GMappedFile* _tmp66_ = NULL; + SpitPublishingPublishable* _tmp67_ = NULL; + GFile* _tmp68_ = NULL; GFile* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; + gchar* _tmp70_ = NULL; gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; + GMappedFile* _tmp72_ = NULL; GMappedFile* _tmp73_ = NULL; GMappedFile* _tmp74_ = NULL; - GMappedFile* _tmp75_ = NULL; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp68_ = self->priv->publishable; + _tmp67_ = self->priv->publishable; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_); + _tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp70_ = _tmp69_; + _tmp69_ = _tmp68_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp71_ = g_file_get_path (_tmp70_); + _tmp70_ = g_file_get_path (_tmp69_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp72_ = _tmp71_; + _tmp71_ = _tmp70_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp73_ = g_mapped_file_new (_tmp72_, FALSE, &_inner_error_); + _tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp74_ = _tmp73_; + _tmp73_ = _tmp72_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp72_); + _g_free0 (_tmp71_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_object_unref0 (_tmp70_); + _g_object_unref0 (_tmp69_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp67_ = _tmp74_; + _tmp66_ = _tmp73_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 4733 "PicasaPublishing.c" +#line 4719 "PicasaPublishing.c" goto __catch14_g_file_error; } #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -4778,80 +4764,80 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4754 "PicasaPublishing.c" +#line 4740 "PicasaPublishing.c" } #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp75_ = _tmp67_; + _tmp74_ = _tmp66_; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp67_ = NULL; + _tmp66_ = NULL; #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_mapped_file_unref0 (self->priv->mapped_file); #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - self->priv->mapped_file = _tmp75_; + self->priv->mapped_file = _tmp74_; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_mapped_file_unref0 (_tmp67_); -#line 4766 "PicasaPublishing.c" + _g_mapped_file_unref0 (_tmp66_); +#line 4752 "PicasaPublishing.c" } goto __finally14; __catch14_g_file_error: { GError* e = NULL; gchar* msg = NULL; - SpitPublishingPublishable* _tmp76_ = NULL; + SpitPublishingPublishable* _tmp75_ = NULL; + GFile* _tmp76_ = NULL; GFile* _tmp77_ = NULL; - GFile* _tmp78_ = NULL; + gchar* _tmp78_ = NULL; gchar* _tmp79_ = NULL; - gchar* _tmp80_ = NULL; - GError* _tmp81_ = NULL; - const gchar* _tmp82_ = NULL; + GError* _tmp80_ = NULL; + const gchar* _tmp81_ = NULL; + gchar* _tmp82_ = NULL; gchar* _tmp83_ = NULL; - gchar* _tmp84_ = NULL; + const gchar* _tmp84_ = NULL; const gchar* _tmp85_ = NULL; - const gchar* _tmp86_ = NULL; - GError* _tmp87_ = NULL; + GError* _tmp86_ = NULL; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" e = _inner_error_; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _inner_error_ = NULL; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp76_ = self->priv->publishable; + _tmp75_ = self->priv->publishable; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp77_ = spit_publishing_publishable_get_serialized_file (_tmp76_); + _tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp78_ = _tmp77_; + _tmp77_ = _tmp76_; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp79_ = g_file_get_path (_tmp78_); + _tmp78_ = g_file_get_path (_tmp77_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp80_ = _tmp79_; + _tmp79_ = _tmp78_; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp81_ = e; + _tmp80_ = e; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp82_ = _tmp81_->message; + _tmp81_ = _tmp80_->message; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp83_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp80_, _tmp82_); + _tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp84_ = _tmp83_; + _tmp83_ = _tmp82_; #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp80_); + _g_free0 (_tmp79_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_object_unref0 (_tmp78_); + _g_object_unref0 (_tmp77_); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - msg = _tmp84_; + msg = _tmp83_; #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp85_ = msg; + _tmp84_ = msg; #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - g_warning ("PicasaPublishing.vala:574: %s", _tmp85_); + g_warning ("PicasaPublishing.vala:574: %s", _tmp84_); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp86_ = msg; + _tmp85_ = msg; #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp87_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp86_); + _tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _inner_error_ = _tmp87_; + _inner_error_ = _tmp86_; #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (msg); #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_error_free0 (e); -#line 4827 "PicasaPublishing.c" +#line 4813 "PicasaPublishing.c" goto __finally14; } __finally14: @@ -4875,7 +4861,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup __vala_SoupMultipart_free0 (message_parts); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4851 "PicasaPublishing.c" +#line 4837 "PicasaPublishing.c" } else { #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" __vala_SoupBuffer_free0 (metadata_buffer); @@ -4895,83 +4881,83 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4871 "PicasaPublishing.c" +#line 4857 "PicasaPublishing.c" } } #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp88_ = self->priv->mapped_file; + _tmp87_ = self->priv->mapped_file; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp89_ = g_mapped_file_get_contents (_tmp88_); + _tmp88_ = g_mapped_file_get_contents (_tmp87_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - photo_data = (guint8*) _tmp89_; + photo_data = (guint8*) _tmp88_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" photo_data_length1 = -1; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _photo_data_size_ = photo_data_length1; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp90_ = self->priv->mapped_file; + _tmp89_ = self->priv->mapped_file; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp91_ = g_mapped_file_get_length (_tmp90_); + _tmp90_ = g_mapped_file_get_length (_tmp89_); #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - photo_data_length1 = (gint) _tmp91_; + photo_data_length1 = (gint) _tmp90_; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp92_ = photo_data_length1; + _tmp91_ = photo_data_length1; #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp93_ = soup_buffer_new_with_owner (photo_data, photo_data_length1, self, NULL); + _tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1); #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - bindable_data = _tmp93_; + bindable_data = _tmp92_; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp94_ = message_parts; + _tmp93_ = message_parts; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp95_ = self->priv->publishable; + _tmp94_ = self->priv->publishable; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp96_ = spit_publishing_publishable_get_serialized_file (_tmp95_); + _tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp97_ = _tmp96_; + _tmp96_ = _tmp95_; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp98_ = g_file_get_path (_tmp97_); + _tmp97_ = g_file_get_path (_tmp96_); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp99_ = _tmp98_; + _tmp98_ = _tmp97_; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp100_ = self->priv->mime_type; + _tmp99_ = self->priv->mime_type; #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - soup_multipart_append_form_file (_tmp94_, "", _tmp99_, _tmp100_, bindable_data); + soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp99_); + _g_free0 (_tmp98_); #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_object_unref0 (_tmp97_); + _g_object_unref0 (_tmp96_); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp101_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp102_ = _tmp101_; + _tmp101_ = _tmp100_; #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp103_ = message_parts; + _tmp102_ = message_parts; #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp104_ = soup_form_request_new_from_multipart (_tmp102_, _tmp103_); + _tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp105_ = _tmp104_; + _tmp104_ = _tmp103_; #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp102_); + _g_free0 (_tmp101_); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - outbound_message = _tmp105_; + outbound_message = _tmp104_; #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp106_ = outbound_message->request_headers; + _tmp105_ = outbound_message->request_headers; #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp107_ = self->priv->session; + _tmp106_ = self->priv->session; #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp108_ = publishing_rest_support_google_session_get_access_token (_tmp107_); + _tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_); #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp109_ = _tmp108_; + _tmp108_ = _tmp107_; #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp110_ = g_strconcat ("Bearer ", _tmp109_, NULL); + _tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL); #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp111_ = _tmp110_; + _tmp110_ = _tmp109_; #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - soup_message_headers_append (_tmp106_, "Authorization", _tmp111_); + soup_message_headers_append (_tmp105_, "Authorization", _tmp110_); #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp111_); + _g_free0 (_tmp110_); #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _g_free0 (_tmp109_); + _g_free0 (_tmp108_); #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message); #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5002,7 +4988,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup __vala_SoupMultipart_free0 (message_parts); #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 4978 "PicasaPublishing.c" +#line 4964 "PicasaPublishing.c" } else { #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_object_unref0 (outbound_message); @@ -5026,7 +5012,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return; -#line 5002 "PicasaPublishing.c" +#line 4988 "PicasaPublishing.c" } } #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5045,7 +5031,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup _g_free0 (summary); #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" __vala_SoupMultipart_free0 (message_parts); -#line 5021 "PicasaPublishing.c" +#line 5007 "PicasaPublishing.c" } @@ -5058,14 +5044,14 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate)); #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute; -#line 5034 "PicasaPublishing.c" +#line 5020 "PicasaPublishing.c" } static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) { #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 5041 "PicasaPublishing.c" +#line 5027 "PicasaPublishing.c" } @@ -5085,7 +5071,7 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport _g_mapped_file_unref0 (self->priv->mapped_file); #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj); -#line 5061 "PicasaPublishing.c" +#line 5047 "PicasaPublishing.c" } @@ -5104,42 +5090,42 @@ GType publishing_picasa_upload_transaction_get_type (void) { static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) { #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL; -#line 5080 "PicasaPublishing.c" +#line 5066 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 5087 "PicasaPublishing.c" +#line 5073 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_create_new_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 5094 "PicasaPublishing.c" +#line 5080 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_new_album_entry_changed ((PublishingPicasaPublishingOptionsPane*) self); -#line 5101 "PicasaPublishing.c" +#line 5087 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 5108 "PicasaPublishing.c" +#line 5094 "PicasaPublishing.c" } static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self); -#line 5115 "PicasaPublishing.c" +#line 5101 "PicasaPublishing.c" } @@ -5411,7 +5397,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp58_ = publishing_picasa_publishing_parameters_get_media_type (_tmp57_); #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if ((_tmp58_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) { -#line 5387 "PicasaPublishing.c" +#line 5373 "PicasaPublishing.c" GtkLabel* _tmp59_ = NULL; const gchar* _tmp60_ = NULL; GtkComboBoxText* _tmp61_ = NULL; @@ -5430,7 +5416,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp62_ = self->priv->size_combo; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 5406 "PicasaPublishing.c" +#line 5392 "PicasaPublishing.c" } else { GtkLabel* _tmp63_ = NULL; const gchar* _tmp64_ = NULL; @@ -5451,7 +5437,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp65_ = self->priv->size_descriptions; #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp65__length1 = self->priv->size_descriptions_length1; -#line 5427 "PicasaPublishing.c" +#line 5413 "PicasaPublishing.c" { PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL; gint desc_collection_length1 = 0; @@ -5463,14 +5449,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane desc_collection_length1 = _tmp65__length1; #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (desc_it = 0; desc_it < _tmp65__length1; desc_it = desc_it + 1) { -#line 5439 "PicasaPublishing.c" +#line 5425 "PicasaPublishing.c" PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp66_ = NULL; PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL; #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp66_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]); #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" desc = _tmp66_; -#line 5446 "PicasaPublishing.c" +#line 5432 "PicasaPublishing.c" { GtkComboBoxText* _tmp67_ = NULL; PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL; @@ -5485,7 +5471,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane gtk_combo_box_text_append_text (_tmp67_, _tmp69_); #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _publishing_picasa_publishing_options_pane_size_description_unref0 (desc); -#line 5461 "PicasaPublishing.c" +#line 5447 "PicasaPublishing.c" } } } @@ -5505,7 +5491,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane _tmp74_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp73_); #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), _tmp74_); -#line 5481 "PicasaPublishing.c" +#line 5467 "PicasaPublishing.c" } #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp75_ = self->priv->use_existing_radio; @@ -5529,14 +5515,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane g_signal_connect_object (_tmp79_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 5505 "PicasaPublishing.c" +#line 5491 "PicasaPublishing.c" } PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters); -#line 5512 "PicasaPublishing.c" +#line 5498 "PicasaPublishing.c" } @@ -5572,7 +5558,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp2_ >= 0) { -#line 5548 "PicasaPublishing.c" +#line 5534 "PicasaPublishing.c" GtkComboBoxText* _tmp3_ = NULL; gint _tmp4_ = 0; #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5581,11 +5567,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis _tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox)); #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _tmp4_; -#line 5557 "PicasaPublishing.c" +#line 5543 "PicasaPublishing.c" } else { #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = 0; -#line 5561 "PicasaPublishing.c" +#line 5547 "PicasaPublishing.c" } #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" size_combo_last_active = _tmp0_; @@ -5633,7 +5619,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis _tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp19_) { -#line 5609 "PicasaPublishing.c" +#line 5595 "PicasaPublishing.c" PublishingPicasaPublishingParameters* _tmp20_ = NULL; GtkEntry* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; @@ -5663,7 +5649,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis publishing_picasa_publishing_parameters_set_is_new_album_public (_tmp24_, _tmp26_); #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_emit_by_name (self, "publish"); -#line 5639 "PicasaPublishing.c" +#line 5625 "PicasaPublishing.c" } else { PublishingPicasaPublishingParameters* _tmp27_ = NULL; PublishingPicasaAlbum** _tmp28_ = NULL; @@ -5718,11 +5704,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp34_, _tmp39_); #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_emit_by_name (self, "publish"); -#line 5694 "PicasaPublishing.c" +#line 5680 "PicasaPublishing.c" } #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 5698 "PicasaPublishing.c" +#line 5684 "PicasaPublishing.c" } @@ -5751,7 +5737,7 @@ static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clic _tmp3_ = self->priv->public_check; #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 5727 "PicasaPublishing.c" +#line 5713 "PicasaPublishing.c" } @@ -5780,7 +5766,7 @@ static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicke _tmp3_ = self->priv->public_check; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 5756 "PicasaPublishing.c" +#line 5742 "PicasaPublishing.c" } @@ -5789,7 +5775,7 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self)); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 5765 "PicasaPublishing.c" +#line 5751 "PicasaPublishing.c" } @@ -5798,21 +5784,21 @@ static gchar* string_strip (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 5788 "PicasaPublishing.c" +#line 5774 "PicasaPublishing.c" } @@ -5849,7 +5835,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens _g_free0 (_tmp6_); #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp7_) { -#line 5825 "PicasaPublishing.c" +#line 5811 "PicasaPublishing.c" GtkRadioButton* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -5858,11 +5844,11 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp3_ = _tmp9_; -#line 5834 "PicasaPublishing.c" +#line 5820 "PicasaPublishing.c" } else { #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp3_ = FALSE; -#line 5838 "PicasaPublishing.c" +#line 5824 "PicasaPublishing.c" } #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp10_ = self->priv->publish_button; @@ -5870,7 +5856,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (album_name); -#line 5846 "PicasaPublishing.c" +#line 5832 "PicasaPublishing.c" } @@ -5879,7 +5865,7 @@ static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self)); #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self); -#line 5855 "PicasaPublishing.c" +#line 5841 "PicasaPublishing.c" } @@ -5890,13 +5876,13 @@ static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescript *size = (*size) ? (2 * (*size)) : 4; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5866 "PicasaPublishing.c" +#line 5852 "PicasaPublishing.c" } #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5872 "PicasaPublishing.c" +#line 5858 "PicasaPublishing.c" } @@ -5907,13 +5893,13 @@ static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescript *size = (*size) ? (2 * (*size)) : 4; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5883 "PicasaPublishing.c" +#line 5869 "PicasaPublishing.c" } #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5889 "PicasaPublishing.c" +#line 5875 "PicasaPublishing.c" } @@ -5924,13 +5910,13 @@ static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescript *size = (*size) ? (2 * (*size)) : 4; #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5900 "PicasaPublishing.c" +#line 5886 "PicasaPublishing.c" } #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5906 "PicasaPublishing.c" +#line 5892 "PicasaPublishing.c" } @@ -5941,13 +5927,13 @@ static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescript *size = (*size) ? (2 * (*size)) : 4; #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5917 "PicasaPublishing.c" +#line 5903 "PicasaPublishing.c" } #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5923 "PicasaPublishing.c" +#line 5909 "PicasaPublishing.c" } @@ -5958,13 +5944,13 @@ static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescript *size = (*size) ? (2 * (*size)) : 4; #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1); -#line 5934 "PicasaPublishing.c" +#line 5920 "PicasaPublishing.c" } #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[(*length)++] = value; #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" (*array)[*length] = NULL; -#line 5940 "PicasaPublishing.c" +#line 5926 "PicasaPublishing.c" } @@ -6064,13 +6050,13 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_ if (result_length1) { #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *result_length1 = _tmp16__length1; -#line 6040 "PicasaPublishing.c" +#line 6026 "PicasaPublishing.c" } #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = _tmp16_; #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6046 "PicasaPublishing.c" +#line 6032 "PicasaPublishing.c" } @@ -6107,19 +6093,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis albums_length1 = _tmp3_; #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _albums_size_ = albums_length1; -#line 6083 "PicasaPublishing.c" +#line 6069 "PicasaPublishing.c" { gint i = 0; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = 0; -#line 6088 "PicasaPublishing.c" +#line 6074 "PicasaPublishing.c" { gboolean _tmp5_ = FALSE; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = TRUE; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" while (TRUE) { -#line 6095 "PicasaPublishing.c" +#line 6081 "PicasaPublishing.c" gint _tmp7_ = 0; PublishingPicasaAlbum** _tmp8_ = NULL; gint _tmp8__length1 = 0; @@ -6138,13 +6124,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis const gchar* _tmp19_ = NULL; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!_tmp5_) { -#line 6114 "PicasaPublishing.c" +#line 6100 "PicasaPublishing.c" gint _tmp6_ = 0; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp6_ = i; #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" i = _tmp6_ + 1; -#line 6120 "PicasaPublishing.c" +#line 6106 "PicasaPublishing.c" } #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp5_ = FALSE; @@ -6158,7 +6144,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis if (!(_tmp7_ < _tmp8__length1)) { #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" break; -#line 6134 "PicasaPublishing.c" +#line 6120 "PicasaPublishing.c" } #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp9_ = self->priv->existing_albums_combo; @@ -6190,7 +6176,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis if (g_strcmp0 (_tmp18_, _tmp19_) == 0) { #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = TRUE; -#line 6166 "PicasaPublishing.c" +#line 6152 "PicasaPublishing.c" } else { gboolean _tmp20_ = FALSE; PublishingPicasaAlbum** _tmp21_ = NULL; @@ -6210,31 +6196,31 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis _tmp24_ = _tmp23_->name; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (g_strcmp0 (_tmp24_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) { -#line 6186 "PicasaPublishing.c" +#line 6172 "PicasaPublishing.c" gint _tmp25_ = 0; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp25_ = default_album_id; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp20_ = _tmp25_ == -1; -#line 6192 "PicasaPublishing.c" +#line 6178 "PicasaPublishing.c" } else { #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp20_ = FALSE; -#line 6196 "PicasaPublishing.c" +#line 6182 "PicasaPublishing.c" } #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp14_ = _tmp20_; -#line 6200 "PicasaPublishing.c" +#line 6186 "PicasaPublishing.c" } #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp14_) { -#line 6204 "PicasaPublishing.c" +#line 6190 "PicasaPublishing.c" gint _tmp26_ = 0; #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp26_ = i; #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" default_album_id = _tmp26_; -#line 6210 "PicasaPublishing.c" +#line 6196 "PicasaPublishing.c" } } } @@ -6245,7 +6231,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis _tmp27__length1 = albums_length1; #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp27__length1 == 0) { -#line 6221 "PicasaPublishing.c" +#line 6207 "PicasaPublishing.c" GtkComboBoxText* _tmp28_ = NULL; GtkRadioButton* _tmp29_ = NULL; GtkRadioButton* _tmp30_ = NULL; @@ -6271,14 +6257,14 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis _tmp32_ = self->priv->new_album_entry; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_entry_set_text (_tmp32_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME); -#line 6247 "PicasaPublishing.c" +#line 6233 "PicasaPublishing.c" } else { gint _tmp33_ = 0; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp33_ = default_album_id; #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (_tmp33_ >= 0) { -#line 6254 "PicasaPublishing.c" +#line 6240 "PicasaPublishing.c" GtkRadioButton* _tmp34_ = NULL; GtkComboBoxText* _tmp35_ = NULL; gint _tmp36_ = 0; @@ -6302,7 +6288,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis _tmp38_ = self->priv->public_check; #line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 6278 "PicasaPublishing.c" +#line 6264 "PicasaPublishing.c" } else { GtkRadioButton* _tmp39_ = NULL; GtkComboBoxText* _tmp40_ = NULL; @@ -6329,7 +6315,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis _tmp43_ = self->priv->public_check; #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 6305 "PicasaPublishing.c" +#line 6291 "PicasaPublishing.c" } } #line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -6338,7 +6324,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (last_album); -#line 6314 "PicasaPublishing.c" +#line 6300 "PicasaPublishing.c" } @@ -6357,7 +6343,7 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6333 "PicasaPublishing.c" +#line 6319 "PicasaPublishing.c" } @@ -6370,7 +6356,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6346 "PicasaPublishing.c" +#line 6332 "PicasaPublishing.c" } @@ -6380,7 +6366,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_installed (Sp self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_installed (self); -#line 6356 "PicasaPublishing.c" +#line 6342 "PicasaPublishing.c" } @@ -6388,7 +6374,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled ( PublishingPicasaPublishingOptionsPane * self; #line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane); -#line 6364 "PicasaPublishing.c" +#line 6350 "PicasaPublishing.c" } @@ -6415,21 +6401,21 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p self->major_axis_pixels = _tmp2_; #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 6391 "PicasaPublishing.c" +#line 6377 "PicasaPublishing.c" } static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) { #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels); -#line 6398 "PicasaPublishing.c" +#line 6384 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6405 "PicasaPublishing.c" +#line 6391 "PicasaPublishing.c" } @@ -6438,7 +6424,7 @@ static void publishing_picasa_publishing_options_pane_value_size_description_fre if (value->data[0].v_pointer) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer); -#line 6414 "PicasaPublishing.c" +#line 6400 "PicasaPublishing.c" } } @@ -6448,11 +6434,11 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop if (src_value->data[0].v_pointer) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer); -#line 6424 "PicasaPublishing.c" +#line 6410 "PicasaPublishing.c" } else { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6428 "PicasaPublishing.c" +#line 6414 "PicasaPublishing.c" } } @@ -6460,37 +6446,37 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 6436 "PicasaPublishing.c" +#line 6422 "PicasaPublishing.c" } static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 6443 "PicasaPublishing.c" +#line 6429 "PicasaPublishing.c" PublishingPicasaPublishingOptionsPaneSizeDescription* object; object = collect_values[0].v_pointer; #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6450 "PicasaPublishing.c" +#line 6436 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6454 "PicasaPublishing.c" +#line 6440 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object); -#line 6458 "PicasaPublishing.c" +#line 6444 "PicasaPublishing.c" } else { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6462 "PicasaPublishing.c" +#line 6448 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 6466 "PicasaPublishing.c" +#line 6452 "PicasaPublishing.c" } @@ -6501,25 +6487,25 @@ static gchar* publishing_picasa_publishing_options_pane_value_size_description_l if (!object_p) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 6477 "PicasaPublishing.c" +#line 6463 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 6483 "PicasaPublishing.c" +#line 6469 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 6487 "PicasaPublishing.c" +#line 6473 "PicasaPublishing.c" } else { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer); -#line 6491 "PicasaPublishing.c" +#line 6477 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 6495 "PicasaPublishing.c" +#line 6481 "PicasaPublishing.c" } @@ -6533,7 +6519,7 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des G_PARAM_SPEC (spec)->value_type = object_type; #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 6509 "PicasaPublishing.c" +#line 6495 "PicasaPublishing.c" } @@ -6542,7 +6528,7 @@ static gpointer publishing_picasa_publishing_options_pane_value_get_size_descrip g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 6518 "PicasaPublishing.c" +#line 6504 "PicasaPublishing.c" } @@ -6562,17 +6548,17 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description value->data[0].v_pointer = v_object; #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer); -#line 6538 "PicasaPublishing.c" +#line 6524 "PicasaPublishing.c" } else { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6542 "PicasaPublishing.c" +#line 6528 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (old); -#line 6548 "PicasaPublishing.c" +#line 6534 "PicasaPublishing.c" } } @@ -6591,17 +6577,17 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 6567 "PicasaPublishing.c" +#line 6553 "PicasaPublishing.c" } else { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 6571 "PicasaPublishing.c" +#line 6557 "PicasaPublishing.c" } #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_options_pane_size_description_unref (old); -#line 6577 "PicasaPublishing.c" +#line 6563 "PicasaPublishing.c" } } @@ -6611,14 +6597,14 @@ static void publishing_picasa_publishing_options_pane_size_description_class_ini publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize; -#line 6587 "PicasaPublishing.c" +#line 6573 "PicasaPublishing.c" } static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) { #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 6594 "PicasaPublishing.c" +#line 6580 "PicasaPublishing.c" } @@ -6630,7 +6616,7 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize g_signal_handlers_destroy (self); #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _g_free0 (self->name); -#line 6606 "PicasaPublishing.c" +#line 6592 "PicasaPublishing.c" } @@ -6655,7 +6641,7 @@ static gpointer publishing_picasa_publishing_options_pane_size_description_ref ( g_atomic_int_inc (&self->ref_count); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 6631 "PicasaPublishing.c" +#line 6617 "PicasaPublishing.c" } @@ -6668,7 +6654,7 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 6644 "PicasaPublishing.c" +#line 6630 "PicasaPublishing.c" } } @@ -6684,7 +6670,7 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 6660 "PicasaPublishing.c" +#line 6646 "PicasaPublishing.c" } @@ -6699,7 +6685,7 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled; -#line 6675 "PicasaPublishing.c" +#line 6661 "PicasaPublishing.c" } @@ -6732,7 +6718,7 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP self->priv->publish_button = NULL; #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->logout_button = NULL; -#line 6708 "PicasaPublishing.c" +#line 6694 "PicasaPublishing.c" } @@ -6772,7 +6758,7 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) { _publishing_picasa_publishing_parameters_unref0 (self->priv->parameters); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj); -#line 6748 "PicasaPublishing.c" +#line 6734 "PicasaPublishing.c" } @@ -6831,14 +6817,14 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co self->priv->to_new_album = TRUE; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 6807 "PicasaPublishing.c" +#line 6793 "PicasaPublishing.c" } PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) { #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS); -#line 6814 "PicasaPublishing.c" +#line 6800 "PicasaPublishing.c" } @@ -6853,7 +6839,7 @@ gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPica result = _tmp0_; #line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6829 "PicasaPublishing.c" +#line 6815 "PicasaPublishing.c" } @@ -6865,7 +6851,7 @@ void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPica _tmp0_ = to_new_album; #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->to_new_album = _tmp0_; -#line 6841 "PicasaPublishing.c" +#line 6827 "PicasaPublishing.c" } @@ -6877,7 +6863,7 @@ void publishing_picasa_publishing_parameters_set_is_new_album_public (Publishing _tmp0_ = album_public; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->album_public = _tmp0_; -#line 6853 "PicasaPublishing.c" +#line 6839 "PicasaPublishing.c" } @@ -6892,7 +6878,7 @@ gboolean publishing_picasa_publishing_parameters_is_new_album_public (Publishing result = _tmp0_; #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6868 "PicasaPublishing.c" +#line 6854 "PicasaPublishing.c" } @@ -6910,7 +6896,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing result = _tmp1_; #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6886 "PicasaPublishing.c" +#line 6872 "PicasaPublishing.c" } @@ -6929,7 +6915,7 @@ void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPi _g_free0 (self->priv->target_album_name); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->target_album_name = _tmp1_; -#line 6905 "PicasaPublishing.c" +#line 6891 "PicasaPublishing.c" } @@ -6948,7 +6934,7 @@ void publishing_picasa_publishing_parameters_set_target_album_entry_url (Publish _g_free0 (self->priv->target_album_url); #line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->target_album_url = _tmp1_; -#line 6924 "PicasaPublishing.c" +#line 6910 "PicasaPublishing.c" } @@ -6966,20 +6952,20 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi result = _tmp1_; #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 6942 "PicasaPublishing.c" +#line 6928 "PicasaPublishing.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 6955 "PicasaPublishing.c" +#line 6941 "PicasaPublishing.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -6992,100 +6978,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 6986 "PicasaPublishing.c" +#line 6972 "PicasaPublishing.c" goto __catch15_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 6995 "PicasaPublishing.c" +#line 6981 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7011 "PicasaPublishing.c" +#line 6997 "PicasaPublishing.c" goto __catch15_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 7022 "PicasaPublishing.c" +#line 7008 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7036 "PicasaPublishing.c" +#line 7022 "PicasaPublishing.c" } goto __finally15; __catch15_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7050 "PicasaPublishing.c" +#line 7036 "PicasaPublishing.c" } __finally15: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 7061 "PicasaPublishing.c" +#line 7047 "PicasaPublishing.c" } } @@ -7112,7 +7098,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis _g_free0 (entry_url); #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7088 "PicasaPublishing.c" +#line 7074 "PicasaPublishing.c" } @@ -7130,7 +7116,7 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu result = _tmp1_; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7106 "PicasaPublishing.c" +#line 7092 "PicasaPublishing.c" } @@ -7149,35 +7135,35 @@ void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPubl _g_free0 (self->priv->user_name); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->user_name = _tmp1_; -#line 7125 "PicasaPublishing.c" +#line 7111 "PicasaPublishing.c" } static gpointer _publishing_picasa_album_ref0 (gpointer self) { #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self ? publishing_picasa_album_ref (self) : NULL; -#line 7132 "PicasaPublishing.c" +#line 7118 "PicasaPublishing.c" } -static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) { +static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) { PublishingPicasaAlbum** result; int i; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = g_new0 (PublishingPicasaAlbum*, length + 1); #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 7143 "PicasaPublishing.c" +#line 7129 "PicasaPublishing.c" PublishingPicasaAlbum* _tmp0_ = NULL; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _publishing_picasa_album_ref0 (self[i]); #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 7149 "PicasaPublishing.c" +#line 7135 "PicasaPublishing.c" } #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7153 "PicasaPublishing.c" +#line 7139 "PicasaPublishing.c" } @@ -7196,7 +7182,7 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0__length1 = self->priv->albums_length1; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1__length1 = _tmp0__length1; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -7207,34 +7193,34 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ if (result_length1) { #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *result_length1 = _tmp2__length1; -#line 7183 "PicasaPublishing.c" +#line 7169 "PicasaPublishing.c" } #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = _tmp2_; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7189 "PicasaPublishing.c" +#line 7175 "PicasaPublishing.c" } -static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length) { +static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) { PublishingPicasaAlbum** result; int i; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result = g_new0 (PublishingPicasaAlbum*, length + 1); #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" for (i = 0; i < length; i++) { -#line 7200 "PicasaPublishing.c" +#line 7186 "PicasaPublishing.c" PublishingPicasaAlbum* _tmp0_ = NULL; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0_ = _publishing_picasa_album_ref0 (self[i]); #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" result[i] = _tmp0_; -#line 7206 "PicasaPublishing.c" +#line 7192 "PicasaPublishing.c" } #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7210 "PicasaPublishing.c" +#line 7196 "PicasaPublishing.c" } @@ -7250,7 +7236,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp0__length1 = albums_length1; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" _tmp1__length1 = _tmp0__length1; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" @@ -7261,7 +7247,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish self->priv->albums_length1 = _tmp1__length1; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->_albums_size_ = self->priv->albums_length1; -#line 7237 "PicasaPublishing.c" +#line 7223 "PicasaPublishing.c" } @@ -7273,7 +7259,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (Publish _tmp0_ = pixels; #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->major_axis_size_pixels = _tmp0_; -#line 7249 "PicasaPublishing.c" +#line 7235 "PicasaPublishing.c" } @@ -7288,7 +7274,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish result = _tmp0_; #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7264 "PicasaPublishing.c" +#line 7250 "PicasaPublishing.c" } @@ -7300,7 +7286,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (P _tmp0_ = selection_id; #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->major_axis_size_selection_id = _tmp0_; -#line 7276 "PicasaPublishing.c" +#line 7262 "PicasaPublishing.c" } @@ -7315,7 +7301,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P result = _tmp0_; #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7291 "PicasaPublishing.c" +#line 7277 "PicasaPublishing.c" } @@ -7327,7 +7313,7 @@ void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicas _tmp0_ = strip_metadata; #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->strip_metadata = _tmp0_; -#line 7303 "PicasaPublishing.c" +#line 7289 "PicasaPublishing.c" } @@ -7342,7 +7328,7 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP result = _tmp0_; #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7318 "PicasaPublishing.c" +#line 7304 "PicasaPublishing.c" } @@ -7354,7 +7340,7 @@ void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPub _tmp0_ = media_type; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->media_type = _tmp0_; -#line 7330 "PicasaPublishing.c" +#line 7316 "PicasaPublishing.c" } @@ -7369,14 +7355,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med result = _tmp0_; #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7345 "PicasaPublishing.c" +#line 7331 "PicasaPublishing.c" } static void publishing_picasa_value_publishing_parameters_init (GValue* value) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 7352 "PicasaPublishing.c" +#line 7338 "PicasaPublishing.c" } @@ -7385,7 +7371,7 @@ static void publishing_picasa_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer); -#line 7361 "PicasaPublishing.c" +#line 7347 "PicasaPublishing.c" } } @@ -7395,11 +7381,11 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 7371 "PicasaPublishing.c" +#line 7357 "PicasaPublishing.c" } else { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 7375 "PicasaPublishing.c" +#line 7361 "PicasaPublishing.c" } } @@ -7407,37 +7393,37 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 7383 "PicasaPublishing.c" +#line 7369 "PicasaPublishing.c" } static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (collect_values[0].v_pointer) { -#line 7390 "PicasaPublishing.c" +#line 7376 "PicasaPublishing.c" PublishingPicasaPublishingParameters* object; object = collect_values[0].v_pointer; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7397 "PicasaPublishing.c" +#line 7383 "PicasaPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7401 "PicasaPublishing.c" +#line 7387 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object); -#line 7405 "PicasaPublishing.c" +#line 7391 "PicasaPublishing.c" } else { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 7409 "PicasaPublishing.c" +#line 7395 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 7413 "PicasaPublishing.c" +#line 7399 "PicasaPublishing.c" } @@ -7448,25 +7434,25 @@ static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const G if (!object_p) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 7424 "PicasaPublishing.c" +#line 7410 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (!value->data[0].v_pointer) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = NULL; -#line 7430 "PicasaPublishing.c" +#line 7416 "PicasaPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7434 "PicasaPublishing.c" +#line 7420 "PicasaPublishing.c" } else { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" *object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer); -#line 7438 "PicasaPublishing.c" +#line 7424 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return NULL; -#line 7442 "PicasaPublishing.c" +#line 7428 "PicasaPublishing.c" } @@ -7480,7 +7466,7 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return G_PARAM_SPEC (spec); -#line 7456 "PicasaPublishing.c" +#line 7442 "PicasaPublishing.c" } @@ -7489,7 +7475,7 @@ gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return value->data[0].v_pointer; -#line 7465 "PicasaPublishing.c" +#line 7451 "PicasaPublishing.c" } @@ -7509,17 +7495,17 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer); -#line 7485 "PicasaPublishing.c" +#line 7471 "PicasaPublishing.c" } else { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 7489 "PicasaPublishing.c" +#line 7475 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (old); -#line 7495 "PicasaPublishing.c" +#line 7481 "PicasaPublishing.c" } } @@ -7538,17 +7524,17 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = v_object; -#line 7514 "PicasaPublishing.c" +#line 7500 "PicasaPublishing.c" } else { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" value->data[0].v_pointer = NULL; -#line 7518 "PicasaPublishing.c" +#line 7504 "PicasaPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" if (old) { #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" publishing_picasa_publishing_parameters_unref (old); -#line 7524 "PicasaPublishing.c" +#line 7510 "PicasaPublishing.c" } } @@ -7560,7 +7546,7 @@ static void publishing_picasa_publishing_parameters_class_init (PublishingPicasa ((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate)); -#line 7536 "PicasaPublishing.c" +#line 7522 "PicasaPublishing.c" } @@ -7569,7 +7555,7 @@ static void publishing_picasa_publishing_parameters_instance_init (PublishingPic self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->ref_count = 1; -#line 7545 "PicasaPublishing.c" +#line 7531 "PicasaPublishing.c" } @@ -7587,7 +7573,7 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu _g_free0 (self->priv->user_name); #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL); -#line 7563 "PicasaPublishing.c" +#line 7549 "PicasaPublishing.c" } @@ -7612,7 +7598,7 @@ gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return instance; -#line 7588 "PicasaPublishing.c" +#line 7574 "PicasaPublishing.c" } @@ -7625,7 +7611,7 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) { PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7601 "PicasaPublishing.c" +#line 7587 "PicasaPublishing.c" } } @@ -7659,14 +7645,14 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ self->priv->parameters = _tmp3_; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return self; -#line 7635 "PicasaPublishing.c" +#line 7621 "PicasaPublishing.c" } PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) { #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 7642 "PicasaPublishing.c" +#line 7628 "PicasaPublishing.c" } @@ -7706,7 +7692,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_ result = _tmp6_; #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" return result; -#line 7682 "PicasaPublishing.c" +#line 7668 "PicasaPublishing.c" } @@ -7719,14 +7705,14 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate)); #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction; -#line 7695 "PicasaPublishing.c" +#line 7681 "PicasaPublishing.c" } static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) { #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self); -#line 7702 "PicasaPublishing.c" +#line 7688 "PicasaPublishing.c" } @@ -7738,7 +7724,7 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_picasa_publishing_parameters_unref0 (self->priv->parameters); #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj); -#line 7714 "PicasaPublishing.c" +#line 7700 "PicasaPublishing.c" } diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala index facbd1b..621ae12 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.vala +++ b/plugins/shotwell-publishing/PicasaPublishing.vala @@ -562,7 +562,7 @@ internal class UploadTransaction : string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode( publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME)), summary, keywords_string); - var metadata_buffer = new Soup.Buffer.take (metadata.data); + Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data); message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer); // attempt to map the binary image data from disk into memory @@ -581,7 +581,7 @@ internal class UploadTransaction : // bind the binary image data read from disk into a Soup.Buffer object so that we // can attach it to the multipart request, then actaully append the buffer // to the multipart request. Then, set the MIME type for this part. - var bindable_data = new Soup.Buffer.with_owner (photo_data, this, null); + Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, photo_data); message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type, bindable_data); diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index 8d06afe..820936f 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.32.1, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.34.4, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -583,7 +583,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi static const gchar* piwigo_service_real_get_id (SpitPluggable* base); static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base); static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length); +static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length); static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled); static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host); PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host); @@ -846,7 +846,7 @@ enum { PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT }; -static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length); +static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length); static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher); static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base); @@ -1042,7 +1042,7 @@ static gpointer _g_object_ref0 (gpointer self) { } -static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length) { +static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) { GdkPixbuf** result; int i; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1132,7 +1132,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8__length1 = piwigo_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup13 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9__length1 = _tmp8__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5655,19 +5655,19 @@ static gchar* string_strip (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 5664 "PiwigoPublishing.c" } @@ -8277,7 +8277,7 @@ static gpointer _publishing_piwigo_category_ref0 (gpointer self) { } -static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length) { +static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) { PublishingPiwigoCategory** result; int i; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8343,7 +8343,7 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6__length1 = categories_length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup14 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); + _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup11 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7__length1 = _tmp6__length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12238,72 +12238,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 12233 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 12243 "PiwigoPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 12253 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 12259 "PiwigoPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 12270 "PiwigoPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 12282 "PiwigoPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 12286 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 12290 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 12294 "PiwigoPublishing.c" gint i = 0; @@ -12326,16 +12326,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 12317 "PiwigoPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 12326 "PiwigoPublishing.c" gboolean _tmp11_ = FALSE; @@ -12348,97 +12348,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 12339 "PiwigoPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 12345 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 12355 "PiwigoPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 12367 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 12371 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 12377 "PiwigoPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 12388 "PiwigoPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 12403 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 12407 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 12411 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 12417 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 12429 "PiwigoPublishing.c" gchar** _tmp25_ = NULL; @@ -12447,91 +12447,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 12450 "PiwigoPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 12454 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 12460 "PiwigoPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 12467 "PiwigoPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12475 "PiwigoPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 12513 "PiwigoPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 12522 "PiwigoPublishing.c" gint _tmp48_ = 0; @@ -12547,94 +12547,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 12538 "PiwigoPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 12544 "PiwigoPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 12558 "PiwigoPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 12578 "PiwigoPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 12593 "PiwigoPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 12597 "PiwigoPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 12605 "PiwigoPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12616 "PiwigoPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12625 "PiwigoPublishing.c" } @@ -12686,30 +12686,31 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c gchar* comment = NULL; SpitPublishingPublishable* _tmp34_ = NULL; gchar* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - PublishingPiwigoPublishingParameters* _tmp53_ = NULL; - PublishingPiwigoCategory* _tmp54_ = NULL; - gint _tmp55_ = 0; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - PublishingPiwigoPublishingParameters* _tmp58_ = NULL; - PublishingPiwigoPermissionLevel* _tmp59_ = NULL; - gint _tmp60_ = 0; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - PublishingPiwigoPublishingParameters* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; + gboolean _tmp36_ = FALSE; + const gchar* _tmp37_ = NULL; + PublishingPiwigoPublishingParameters* _tmp55_ = NULL; + PublishingPiwigoCategory* _tmp56_ = NULL; + gint _tmp57_ = 0; + gchar* _tmp58_ = NULL; + gchar* _tmp59_ = NULL; + PublishingPiwigoPublishingParameters* _tmp60_ = NULL; + PublishingPiwigoPermissionLevel* _tmp61_ = NULL; + gint _tmp62_ = 0; + gchar* _tmp63_ = NULL; + gchar* _tmp64_ = NULL; + PublishingPiwigoPublishingParameters* _tmp65_ = NULL; + gboolean _tmp66_ = FALSE; GHashTable* disposition_table = NULL; - GHashFunc _tmp67_ = NULL; - GEqualFunc _tmp68_ = NULL; - GHashTable* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - SpitPublishingPublishable* _tmp71_ = NULL; + GHashFunc _tmp69_ = NULL; + GEqualFunc _tmp70_ = NULL; + GHashTable* _tmp71_ = NULL; gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; + SpitPublishingPublishable* _tmp73_ = NULL; gchar* _tmp74_ = NULL; gchar* _tmp75_ = NULL; gchar* _tmp76_ = NULL; + gchar* _tmp77_ = NULL; + gchar* _tmp78_ = NULL; #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12736,7 +12737,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 12725 "PiwigoPublishing.c" +#line 12726 "PiwigoPublishing.c" PublishingPiwigoSession* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -12758,7 +12759,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (_tmp11_); #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp9_); -#line 12747 "PiwigoPublishing.c" +#line 12748 "PiwigoPublishing.c" } #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = parameters; @@ -12788,7 +12789,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp18__length1 = keywords_length1; #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp18_ != NULL) { -#line 12777 "PiwigoPublishing.c" +#line 12778 "PiwigoPublishing.c" gchar** _tmp19_ = NULL; gint _tmp19__length1 = 0; gchar* _tmp20_ = NULL; @@ -12802,7 +12803,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (tags); #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" tags = _tmp20_; -#line 12791 "PiwigoPublishing.c" +#line 12792 "PiwigoPublishing.c" } #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = publishable; @@ -12846,191 +12847,204 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c #line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" comment = _tmp35_; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp36_ = name; + _tmp37_ = name; +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + if (_tmp37_ == NULL) { +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp36_ = TRUE; +#line 12840 "PiwigoPublishing.c" + } else { + const gchar* _tmp38_ = NULL; +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp38_ = name; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp36_, "") != 0) { -#line 12837 "PiwigoPublishing.c" - SpitPublishingPublishable* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; + _tmp36_ = g_strcmp0 (_tmp38_, "") == 0; +#line 12847 "PiwigoPublishing.c" + } +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + if (_tmp36_) { +#line 12851 "PiwigoPublishing.c" + SpitPublishingPublishable* _tmp39_ = NULL; + gchar* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; + gboolean _tmp42_ = FALSE; + const gchar* _tmp43_ = NULL; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp37_ = publishable; + _tmp39_ = publishable; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); + _tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (name); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - name = _tmp38_; + name = _tmp40_; #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp39_ = name; + _tmp41_ = name; #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp41_); #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp41_ = comment; + _tmp43_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp41_ != NULL) { -#line 12859 "PiwigoPublishing.c" - const gchar* _tmp42_ = NULL; + if (_tmp43_ != NULL) { +#line 12873 "PiwigoPublishing.c" + const gchar* _tmp44_ = NULL; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp42_ = comment; + _tmp44_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp40_ = g_strcmp0 (_tmp42_, "") != 0; -#line 12865 "PiwigoPublishing.c" + _tmp42_ = g_strcmp0 (_tmp44_, "") != 0; +#line 12879 "PiwigoPublishing.c" } else { #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp40_ = FALSE; -#line 12869 "PiwigoPublishing.c" + _tmp42_ = FALSE; +#line 12883 "PiwigoPublishing.c" } #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp40_) { -#line 12873 "PiwigoPublishing.c" - const gchar* _tmp43_ = NULL; + if (_tmp42_) { +#line 12887 "PiwigoPublishing.c" + const gchar* _tmp45_ = NULL; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp43_ = comment; + _tmp45_ = comment; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_); -#line 12879 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_); +#line 12893 "PiwigoPublishing.c" } } else { - gboolean _tmp44_ = FALSE; - const gchar* _tmp45_ = NULL; + gboolean _tmp46_ = FALSE; + const gchar* _tmp47_ = NULL; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp45_ = comment; + _tmp47_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp45_ != NULL) { -#line 12888 "PiwigoPublishing.c" - const gchar* _tmp46_ = NULL; + if (_tmp47_ != NULL) { +#line 12902 "PiwigoPublishing.c" + const gchar* _tmp48_ = NULL; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp46_ = comment; + _tmp48_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp44_ = g_strcmp0 (_tmp46_, "") != 0; -#line 12894 "PiwigoPublishing.c" + _tmp46_ = g_strcmp0 (_tmp48_, "") != 0; +#line 12908 "PiwigoPublishing.c" } else { #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp44_ = FALSE; -#line 12898 "PiwigoPublishing.c" + _tmp46_ = FALSE; +#line 12912 "PiwigoPublishing.c" } #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp44_) { -#line 12902 "PiwigoPublishing.c" - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; + if (_tmp46_) { +#line 12916 "PiwigoPublishing.c" + const gchar* _tmp49_ = NULL; + const gchar* _tmp50_ = NULL; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp47_ = name; + _tmp49_ = name; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp49_); #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp48_ = comment; + _tmp50_ = comment; #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_); -#line 12913 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_); +#line 12927 "PiwigoPublishing.c" } else { - PublishingPiwigoPublishingParameters* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; + PublishingPiwigoPublishingParameters* _tmp51_ = NULL; + gboolean _tmp52_ = FALSE; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp49_ = parameters; + _tmp51_ = parameters; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp50_ = _tmp49_->title_as_comment; + _tmp52_ = _tmp51_->title_as_comment; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp50_) { -#line 12923 "PiwigoPublishing.c" - const gchar* _tmp51_ = NULL; + if (_tmp52_) { +#line 12937 "PiwigoPublishing.c" + const gchar* _tmp53_ = NULL; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp51_ = name; + _tmp53_ = name; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_); -#line 12929 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_); +#line 12943 "PiwigoPublishing.c" } else { - const gchar* _tmp52_ = NULL; + const gchar* _tmp54_ = NULL; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp52_ = name; + _tmp54_ = name; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_); -#line 12936 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_); +#line 12950 "PiwigoPublishing.c" } } } #line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple"); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp53_ = parameters; + _tmp55_ = parameters; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp54_ = _tmp53_->category; + _tmp56_ = _tmp55_->category; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp55_ = _tmp54_->id; + _tmp57_ = _tmp56_->id; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp56_ = g_strdup_printf ("%i", _tmp55_); + _tmp58_ = g_strdup_printf ("%i", _tmp57_); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp57_ = _tmp56_; + _tmp59_ = _tmp58_; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp59_); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp57_); + _g_free0 (_tmp59_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp58_ = parameters; + _tmp60_ = parameters; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp59_ = _tmp58_->perm_level; + _tmp61_ = _tmp60_->perm_level; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp60_ = _tmp59_->id; + _tmp62_ = _tmp61_->id; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp61_ = g_strdup_printf ("%i", _tmp60_); + _tmp63_ = g_strdup_printf ("%i", _tmp62_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp62_ = _tmp61_; + _tmp64_ = _tmp63_; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp64_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp64_); #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp63_ = parameters; + _tmp65_ = parameters; #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp64_ = _tmp63_->no_upload_tags; + _tmp66_ = _tmp65_->no_upload_tags; #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (!_tmp64_) { -#line 12976 "PiwigoPublishing.c" - const gchar* _tmp65_ = NULL; + if (!_tmp66_) { +#line 12990 "PiwigoPublishing.c" + const gchar* _tmp67_ = NULL; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp65_ = tags; + _tmp67_ = tags; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp65_, "") != 0) { -#line 12982 "PiwigoPublishing.c" - const gchar* _tmp66_ = NULL; + if (g_strcmp0 (_tmp67_, "") != 0) { +#line 12996 "PiwigoPublishing.c" + const gchar* _tmp68_ = NULL; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp66_ = tags; + _tmp68_ = tags; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_); -#line 12988 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_); +#line 13002 "PiwigoPublishing.c" } } #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp67_ = g_str_hash; + _tmp69_ = g_str_hash; #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp68_ = g_str_equal; + _tmp70_ = g_str_equal; #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_); + _tmp71_ = g_hash_table_new_full (_tmp69_, _tmp70_, _g_free0_, _g_free0_); #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - disposition_table = _tmp69_; + disposition_table = _tmp71_; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp70_ = g_strdup ("filename"); + _tmp72_ = g_strdup ("filename"); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp71_ = publishable; + _tmp73_ = publishable; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); + _tmp74_ = spit_publishing_publishable_get_param_string (_tmp73_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp73_ = _tmp72_; + _tmp75_ = _tmp74_; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp74_ = soup_uri_encode (_tmp73_, NULL); + _tmp76_ = soup_uri_encode (_tmp75_, NULL); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_hash_table_insert (disposition_table, _tmp70_, _tmp74_); + g_hash_table_insert (disposition_table, _tmp72_, _tmp76_); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp75_); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp75_ = g_strdup ("name"); + _tmp77_ = g_strdup ("name"); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp76_ = g_strdup ("image"); + _tmp78_ = g_strdup ("image"); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_hash_table_insert (disposition_table, _tmp75_, _tmp76_); + g_hash_table_insert (disposition_table, _tmp77_, _tmp78_); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -13045,14 +13059,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 13033 "PiwigoPublishing.c" +#line 13047 "PiwigoPublishing.c" } PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable); -#line 13040 "PiwigoPublishing.c" +#line 13054 "PiwigoPublishing.c" } @@ -13063,7 +13077,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize; #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate)); -#line 13051 "PiwigoPublishing.c" +#line 13065 "PiwigoPublishing.c" } @@ -13072,7 +13086,7 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self); #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->parameters = NULL; -#line 13060 "PiwigoPublishing.c" +#line 13074 "PiwigoPublishing.c" } @@ -13084,7 +13098,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj); -#line 13072 "PiwigoPublishing.c" +#line 13086 "PiwigoPublishing.c" } diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala index ca07554..60219a6 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.vala +++ b/plugins/shotwell-publishing/PiwigoPublishing.vala @@ -1733,7 +1733,7 @@ private class ImagesAddTransaction : Publishing.RESTSupport.UploadTransaction { string name = publishable.get_publishing_name(); string comment = publishable.get_param_string( Spit.Publishing.Publishable.PARAM_STRING_COMMENT); - if (name != "") { + if (name == null || name == "") { name = publishable.get_param_string( Spit.Publishing.Publishable.PARAM_STRING_BASENAME); add_argument("name", name); diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c index 4d842f6..2d28be0 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.c +++ b/plugins/shotwell-publishing/YouTubePublishing.c @@ -1,4 +1,4 @@ -/* YouTubePublishing.c generated by valac 0.32.1, the Vala compiler +/* YouTubePublishing.c generated by valac 0.34.4, the Vala compiler * generated from YouTubePublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -294,7 +294,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, static const gchar* you_tube_service_real_get_id (SpitPluggable* base); static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base); static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length); +static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length); static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host); PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host); PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); @@ -438,10 +438,8 @@ enum { PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable); PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable); static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static guint8* _vala_array_dup11 (guint8* self, int length); static void _vala_SoupBuffer_free (SoupBuffer* self); static void _vala_SoupMultipart_free (SoupMultipart* self); -static guint8* _vala_array_dup12 (guint8* self, int length); static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate)) enum { @@ -467,7 +465,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d _tmp0__length1 = you_tube_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp0_ == NULL) { -#line 449 "YouTubePublishing.c" +#line 447 "YouTubePublishing.c" gint _tmp1_ = 0; GdkPixbuf** _tmp2_ = NULL; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -480,18 +478,18 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d you_tube_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1; -#line 462 "YouTubePublishing.c" +#line 460 "YouTubePublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 466 "YouTubePublishing.c" +#line 464 "YouTubePublishing.c" } YouTubeService* you_tube_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory); -#line 473 "YouTubePublishing.c" +#line 471 "YouTubePublishing.c" } @@ -513,7 +511,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base, result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 495 "YouTubePublishing.c" +#line 493 "YouTubePublishing.c" } @@ -526,7 +524,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.youtube"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 508 "YouTubePublishing.c" +#line 506 "YouTubePublishing.c" } @@ -539,35 +537,35 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas result = "YouTube"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 521 "YouTubePublishing.c" +#line 519 "YouTubePublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? g_object_ref (self) : NULL; -#line 528 "YouTubePublishing.c" +#line 526 "YouTubePublishing.c" } -static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) { +static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) { GdkPixbuf** result; int i; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" for (i = 0; i < length; i++) { -#line 539 "YouTubePublishing.c" +#line 537 "YouTubePublishing.c" GdkPixbuf* _tmp0_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" result[i] = _tmp0_; -#line 545 "YouTubePublishing.c" +#line 543 "YouTubePublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 549 "YouTubePublishing.c" +#line 547 "YouTubePublishing.c" } @@ -640,7 +638,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp8__length1 = you_tube_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp9__length1 = _tmp8__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -649,7 +647,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn (*info).icons = _tmp9_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*info).icons_length1 = _tmp9__length1; -#line 631 "YouTubePublishing.c" +#line 629 "YouTubePublishing.c" } @@ -670,7 +668,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 652 "YouTubePublishing.c" +#line 650 "YouTubePublishing.c" } @@ -683,7 +681,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 665 "YouTubePublishing.c" +#line 663 "YouTubePublishing.c" } @@ -691,7 +689,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab YouTubeService * self; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService); -#line 673 "YouTubePublishing.c" +#line 671 "YouTubePublishing.c" } @@ -700,7 +698,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) { you_tube_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize; -#line 682 "YouTubePublishing.c" +#line 680 "YouTubePublishing.c" } @@ -717,7 +715,7 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface * iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation; -#line 699 "YouTubePublishing.c" +#line 697 "YouTubePublishing.c" } @@ -728,7 +726,7 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media; -#line 710 "YouTubePublishing.c" +#line 708 "YouTubePublishing.c" } @@ -742,7 +740,7 @@ static void you_tube_service_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj); -#line 724 "YouTubePublishing.c" +#line 722 "YouTubePublishing.c" } @@ -790,14 +788,14 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters self->priv->user_name = NULL; #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 772 "YouTubePublishing.c" +#line 770 "YouTubePublishing.c" } PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) { #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS); -#line 779 "YouTubePublishing.c" +#line 777 "YouTubePublishing.c" } @@ -812,7 +810,7 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr result = _tmp0_; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 794 "YouTubePublishing.c" +#line 792 "YouTubePublishing.c" } @@ -824,7 +822,7 @@ void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePub _tmp0_ = privacy; #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->privacy = _tmp0_; -#line 806 "YouTubePublishing.c" +#line 804 "YouTubePublishing.c" } @@ -842,7 +840,7 @@ gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYou result = _tmp1_; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 824 "YouTubePublishing.c" +#line 822 "YouTubePublishing.c" } @@ -859,7 +857,7 @@ void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTu _g_free0 (self->priv->channel_name); #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->channel_name = _tmp1_; -#line 841 "YouTubePublishing.c" +#line 839 "YouTubePublishing.c" } @@ -877,7 +875,7 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub result = _tmp1_; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 859 "YouTubePublishing.c" +#line 857 "YouTubePublishing.c" } @@ -894,14 +892,14 @@ void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubeP _g_free0 (self->priv->user_name); #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->user_name = _tmp1_; -#line 876 "YouTubePublishing.c" +#line 874 "YouTubePublishing.c" } static void publishing_you_tube_value_publishing_parameters_init (GValue* value) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 883 "YouTubePublishing.c" +#line 881 "YouTubePublishing.c" } @@ -910,7 +908,7 @@ static void publishing_you_tube_value_publishing_parameters_free_value (GValue* if (value->data[0].v_pointer) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer); -#line 892 "YouTubePublishing.c" +#line 890 "YouTubePublishing.c" } } @@ -920,11 +918,11 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV if (src_value->data[0].v_pointer) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 902 "YouTubePublishing.c" +#line 900 "YouTubePublishing.c" } else { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 906 "YouTubePublishing.c" +#line 904 "YouTubePublishing.c" } } @@ -932,37 +930,37 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 914 "YouTubePublishing.c" +#line 912 "YouTubePublishing.c" } static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (collect_values[0].v_pointer) { -#line 921 "YouTubePublishing.c" +#line 919 "YouTubePublishing.c" PublishingYouTubePublishingParameters* object; object = collect_values[0].v_pointer; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 928 "YouTubePublishing.c" +#line 926 "YouTubePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 932 "YouTubePublishing.c" +#line 930 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object); -#line 936 "YouTubePublishing.c" +#line 934 "YouTubePublishing.c" } else { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 940 "YouTubePublishing.c" +#line 938 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 944 "YouTubePublishing.c" +#line 942 "YouTubePublishing.c" } @@ -973,25 +971,25 @@ static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const if (!object_p) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 955 "YouTubePublishing.c" +#line 953 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!value->data[0].v_pointer) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = NULL; -#line 961 "YouTubePublishing.c" +#line 959 "YouTubePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = value->data[0].v_pointer; -#line 965 "YouTubePublishing.c" +#line 963 "YouTubePublishing.c" } else { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer); -#line 969 "YouTubePublishing.c" +#line 967 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 973 "YouTubePublishing.c" +#line 971 "YouTubePublishing.c" } @@ -1005,7 +1003,7 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return G_PARAM_SPEC (spec); -#line 987 "YouTubePublishing.c" +#line 985 "YouTubePublishing.c" } @@ -1014,7 +1012,7 @@ gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* valu g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 996 "YouTubePublishing.c" +#line 994 "YouTubePublishing.c" } @@ -1034,17 +1032,17 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe value->data[0].v_pointer = v_object; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer); -#line 1016 "YouTubePublishing.c" +#line 1014 "YouTubePublishing.c" } else { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 1020 "YouTubePublishing.c" +#line 1018 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (old); -#line 1026 "YouTubePublishing.c" +#line 1024 "YouTubePublishing.c" } } @@ -1063,17 +1061,17 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = v_object; -#line 1045 "YouTubePublishing.c" +#line 1043 "YouTubePublishing.c" } else { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 1049 "YouTubePublishing.c" +#line 1047 "YouTubePublishing.c" } #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_parameters_unref (old); -#line 1055 "YouTubePublishing.c" +#line 1053 "YouTubePublishing.c" } } @@ -1085,7 +1083,7 @@ static void publishing_you_tube_publishing_parameters_class_init (PublishingYouT ((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize; #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate)); -#line 1067 "YouTubePublishing.c" +#line 1065 "YouTubePublishing.c" } @@ -1094,7 +1092,7 @@ static void publishing_you_tube_publishing_parameters_instance_init (PublishingY self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->ref_count = 1; -#line 1076 "YouTubePublishing.c" +#line 1074 "YouTubePublishing.c" } @@ -1108,7 +1106,7 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub _g_free0 (self->priv->channel_name); #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (self->priv->user_name); -#line 1090 "YouTubePublishing.c" +#line 1088 "YouTubePublishing.c" } @@ -1133,7 +1131,7 @@ gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return instance; -#line 1115 "YouTubePublishing.c" +#line 1113 "YouTubePublishing.c" } @@ -1146,7 +1144,7 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) { PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1128 "YouTubePublishing.c" +#line 1126 "YouTubePublishing.c" } } @@ -1200,14 +1198,14 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr self->priv->progress_reporter_target_destroy_notify = NULL; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 1182 "YouTubePublishing.c" +#line 1180 "YouTubePublishing.c" } PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host); -#line 1189 "YouTubePublishing.c" +#line 1187 "YouTubePublishing.c" } @@ -1223,7 +1221,7 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi result = _tmp0_; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 1205 "YouTubePublishing.c" +#line 1203 "YouTubePublishing.c" } @@ -1241,7 +1239,7 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup if (_tmp0_) { #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1223 "YouTubePublishing.c" +#line 1221 "YouTubePublishing.c" } #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->running = TRUE; @@ -1251,14 +1249,14 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup if (_tmp1_ == NULL) { #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self); -#line 1233 "YouTubePublishing.c" +#line 1231 "YouTubePublishing.c" } else { const gchar* _tmp2_ = NULL; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = self->priv->refresh_token; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_); -#line 1240 "YouTubePublishing.c" +#line 1238 "YouTubePublishing.c" } } @@ -1281,7 +1279,7 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 1263 "YouTubePublishing.c" +#line 1261 "YouTubePublishing.c" } @@ -1308,7 +1306,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp2_ = _tmp1_->name; #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp2_, "feed") == 0) { -#line 1290 "YouTubePublishing.c" +#line 1288 "YouTubePublishing.c" xmlNode* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1317,7 +1315,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp4_ = _tmp3_->children; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" doc_node_iter = _tmp4_; -#line 1299 "YouTubePublishing.c" +#line 1297 "YouTubePublishing.c" } else { xmlNode* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -1327,13 +1325,13 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp6_ = _tmp5_->name; #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp6_, "entry") == 0) { -#line 1309 "YouTubePublishing.c" +#line 1307 "YouTubePublishing.c" xmlNode* _tmp7_ = NULL; #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp7_ = document_root; #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" doc_node_iter = _tmp7_; -#line 1315 "YouTubePublishing.c" +#line 1313 "YouTubePublishing.c" } else { GError* _tmp8_ = NULL; #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1348,7 +1346,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _g_free0 (_result_); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 1330 "YouTubePublishing.c" +#line 1328 "YouTubePublishing.c" } else { #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (_result_); @@ -1358,7 +1356,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper g_clear_error (&_inner_error_); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 1340 "YouTubePublishing.c" +#line 1338 "YouTubePublishing.c" } } } @@ -1368,7 +1366,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp9_ = TRUE; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" while (TRUE) { -#line 1350 "YouTubePublishing.c" +#line 1348 "YouTubePublishing.c" xmlNode* _tmp12_ = NULL; xmlNode* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -1381,7 +1379,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper gchar* _tmp33_ = NULL; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!_tmp9_) { -#line 1363 "YouTubePublishing.c" +#line 1361 "YouTubePublishing.c" xmlNode* _tmp10_ = NULL; xmlNode* _tmp11_ = NULL; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1390,7 +1388,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp11_ = _tmp10_->next; #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" doc_node_iter = _tmp11_; -#line 1372 "YouTubePublishing.c" +#line 1370 "YouTubePublishing.c" } #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp9_ = FALSE; @@ -1400,7 +1398,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper if (!(_tmp12_ != NULL)) { #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" break; -#line 1382 "YouTubePublishing.c" +#line 1380 "YouTubePublishing.c" } #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp13_ = doc_node_iter; @@ -1410,7 +1408,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper if (g_strcmp0 (_tmp14_, "entry") != 0) { #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" continue; -#line 1392 "YouTubePublishing.c" +#line 1390 "YouTubePublishing.c" } #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" name_val = NULL; @@ -1422,20 +1420,20 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp16_ = _tmp15_->children; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" channel_node_iter = _tmp16_; -#line 1404 "YouTubePublishing.c" +#line 1402 "YouTubePublishing.c" { gboolean _tmp17_ = FALSE; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp17_ = TRUE; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" while (TRUE) { -#line 1411 "YouTubePublishing.c" +#line 1409 "YouTubePublishing.c" xmlNode* _tmp20_ = NULL; xmlNode* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!_tmp17_) { -#line 1417 "YouTubePublishing.c" +#line 1415 "YouTubePublishing.c" xmlNode* _tmp18_ = NULL; xmlNode* _tmp19_ = NULL; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1444,7 +1442,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp19_ = _tmp18_->next; #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" channel_node_iter = _tmp19_; -#line 1426 "YouTubePublishing.c" +#line 1424 "YouTubePublishing.c" } #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp17_ = FALSE; @@ -1454,7 +1452,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper if (!(_tmp20_ != NULL)) { #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" break; -#line 1436 "YouTubePublishing.c" +#line 1434 "YouTubePublishing.c" } #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp21_ = channel_node_iter; @@ -1462,7 +1460,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp22_ = _tmp21_->name; #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp22_, "title") == 0) { -#line 1444 "YouTubePublishing.c" +#line 1442 "YouTubePublishing.c" xmlNode* _tmp23_ = NULL; gchar* _tmp24_ = NULL; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1473,7 +1471,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _g_free0 (name_val); #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" name_val = _tmp24_; -#line 1455 "YouTubePublishing.c" +#line 1453 "YouTubePublishing.c" } else { xmlNode* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; @@ -1483,7 +1481,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _tmp26_ = _tmp25_->name; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp26_, "id") == 0) { -#line 1465 "YouTubePublishing.c" +#line 1463 "YouTubePublishing.c" xmlNode* _tmp27_ = NULL; xmlNs* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -1499,7 +1497,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper if (_tmp29_ != NULL) { #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" continue; -#line 1481 "YouTubePublishing.c" +#line 1479 "YouTubePublishing.c" } #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp30_ = channel_node_iter; @@ -1509,7 +1507,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _g_free0 (url_val); #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" url_val = _tmp31_; -#line 1491 "YouTubePublishing.c" +#line 1489 "YouTubePublishing.c" } } } @@ -1528,7 +1526,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper _g_free0 (name_val); #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" break; -#line 1510 "YouTubePublishing.c" +#line 1508 "YouTubePublishing.c" } } #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -1540,7 +1538,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper result = _result_; #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 1521 "YouTubePublishing.c" +#line 1519 "YouTubePublishing.c" } @@ -1558,13 +1556,13 @@ static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (Pub if (!_tmp0_) { #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1538 "YouTubePublishing.c" +#line 1536 "YouTubePublishing.c" } #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = self->priv->refresh_token; #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_); -#line 1544 "YouTubePublishing.c" +#line 1542 "YouTubePublishing.c" } @@ -1618,21 +1616,21 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete ( _publishing_rest_support_session_unref0 (_tmp7_); #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_fetch_account_information (self); -#line 1598 "YouTubePublishing.c" +#line 1596 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete ((PublishingYouTubeYouTubePublisher*) self, _sender); -#line 1605 "YouTubePublishing.c" +#line 1603 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err); -#line 1612 "YouTubePublishing.c" +#line 1610 "YouTubePublishing.c" } @@ -1668,13 +1666,13 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_comp if (!_tmp4_) { #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1647 "YouTubePublishing.c" +#line 1645 "YouTubePublishing.c" } #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = txn; #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction)); -#line 1653 "YouTubePublishing.c" +#line 1651 "YouTubePublishing.c" } @@ -1722,7 +1720,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro if (!_tmp7_) { #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1700 "YouTubePublishing.c" +#line 1698 "YouTubePublishing.c" } #line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -1730,7 +1728,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro _tmp9_ = err; #line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_); -#line 1708 "YouTubePublishing.c" +#line 1706 "YouTubePublishing.c" } @@ -1747,11 +1745,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout if (!_tmp0_) { #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1724 "YouTubePublishing.c" +#line 1722 "YouTubePublishing.c" } #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); -#line 1728 "YouTubePublishing.c" +#line 1726 "YouTubePublishing.c" } @@ -1768,11 +1766,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish if (!_tmp0_) { #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1744 "YouTubePublishing.c" +#line 1742 "YouTubePublishing.c" } #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_upload (self); -#line 1748 "YouTubePublishing.c" +#line 1746 "YouTubePublishing.c" } @@ -1804,7 +1802,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub if (!_tmp2_) { #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1779 "YouTubePublishing.c" +#line 1777 "YouTubePublishing.c" } #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ = self->priv->progress_reporter; @@ -1816,21 +1814,21 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub _tmp5_ = completed_fraction; #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 1791 "YouTubePublishing.c" +#line 1789 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published); -#line 1798 "YouTubePublishing.c" +#line 1796 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err); -#line 1805 "YouTubePublishing.c" +#line 1803 "YouTubePublishing.c" } @@ -1868,11 +1866,11 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin if (!_tmp5_) { #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1842 "YouTubePublishing.c" +#line 1840 "YouTubePublishing.c" } #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_success_pane (self); -#line 1846 "YouTubePublishing.c" +#line 1844 "YouTubePublishing.c" } @@ -1908,7 +1906,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo if (!_tmp4_) { #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1882 "YouTubePublishing.c" +#line 1880 "YouTubePublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = err; @@ -1923,14 +1921,14 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo _tmp8_ = err; #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 1896 "YouTubePublishing.c" +#line 1894 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) { #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_service_welcome_login ((PublishingYouTubeYouTubePublisher*) self); -#line 1903 "YouTubePublishing.c" +#line 1901 "YouTubePublishing.c" } @@ -1944,7 +1942,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane _tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE, _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback, self); -#line 1917 "YouTubePublishing.c" +#line 1915 "YouTubePublishing.c" } @@ -1985,7 +1983,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 1958 "YouTubePublishing.c" +#line 1956 "YouTubePublishing.c" { #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -1993,7 +1991,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information if (G_UNLIKELY (_inner_error_ != NULL)) { #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 1966 "YouTubePublishing.c" +#line 1964 "YouTubePublishing.c" goto __catch27_spit_publishing_publishing_error; } #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2004,7 +2002,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information g_clear_error (&_inner_error_); #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 1977 "YouTubePublishing.c" +#line 1975 "YouTubePublishing.c" } } goto __finally27; @@ -2022,7 +2020,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_); #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_error_free0 (err); -#line 1995 "YouTubePublishing.c" +#line 1993 "YouTubePublishing.c" } __finally27: #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2035,11 +2033,11 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information g_clear_error (&_inner_error_); #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2008 "YouTubePublishing.c" +#line 2006 "YouTubePublishing.c" } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_transaction_unref0 (directory_trans); -#line 2012 "YouTubePublishing.c" +#line 2010 "YouTubePublishing.c" } @@ -2048,7 +2046,7 @@ static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transact result = publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (doc); #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2021 "YouTubePublishing.c" +#line 2019 "YouTubePublishing.c" } @@ -2062,7 +2060,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_debug ("YouTubePublishing.vala:329: ACTION: extracting account and channel inf" \ "ormation from body of server response"); -#line 2034 "YouTubePublishing.c" +#line 2032 "YouTubePublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL; @@ -2089,7 +2087,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2061 "YouTubePublishing.c" +#line 2059 "YouTubePublishing.c" goto __catch28_spit_publishing_publishing_error; } #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2100,7 +2098,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ g_clear_error (&_inner_error_); #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2072 "YouTubePublishing.c" +#line 2070 "YouTubePublishing.c" } #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp6_ = _tmp0_; @@ -2112,7 +2110,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ response_doc = _tmp6_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 2084 "YouTubePublishing.c" +#line 2082 "YouTubePublishing.c" } goto __finally28; __catch28_spit_publishing_publishing_error: @@ -2136,7 +2134,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ _publishing_rest_support_xml_document_unref0 (response_doc); #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2108 "YouTubePublishing.c" +#line 2106 "YouTubePublishing.c" } __finally28: #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2149,7 +2147,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ g_clear_error (&_inner_error_); #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2121 "YouTubePublishing.c" +#line 2119 "YouTubePublishing.c" } { gchar* _tmp9_ = NULL; @@ -2169,7 +2167,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ if (G_UNLIKELY (_inner_error_ != NULL)) { #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2141 "YouTubePublishing.c" +#line 2139 "YouTubePublishing.c" goto __catch29_spit_publishing_publishing_error; } #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2180,7 +2178,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ g_clear_error (&_inner_error_); #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2152 "YouTubePublishing.c" +#line 2150 "YouTubePublishing.c" } #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp13_ = self->priv->publishing_parameters; @@ -2188,7 +2186,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ publishing_you_tube_publishing_parameters_set_channel_name (_tmp13_, _tmp9_); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (_tmp9_); -#line 2160 "YouTubePublishing.c" +#line 2158 "YouTubePublishing.c" } goto __finally29; __catch29_spit_publishing_publishing_error: @@ -2212,7 +2210,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ _publishing_rest_support_xml_document_unref0 (response_doc); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2184 "YouTubePublishing.c" +#line 2182 "YouTubePublishing.c" } __finally29: #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2225,27 +2223,27 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_ g_clear_error (&_inner_error_); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2197 "YouTubePublishing.c" +#line 2195 "YouTubePublishing.c" } #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self); #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 2203 "YouTubePublishing.c" +#line 2201 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) { #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self); -#line 2210 "YouTubePublishing.c" +#line 2208 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) { #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self); -#line 2217 "YouTubePublishing.c" +#line 2215 "YouTubePublishing.c" } @@ -2271,7 +2269,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa _tmp0_ = gtk_builder_new (); #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" builder = _tmp0_; -#line 2243 "YouTubePublishing.c" +#line 2241 "YouTubePublishing.c" { GtkBuilder* _tmp1_ = NULL; #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2280,7 +2278,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_); #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2252 "YouTubePublishing.c" +#line 2250 "YouTubePublishing.c" goto __catch30_g_error; } } @@ -2323,7 +2321,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa _g_object_unref0 (builder); #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2294 "YouTubePublishing.c" +#line 2292 "YouTubePublishing.c" } __finally30: #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2336,7 +2334,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa g_clear_error (&_inner_error_); #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2307 "YouTubePublishing.c" +#line 2305 "YouTubePublishing.c" } #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -2370,14 +2368,14 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa _g_object_unref0 (opts_pane); #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (builder); -#line 2341 "YouTubePublishing.c" +#line 2339 "YouTubePublishing.c" } static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete); -#line 2348 "YouTubePublishing.c" +#line 2346 "YouTubePublishing.c" } @@ -2443,7 +2441,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY if (!_tmp6_) { #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 2413 "YouTubePublishing.c" +#line 2411 "YouTubePublishing.c" } #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); @@ -2489,7 +2487,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY _publishing_rest_support_batch_uploader_unref0 (uploader); #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 2459 "YouTubePublishing.c" +#line 2457 "YouTubePublishing.c" } @@ -2508,7 +2506,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish _tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher)); #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 2478 "YouTubePublishing.c" +#line 2476 "YouTubePublishing.c" } @@ -2539,7 +2537,7 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token"); #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self); -#line 2509 "YouTubePublishing.c" +#line 2507 "YouTubePublishing.c" } @@ -2554,14 +2552,14 @@ static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_ self = (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 2524 "YouTubePublishing.c" +#line 2522 "YouTubePublishing.c" } static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session) { #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, session); -#line 2531 "YouTubePublishing.c" +#line 2529 "YouTubePublishing.c" } @@ -2589,7 +2587,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti if (g_strcmp0 (_tmp4_, "feed") == 0) { #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = TRUE; -#line 2559 "YouTubePublishing.c" +#line 2557 "YouTubePublishing.c" } else { xmlNode* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; @@ -2599,7 +2597,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti _tmp6_ = _tmp5_->name; #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0; -#line 2569 "YouTubePublishing.c" +#line 2567 "YouTubePublishing.c" } #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_tmp2_) { @@ -2607,7 +2605,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti result = NULL; #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2577 "YouTubePublishing.c" +#line 2575 "YouTubePublishing.c" } else { gchar* _tmp7_ = NULL; #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -2616,7 +2614,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti result = _tmp7_; #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 2586 "YouTubePublishing.c" +#line 2584 "YouTubePublishing.c" } } @@ -2624,7 +2622,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass * klass) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2594 "YouTubePublishing.c" +#line 2592 "YouTubePublishing.c" } @@ -2661,14 +2659,14 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube ((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize; -#line 2631 "YouTubePublishing.c" +#line 2629 "YouTubePublishing.c" } static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) { #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self); -#line 2638 "YouTubePublishing.c" +#line 2636 "YouTubePublishing.c" } @@ -2690,7 +2688,7 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) { self->priv->progress_reporter_target_destroy_notify = NULL; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj); -#line 2660 "YouTubePublishing.c" +#line 2658 "YouTubePublishing.c" } @@ -2709,28 +2707,28 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) { static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) { #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL; -#line 2679 "YouTubePublishing.c" +#line 2677 "YouTubePublishing.c" } static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) { #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL; -#line 2686 "YouTubePublishing.c" +#line 2684 "YouTubePublishing.c" } static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self); -#line 2693 "YouTubePublishing.c" +#line 2691 "YouTubePublishing.c" } static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self); -#line 2700 "YouTubePublishing.c" +#line 2698 "YouTubePublishing.c" } @@ -2953,7 +2951,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p _tmp46_ = self->priv->privacy_descriptions; #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp46__length1 = self->priv->privacy_descriptions_length1; -#line 2923 "YouTubePublishing.c" +#line 2921 "YouTubePublishing.c" { PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL; gint desc_collection_length1 = 0; @@ -2965,14 +2963,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p desc_collection_length1 = _tmp46__length1; #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" for (desc_it = 0; desc_it < _tmp46__length1; desc_it = desc_it + 1) { -#line 2935 "YouTubePublishing.c" +#line 2933 "YouTubePublishing.c" PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp47_ = NULL; PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL; #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp47_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]); #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" desc = _tmp47_; -#line 2942 "YouTubePublishing.c" +#line 2940 "YouTubePublishing.c" { GtkComboBoxText* _tmp48_ = NULL; PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL; @@ -2987,7 +2985,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p gtk_combo_box_text_append_text (_tmp48_, _tmp50_); #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc); -#line 2957 "YouTubePublishing.c" +#line 2955 "YouTubePublishing.c" } } } @@ -3011,14 +3009,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 2981 "YouTubePublishing.c" +#line 2979 "YouTubePublishing.c" } PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) { #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, host, builder, publishing_parameters); -#line 2988 "YouTubePublishing.c" +#line 2986 "YouTubePublishing.c" } @@ -3050,7 +3048,7 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_); #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_signal_emit_by_name (self, "publish"); -#line 3020 "YouTubePublishing.c" +#line 3018 "YouTubePublishing.c" } @@ -3059,7 +3057,7 @@ static void publishing_you_tube_publishing_options_pane_on_logout_clicked (Publi g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self)); #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 3029 "YouTubePublishing.c" +#line 3027 "YouTubePublishing.c" } @@ -3071,7 +3069,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se _tmp0_ = self->priv->publish_button; #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 3041 "YouTubePublishing.c" +#line 3039 "YouTubePublishing.c" } @@ -3082,13 +3080,13 @@ static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDesc *size = (*size) ? (2 * (*size)) : 4; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 3052 "YouTubePublishing.c" +#line 3050 "YouTubePublishing.c" } #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[(*length)++] = value; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[*length] = NULL; -#line 3058 "YouTubePublishing.c" +#line 3056 "YouTubePublishing.c" } @@ -3099,13 +3097,13 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc *size = (*size) ? (2 * (*size)) : 4; #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 3069 "YouTubePublishing.c" +#line 3067 "YouTubePublishing.c" } #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[(*length)++] = value; #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[*length] = NULL; -#line 3075 "YouTubePublishing.c" +#line 3073 "YouTubePublishing.c" } @@ -3116,13 +3114,13 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc *size = (*size) ? (2 * (*size)) : 4; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1); -#line 3086 "YouTubePublishing.c" +#line 3084 "YouTubePublishing.c" } #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[(*length)++] = value; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" (*array)[*length] = NULL; -#line 3092 "YouTubePublishing.c" +#line 3090 "YouTubePublishing.c" } @@ -3194,13 +3192,13 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you if (result_length1) { #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *result_length1 = _tmp10__length1; -#line 3164 "YouTubePublishing.c" +#line 3162 "YouTubePublishing.c" } #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" result = _tmp10_; #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 3170 "YouTubePublishing.c" +#line 3168 "YouTubePublishing.c" } @@ -3224,7 +3222,7 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S result = _tmp2_; #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 3194 "YouTubePublishing.c" +#line 3192 "YouTubePublishing.c" } @@ -3237,7 +3235,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 3207 "YouTubePublishing.c" +#line 3205 "YouTubePublishing.c" } @@ -3247,7 +3245,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_installed ( self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self); -#line 3217 "YouTubePublishing.c" +#line 3215 "YouTubePublishing.c" } @@ -3255,7 +3253,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled PublishingYouTubePublishingOptionsPane * self; #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane); -#line 3225 "YouTubePublishing.c" +#line 3223 "YouTubePublishing.c" } @@ -3282,21 +3280,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_ self->privacy_setting = _tmp2_; #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 3252 "YouTubePublishing.c" +#line 3250 "YouTubePublishing.c" } static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) { #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting); -#line 3259 "YouTubePublishing.c" +#line 3257 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 3266 "YouTubePublishing.c" +#line 3264 "YouTubePublishing.c" } @@ -3305,7 +3303,7 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio if (value->data[0].v_pointer) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer); -#line 3275 "YouTubePublishing.c" +#line 3273 "YouTubePublishing.c" } } @@ -3315,11 +3313,11 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio if (src_value->data[0].v_pointer) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer); -#line 3285 "YouTubePublishing.c" +#line 3283 "YouTubePublishing.c" } else { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 3289 "YouTubePublishing.c" +#line 3287 "YouTubePublishing.c" } } @@ -3327,37 +3325,37 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 3297 "YouTubePublishing.c" +#line 3295 "YouTubePublishing.c" } static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (collect_values[0].v_pointer) { -#line 3304 "YouTubePublishing.c" +#line 3302 "YouTubePublishing.c" PublishingYouTubePublishingOptionsPanePrivacyDescription* object; object = collect_values[0].v_pointer; #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (object->parent_instance.g_class == NULL) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3311 "YouTubePublishing.c" +#line 3309 "YouTubePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3315 "YouTubePublishing.c" +#line 3313 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object); -#line 3319 "YouTubePublishing.c" +#line 3317 "YouTubePublishing.c" } else { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 3323 "YouTubePublishing.c" +#line 3321 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 3327 "YouTubePublishing.c" +#line 3325 "YouTubePublishing.c" } @@ -3368,25 +3366,25 @@ static gchar* publishing_you_tube_publishing_options_pane_value_privacy_descript if (!object_p) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3338 "YouTubePublishing.c" +#line 3336 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (!value->data[0].v_pointer) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = NULL; -#line 3344 "YouTubePublishing.c" +#line 3342 "YouTubePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = value->data[0].v_pointer; -#line 3348 "YouTubePublishing.c" +#line 3346 "YouTubePublishing.c" } else { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" *object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 3352 "YouTubePublishing.c" +#line 3350 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return NULL; -#line 3356 "YouTubePublishing.c" +#line 3354 "YouTubePublishing.c" } @@ -3400,7 +3398,7 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac G_PARAM_SPEC (spec)->value_type = object_type; #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return G_PARAM_SPEC (spec); -#line 3370 "YouTubePublishing.c" +#line 3368 "YouTubePublishing.c" } @@ -3409,7 +3407,7 @@ static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_de g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return value->data[0].v_pointer; -#line 3379 "YouTubePublishing.c" +#line 3377 "YouTubePublishing.c" } @@ -3429,17 +3427,17 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri value->data[0].v_pointer = v_object; #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer); -#line 3399 "YouTubePublishing.c" +#line 3397 "YouTubePublishing.c" } else { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 3403 "YouTubePublishing.c" +#line 3401 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (old); -#line 3409 "YouTubePublishing.c" +#line 3407 "YouTubePublishing.c" } } @@ -3458,17 +3456,17 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = v_object; -#line 3428 "YouTubePublishing.c" +#line 3426 "YouTubePublishing.c" } else { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" value->data[0].v_pointer = NULL; -#line 3432 "YouTubePublishing.c" +#line 3430 "YouTubePublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (old) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_publishing_options_pane_privacy_description_unref (old); -#line 3438 "YouTubePublishing.c" +#line 3436 "YouTubePublishing.c" } } @@ -3478,14 +3476,14 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_clas publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" ((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize; -#line 3448 "YouTubePublishing.c" +#line 3446 "YouTubePublishing.c" } static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) { #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->ref_count = 1; -#line 3455 "YouTubePublishing.c" +#line 3453 "YouTubePublishing.c" } @@ -3497,7 +3495,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina g_signal_handlers_destroy (self); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (self->description); -#line 3467 "YouTubePublishing.c" +#line 3465 "YouTubePublishing.c" } @@ -3522,7 +3520,7 @@ static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ g_atomic_int_inc (&self->ref_count); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return instance; -#line 3492 "YouTubePublishing.c" +#line 3490 "YouTubePublishing.c" } @@ -3535,7 +3533,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3505 "YouTubePublishing.c" +#line 3503 "YouTubePublishing.c" } } @@ -3551,7 +3549,7 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 3521 "YouTubePublishing.c" +#line 3519 "YouTubePublishing.c" } @@ -3566,7 +3564,7 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed; #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled; -#line 3536 "YouTubePublishing.c" +#line 3534 "YouTubePublishing.c" } @@ -3589,7 +3587,7 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin self->priv->builder = NULL; #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->privacy_label = NULL; -#line 3559 "YouTubePublishing.c" +#line 3557 "YouTubePublishing.c" } @@ -3619,7 +3617,7 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) _publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters); #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj); -#line 3589 "YouTubePublishing.c" +#line 3587 "YouTubePublishing.c" } @@ -3640,7 +3638,7 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3610 "YouTubePublishing.c" +#line 3608 "YouTubePublishing.c" } @@ -3697,14 +3695,14 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const self->priv->publishable = _tmp8_; #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 3667 "YouTubePublishing.c" +#line 3665 "YouTubePublishing.c" } PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 3674 "YouTubePublishing.c" +#line 3672 "YouTubePublishing.c" } @@ -3720,69 +3718,55 @@ 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 3718 "YouTubePublishing.c" +#line 3716 "YouTubePublishing.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 3724 "YouTubePublishing.c" -} - - -static guint8* _vala_array_dup11 (guint8* self, int length) { -#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 3731 "YouTubePublishing.c" +#line 3722 "YouTubePublishing.c" } static void _vala_SoupBuffer_free (SoupBuffer* self) { #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_boxed_free (soup_buffer_get_type (), self); -#line 3738 "YouTubePublishing.c" +#line 3729 "YouTubePublishing.c" } static void _vala_SoupMultipart_free (SoupMultipart* self) { #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_boxed_free (soup_multipart_get_type (), self); -#line 3745 "YouTubePublishing.c" -} - - -static guint8* _vala_array_dup12 (guint8* self, int length) { -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 3752 "YouTubePublishing.c" +#line 3736 "YouTubePublishing.c" } @@ -3818,47 +3802,44 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS gint _tmp22__length1 = 0; guint8* _tmp23_ = NULL; gint _tmp23__length1 = 0; - guint8* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - SoupBuffer* _tmp25_ = NULL; - SoupMultipart* _tmp26_ = NULL; - SoupBuffer* _tmp27_ = NULL; + SoupBuffer* _tmp24_ = NULL; + SoupMultipart* _tmp25_ = NULL; + SoupBuffer* _tmp26_ = NULL; gchar* video_data = NULL; gsize data_length = 0UL; SoupBuffer* bindable_data = NULL; - const gchar* _tmp47_ = NULL; + const gchar* _tmp46_ = NULL; + guint8* _tmp47_ = NULL; + gint _tmp47__length1 = 0; guint8* _tmp48_ = NULL; gint _tmp48__length1 = 0; - guint8* _tmp49_ = NULL; - gint _tmp49__length1 = 0; - guint8* _tmp50_ = NULL; - gint _tmp50__length1 = 0; - SoupBuffer* _tmp51_ = NULL; - SoupMultipart* _tmp52_ = NULL; - SpitPublishingPublishable* _tmp53_ = NULL; + gsize _tmp49_ = 0UL; + SoupBuffer* _tmp50_ = NULL; + SoupMultipart* _tmp51_ = NULL; + SpitPublishingPublishable* _tmp52_ = NULL; + GFile* _tmp53_ = NULL; GFile* _tmp54_ = NULL; - GFile* _tmp55_ = NULL; + gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; SoupMessage* outbound_message = NULL; + gchar* _tmp57_ = NULL; gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - SoupMultipart* _tmp60_ = NULL; + SoupMultipart* _tmp59_ = NULL; + SoupMessage* _tmp60_ = NULL; SoupMessage* _tmp61_ = NULL; - SoupMessage* _tmp62_ = NULL; - SoupMessageHeaders* _tmp63_ = NULL; + SoupMessageHeaders* _tmp62_ = NULL; + gchar* _tmp63_ = NULL; gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - SoupMessageHeaders* _tmp66_ = NULL; - SpitPublishingPublishable* _tmp67_ = NULL; + SoupMessageHeaders* _tmp65_ = NULL; + SpitPublishingPublishable* _tmp66_ = NULL; + gchar* _tmp67_ = NULL; gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - SoupMessageHeaders* _tmp70_ = NULL; - PublishingRESTSupportGoogleSession* _tmp71_ = NULL; + SoupMessageHeaders* _tmp69_ = NULL; + PublishingRESTSupportGoogleSession* _tmp70_ = NULL; + gchar* _tmp71_ = NULL; gchar* _tmp72_ = NULL; gchar* _tmp73_ = NULL; gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; GError * _inner_error_ = NULL; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction); @@ -3874,11 +3855,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS if (_tmp3_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) { #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML; -#line 3844 "YouTubePublishing.c" +#line 3825 "YouTubePublishing.c" } else { #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = ""; -#line 3848 "YouTubePublishing.c" +#line 3829 "YouTubePublishing.c" } #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp4_ = g_strdup (_tmp1_); @@ -3892,11 +3873,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS if (_tmp7_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE) { #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML; -#line 3862 "YouTubePublishing.c" +#line 3843 "YouTubePublishing.c" } else { #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = ""; -#line 3866 "YouTubePublishing.c" +#line 3847 "YouTubePublishing.c" } #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp8_ = g_strdup (_tmp5_); @@ -3912,7 +3893,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _tmp11_ = title; #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (g_strcmp0 (_tmp11_, "") == 0) { -#line 3882 "YouTubePublishing.c" +#line 3863 "YouTubePublishing.c" SpitPublishingPublishable* _tmp12_ = NULL; gchar* _tmp13_ = NULL; #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -3923,7 +3904,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _g_free0 (title); #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" title = _tmp13_; -#line 3893 "YouTubePublishing.c" +#line 3874 "YouTubePublishing.c" } #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp14_ = title; @@ -3952,55 +3933,51 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp23__length1 = _tmp22__length1; #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp24_ = (_tmp23_ != NULL) ? _vala_array_dup11 (_tmp23_, _tmp23__length1) : ((gpointer) _tmp23_); -#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp24__length1 = _tmp23__length1; + _tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp25_ = soup_buffer_new_take (_tmp24_, _tmp24__length1); -#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - metadata_buffer = _tmp25_; + metadata_buffer = _tmp24_; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp26_ = message_parts; + _tmp25_ = message_parts; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp27_ = metadata_buffer; + _tmp26_ = metadata_buffer; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - soup_multipart_append_form_file (_tmp26_, "", "", "application/atom+xml", _tmp27_); -#line 3935 "YouTubePublishing.c" + soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_); +#line 3912 "YouTubePublishing.c" { - SpitPublishingPublishable* _tmp28_ = NULL; + SpitPublishingPublishable* _tmp27_ = NULL; + GFile* _tmp28_ = NULL; GFile* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; + gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gsize _tmp34_ = 0UL; + gsize _tmp33_ = 0UL; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp28_ = self->priv->publishable; + _tmp27_ = self->priv->publishable; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_); + _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp31_ = g_file_get_path (_tmp30_); + _tmp30_ = g_file_get_path (_tmp29_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_file_get_contents (_tmp32_, &_tmp33_, &_tmp34_, &_inner_error_); + g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_inner_error_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (video_data); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - video_data = _tmp33_; + video_data = _tmp32_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - data_length = _tmp34_; + data_length = _tmp33_; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp32_); + _g_free0 (_tmp31_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp29_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 3970 "YouTubePublishing.c" +#line 3947 "YouTubePublishing.c" goto __catch31_g_file_error; } #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -4023,7 +4000,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS g_clear_error (&_inner_error_); #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 3993 "YouTubePublishing.c" +#line 3970 "YouTubePublishing.c" } } goto __finally31; @@ -4031,61 +4008,61 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS { GError* e = NULL; gchar* msg = NULL; - SpitPublishingPublishable* _tmp35_ = NULL; + SpitPublishingPublishable* _tmp34_ = NULL; + GFile* _tmp35_ = NULL; GFile* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; + gchar* _tmp37_ = NULL; gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - GError* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; + GError* _tmp39_ = NULL; + const gchar* _tmp40_ = NULL; + gchar* _tmp41_ = NULL; gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; + const gchar* _tmp43_ = NULL; const gchar* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - GError* _tmp46_ = NULL; + GError* _tmp45_ = NULL; #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" e = _inner_error_; #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _inner_error_ = NULL; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp35_ = self->priv->publishable; + _tmp34_ = self->priv->publishable; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp36_ = spit_publishing_publishable_get_serialized_file (_tmp35_); + _tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp37_ = _tmp36_; + _tmp36_ = _tmp35_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp38_ = g_file_get_path (_tmp37_); + _tmp37_ = g_file_get_path (_tmp36_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp40_ = e; + _tmp39_ = e; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp41_ = _tmp40_->message; + _tmp40_ = _tmp39_->message; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp42_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp39_, _tmp41_); + _tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp43_ = _tmp42_; + _tmp42_ = _tmp41_; #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp38_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_object_unref0 (_tmp37_); + _g_object_unref0 (_tmp36_); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - msg = _tmp43_; + msg = _tmp42_; #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp44_ = msg; + _tmp43_ = msg; #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - g_warning ("YouTubePublishing.vala:580: %s", _tmp44_); + g_warning ("YouTubePublishing.vala:580: %s", _tmp43_); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp45_ = msg; + _tmp44_ = msg; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp46_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp45_); + _tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _inner_error_ = _tmp46_; + _inner_error_ = _tmp45_; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (msg); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_error_free0 (e); -#line 4055 "YouTubePublishing.c" +#line 4032 "YouTubePublishing.c" goto __finally31; } __finally31: @@ -4111,7 +4088,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS __vala_SoupMultipart_free0 (message_parts); #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 4081 "YouTubePublishing.c" +#line 4058 "YouTubePublishing.c" } else { #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (video_data); @@ -4133,156 +4110,154 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS g_clear_error (&_inner_error_); #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 4103 "YouTubePublishing.c" +#line 4080 "YouTubePublishing.c" } } #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp47_ = video_data; + _tmp46_ = video_data; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp48_ = string_get_data (_tmp47_, &_tmp48__length1); + _tmp47_ = string_get_data (_tmp46_, &_tmp47__length1); #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp49_ = _tmp48_; + _tmp48_ = _tmp47_; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp49__length1 = _tmp48__length1; + _tmp48__length1 = _tmp47__length1; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp50_ = (_tmp49_ != NULL) ? _vala_array_dup12 (_tmp49_, _tmp49__length1) : ((gpointer) _tmp49_); + _tmp49_ = data_length; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp50__length1 = _tmp49__length1; + _tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0); #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp51_ = soup_buffer_new_take (_tmp50_, _tmp50__length1); -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - bindable_data = _tmp51_; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp52_ = message_parts; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp53_ = self->priv->publishable; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp54_ = spit_publishing_publishable_get_serialized_file (_tmp53_); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp55_ = _tmp54_; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp56_ = g_file_get_path (_tmp55_); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp57_ = _tmp56_; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - soup_multipart_append_form_file (_tmp52_, "", _tmp57_, "video/mpeg", bindable_data); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp57_); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_object_unref0 (_tmp55_); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp59_ = _tmp58_; -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp60_ = message_parts; -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp61_ = soup_form_request_new_from_multipart (_tmp59_, _tmp60_); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp62_ = _tmp61_; -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp59_); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - outbound_message = _tmp62_; -#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp63_ = outbound_message->request_headers; -#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp64_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY); -#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp65_ = _tmp64_; -#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - soup_message_headers_append (_tmp63_, "X-GData-Key", _tmp65_); -#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp65_); -#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp66_ = outbound_message->request_headers; + bindable_data = _tmp50_; +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp51_ = message_parts; +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp52_ = self->priv->publishable; +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp53_ = spit_publishing_publishable_get_serialized_file (_tmp52_); +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp54_ = _tmp53_; +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp55_ = g_file_get_path (_tmp54_); +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp56_ = _tmp55_; +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + soup_multipart_append_form_file (_tmp51_, "", _tmp56_, "video/mpeg", bindable_data); +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp56_); +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_object_unref0 (_tmp54_); +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp57_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp58_ = _tmp57_; +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp59_ = message_parts; +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp60_ = soup_form_request_new_from_multipart (_tmp58_, _tmp59_); +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp61_ = _tmp60_; +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp58_); +#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + outbound_message = _tmp61_; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp67_ = self->priv->publishable; + _tmp62_ = outbound_message->request_headers; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp68_ = spit_publishing_publishable_get_param_string (_tmp67_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); + _tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY); #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp69_ = _tmp68_; + _tmp64_ = _tmp63_; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - soup_message_headers_append (_tmp66_, "Slug", _tmp69_); + soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_); #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp69_); -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp70_ = outbound_message->request_headers; -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp71_ = self->priv->session; -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp72_ = publishing_rest_support_google_session_get_access_token (_tmp71_); -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp73_ = _tmp72_; -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp74_ = g_strconcat ("Bearer ", _tmp73_, NULL); -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _tmp75_ = _tmp74_; -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - soup_message_headers_append (_tmp70_, "Authorization", _tmp75_); -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp75_); -#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - _g_free0 (_tmp73_); -#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp64_); +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp65_ = outbound_message->request_headers; +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp66_ = self->priv->publishable; +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp67_ = spit_publishing_publishable_get_param_string (_tmp66_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp68_ = _tmp67_; +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + soup_message_headers_append (_tmp65_, "Slug", _tmp68_); +#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp68_); +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp69_ = outbound_message->request_headers; +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp70_ = self->priv->session; +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp71_ = publishing_rest_support_google_session_get_access_token (_tmp70_); +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp72_ = _tmp71_; +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp73_ = g_strconcat ("Bearer ", _tmp72_, NULL); +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _tmp74_ = _tmp73_; +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + soup_message_headers_append (_tmp69_, "Authorization", _tmp74_); +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp74_); +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + _g_free0 (_tmp72_); +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message); -#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE); +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_propagate_error (error, _inner_error_); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (outbound_message); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupBuffer_free0 (bindable_data); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (video_data); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupBuffer_free0 (metadata_buffer); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (metadata); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (title); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (private_video); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (unlisted_video); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupMultipart_free0 (message_parts); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 4226 "YouTubePublishing.c" +#line 4201 "YouTubePublishing.c" } else { -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (outbound_message); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupBuffer_free0 (bindable_data); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (video_data); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupBuffer_free0 (metadata_buffer); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (metadata); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (title); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (private_video); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_free0 (unlisted_video); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupMultipart_free0 (message_parts); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_clear_error (&_inner_error_); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return; -#line 4252 "YouTubePublishing.c" +#line 4227 "YouTubePublishing.c" } } #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" @@ -4303,7 +4278,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS _g_free0 (unlisted_video); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" __vala_SoupMultipart_free0 (message_parts); -#line 4273 "YouTubePublishing.c" +#line 4248 "YouTubePublishing.c" } @@ -4316,14 +4291,14 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate)); #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute; -#line 4286 "YouTubePublishing.c" +#line 4261 "YouTubePublishing.c" } static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) { #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 4293 "YouTubePublishing.c" +#line 4268 "YouTubePublishing.c" } @@ -4339,7 +4314,7 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo _g_object_unref0 (self->priv->publishable); #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj); -#line 4309 "YouTubePublishing.c" +#line 4284 "YouTubePublishing.c" } @@ -4362,36 +4337,36 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_ gint _tmp1__length1 = 0; PublishingYouTubePublishingParameters* _tmp2_ = NULL; PublishingYouTubePublishingParameters* _tmp3_ = NULL; -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL); -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = session; -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = publishables; -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1__length1 = publishables_length1; -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1); -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = parameters; -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_); -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters); -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv->parameters = _tmp3_; -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return self; -#line 4354 "YouTubePublishing.c" +#line 4329 "YouTubePublishing.c" } PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) { -#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 4361 "YouTubePublishing.c" +#line 4336 "YouTubePublishing.c" } @@ -4405,65 +4380,65 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat SpitPublishingPublishable* _tmp4_ = NULL; PublishingYouTubeUploadTransaction* _tmp5_ = NULL; PublishingRESTSupportTransaction* _tmp6_ = NULL; -#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader); -#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp2_ = self->priv->parameters; -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp4_ = _tmp3_; -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _g_object_unref0 (_tmp4_); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" result = _tmp6_; -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" return result; -#line 4401 "YouTubePublishing.c" +#line 4376 "YouTubePublishing.c" } static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) { -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize; -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate)); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction; -#line 4414 "YouTubePublishing.c" +#line 4389 "YouTubePublishing.c" } static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) { -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self); -#line 4421 "YouTubePublishing.c" +#line 4396 "YouTubePublishing.c" } static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { PublishingYouTubeUploader * self; -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader); #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader); +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" _publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" +#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj); -#line 4433 "YouTubePublishing.c" +#line 4408 "YouTubePublishing.c" } diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala index d7db9f8..48241bd 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.vala +++ b/plugins/shotwell-publishing/YouTubePublishing.vala @@ -565,7 +565,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(title), private_video, unlisted_video); - var metadata_buffer = new Soup.Buffer.take (metadata.data); + Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data); message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer); // attempt to read the binary video data from disk @@ -585,7 +585,8 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen // bind the binary video data read from disk into a Soup.Buffer object so that we // can attach it to the multipart request, then actaully append the buffer // to the multipart request. Then, set the MIME type for this part. - var bindable_data = new Soup.Buffer.take (video_data.data); + Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, + video_data.data[0:data_length]); message_parts.append_form_file("", publishable.get_serialized_file().get_path(), "video/mpeg", bindable_data); diff --git a/plugins/shotwell-publishing/facebook_publishing_options_pane.ui b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui index 674b078..4d6b021 100644 --- a/plugins/shotwell-publishing/facebook_publishing_options_pane.ui +++ b/plugins/shotwell-publishing/facebook_publishing_options_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -16,9 +17,11 @@ True False - 0.30000001192092896 - 16 - (text depends on fb username and is modified in the app - + 16 + 16 + 16 + 16 + (text depends on fb username and is modified in the app - anything put into this field won't display) @@ -40,16 +43,14 @@ anything put into this field won't display) True True False + start True - 0 True create_new_radio 0 0 - 1 - 1 @@ -58,17 +59,15 @@ anything put into this field won't display) True True False + start 8 True - 0 True True 0 1 - 1 - 1 @@ -77,34 +76,27 @@ anything put into this field won't display) True 8 ● - True 1 1 - 1 - 1 True False - 0 - 1 1 0 - 1 - 1 True False - 0 + start Upload _size: True resolution_combo @@ -112,8 +104,6 @@ anything put into this field won't display) 0 3 - 1 - 1 @@ -121,21 +111,17 @@ anything put into this field won't display) True False start - 0 - 1 1 3 - 1 - 1 True False - 0 + start Videos and new photo albums _visible to: True visibility_combo @@ -143,8 +129,6 @@ anything put into this field won't display) 0 2 - 1 - 1 @@ -152,14 +136,10 @@ anything put into this field won't display) True False start - 0 - 1 1 2 - 1 - 1 @@ -176,8 +156,8 @@ anything put into this field won't display) True True False + start True - 0.10000000149011612 True diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui index e20fb38..dd4c35c 100644 --- a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui +++ b/plugins/shotwell-publishing/flickr_pin_entry_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -32,8 +33,7 @@ True False - 1 - 1 + end Authorization _Number: True right @@ -51,7 +51,6 @@ True 8 ● - True False @@ -60,42 +59,32 @@ - - True - True - 1 - - - - - True - False - vertical - False - True - 2 + False + 1 Con_tinue - False True True True 240 240 160 - False True False - True - 3 + False + end + 2 + + + diff --git a/plugins/shotwell-publishing/flickr_publishing_options_pane.ui b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui index 7f67438..77d32cf 100644 --- a/plugins/shotwell-publishing/flickr_publishing_options_pane.ui +++ b/plugins/shotwell-publishing/flickr_publishing_options_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -16,7 +17,7 @@ True False - You are logged into Flickr as (name). + You are logged into Flickr as (name). (this label's string is populated and set inside the code, so changes made here will not display) @@ -41,7 +42,8 @@ so changes made here will not display) True False - _visibility label (populated in the code) + end + _visibility label (populated in the code) True right visibility_combo @@ -49,15 +51,13 @@ so changes made here will not display) 0 0 - 1 - 1 True False - 1 + end Photo _size: True size_combo @@ -65,36 +65,26 @@ so changes made here will not display) 0 1 - 1 - 1 True False - 0 - 1 1 0 - 1 - 1 True False - 0 - 1 1 1 - 1 - 1 @@ -103,17 +93,15 @@ so changes made here will not display) True True False - center + start 16 True - 0.17000000178813934 True 0 2 2 - 1 diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui index adee4d2..04d3948 100644 --- a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui +++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui @@ -1,6 +1,7 @@ - - + + + True False @@ -15,7 +16,7 @@ False 12 32 - 'you are logged in as $name' + 'you are logged in as $name' (populated in the application code) @@ -47,14 +48,10 @@ True False - 0 - 1 1 1 - 1 - 1 @@ -66,8 +63,6 @@ 1 2 - 1 - 1 @@ -76,8 +71,8 @@ True True False + start True - 0 True True create_new_radio @@ -85,8 +80,6 @@ 0 1 - 1 - 1 @@ -95,17 +88,14 @@ True True False + start True - 0 - 0.47999998927116394 True True 0 2 - 1 - 1 @@ -114,39 +104,36 @@ True True False + start True - 0 True 1 3 - 1 - 1 True False + start 32 - 0 - $mediatype will appear in + $mediatype will appear in (populated in code) 0 0 2 - 1 True False + start 32 - 0 Photo _size preset: True size_combo @@ -154,8 +141,6 @@ 0 4 - 1 - 1 @@ -163,14 +148,10 @@ True False 32 - 0 - 1 1 4 - 1 - 1 @@ -179,18 +160,16 @@ True True False - center + start 16 True True - 0.20000000298023224 True 0 5 2 - 1 diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui b/plugins/shotwell-publishing/piwigo_authentication_pane.ui index 39c8d7c..82c9018 100644 --- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui +++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui @@ -1,6 +1,6 @@ - + False diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui index bbcd942..397d2ec 100644 --- a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui +++ b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui @@ -1,7 +1,7 @@ - - + + False diff --git a/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui index 8175627..d191025 100644 --- a/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui +++ b/plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui @@ -1,7 +1,7 @@ - - + + False diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index c5b6a4b..7886a92 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.32.1, the Vala compiler +/* shotwell-publishing.c generated by valac 0.34.4, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index a8fa711..fb43939 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.32.1, the Vala compiler +/* BlindsEffect.c generated by valac 0.34.4, the Vala compiler * generated from BlindsEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index a59a2e6..0cb60bf 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.32.1, the Vala compiler +/* ChessEffect.c generated by valac 0.34.4, the Vala compiler * generated from ChessEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index 0bd66ef..c905549 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.32.1, the Vala compiler +/* CircleEffect.c generated by valac 0.34.4, the Vala compiler * generated from CircleEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index 542de61..9450def 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.32.1, the Vala compiler +/* CirclesEffect.c generated by valac 0.34.4, the Vala compiler * generated from CirclesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index 3074f40..ddf902e 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.32.1, the Vala compiler +/* ClockEffect.c generated by valac 0.34.4, the Vala compiler * generated from ClockEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 4fab4db..11f0a95 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.32.1, the Vala compiler +/* CrumbleEffect.c generated by valac 0.34.4, the Vala compiler * generated from CrumbleEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index 132f3d6..a7f76aa 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.32.1, the Vala compiler +/* FadeEffect.c generated by valac 0.34.4, the Vala compiler * generated from FadeEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 1fa1cd3..1797114 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.32.1, the Vala compiler +/* SlideEffect.c generated by valac 0.34.4, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index 29fab0c..b81172a 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.32.1, the Vala compiler +/* SquaresEffect.c generated by valac 0.34.4, the Vala compiler * generated from SquaresEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index c6e802d..a4aa40b 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.32.1, the Vala compiler +/* StripesEffect.c generated by valac 0.34.4, the Vala compiler * generated from StripesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index 7e6d981..b3a448a 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.32.1, the Vala compiler +/* shotwell-transitions.c generated by valac 0.34.4, the Vala compiler * generated from shotwell-transitions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. -- cgit v1.2.3