diff options
Diffstat (limited to 'plugins/shotwell-publishing/FlickrPublishing.c')
| -rw-r--r-- | plugins/shotwell-publishing/FlickrPublishing.c | 5805 |
1 files changed, 2789 insertions, 3016 deletions
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 <glib/gi18n-lib.h> #include <float.h> #include <math.h> +#include <libsoup/soup.h> #include <gtk/gtk.h> #include <libxml/tree.h> #include <gee.h> -#include <libsoup/soup.h> #include <gexiv2/gexiv2.h> #include <gobject/gvaluecollector.h> @@ -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); + _tmp2_ = soup_form_decode (_tmp1_); #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_); -#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _key_value_pairs_size_ = key_value_pairs_length1; -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = key_value_pairs; -#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; + data = _tmp2_; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - pair_collection = _tmp4_; + _tmp3_ = data; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - pair_collection_length1 = _tmp4__length1; + g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_); #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" - _tmp9_ = split_pair; + if (_tmp10_ == NULL) { #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9__length1 = split_pair_length1; + _tmp9_ = TRUE; +#line 2881 "FlickrPublishing.c" + } else { + const gchar* _tmp11_ = NULL; #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; + _tmp11_ = oauth_token_secret; +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp9_ = _tmp11_ == NULL; +#line 2888 "FlickrPublishing.c" + } +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + 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" } |