diff options
Diffstat (limited to 'plugins/shotwell-publishing/FlickrPublishing.c')
| -rw-r--r-- | plugins/shotwell-publishing/FlickrPublishing.c | 6225 |
1 files changed, 2252 insertions, 3973 deletions
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index 25f2d69..fb7e9a3 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -77,16 +77,6 @@ typedef struct _PublishingFlickrPublishingParametersPrivate PublishingFlickrPubl typedef struct _PublishingFlickrParamSpecPublishingParameters PublishingFlickrParamSpecPublishingParameters; typedef struct _PublishingFlickrFlickrPublisherPrivate PublishingFlickrFlickrPublisherPrivate; -#define PUBLISHING_FLICKR_TYPE_SESSION (publishing_flickr_session_get_type ()) -#define PUBLISHING_FLICKR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession)) -#define PUBLISHING_FLICKR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass)) -#define PUBLISHING_FLICKR_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_SESSION)) -#define PUBLISHING_FLICKR_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_SESSION)) -#define PUBLISHING_FLICKR_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass)) - -typedef struct _PublishingFlickrSession PublishingFlickrSession; -typedef struct _PublishingFlickrSessionClass PublishingFlickrSessionClass; - #define PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE (publishing_flickr_publishing_options_pane_get_type ()) #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane)) #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPaneClass)) @@ -102,16 +92,6 @@ typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPubli #define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) -#define PUBLISHING_FLICKR_TYPE_TRANSACTION (publishing_flickr_transaction_get_type ()) -#define PUBLISHING_FLICKR_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction)) -#define PUBLISHING_FLICKR_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass)) -#define PUBLISHING_FLICKR_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION)) -#define PUBLISHING_FLICKR_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION)) -#define PUBLISHING_FLICKR_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass)) - -typedef struct _PublishingFlickrTransaction PublishingFlickrTransaction; -typedef struct _PublishingFlickrTransactionClass PublishingFlickrTransactionClass; - #define PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION (publishing_flickr_account_info_fetch_transaction_get_type ()) #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransaction)) #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransactionClass)) @@ -136,7 +116,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionClass PublishingFlick typedef struct _PublishingFlickrUploader PublishingFlickrUploader; typedef struct _PublishingFlickrUploaderClass PublishingFlickrUploaderClass; #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL))) -typedef struct _PublishingFlickrTransactionPrivate PublishingFlickrTransactionPrivate; typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFlickrAccountInfoFetchTransactionPrivate; #define PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION (publishing_flickr_upload_transaction_get_type ()) @@ -149,8 +128,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFli typedef struct _PublishingFlickrUploadTransaction PublishingFlickrUploadTransaction; typedef struct _PublishingFlickrUploadTransactionClass PublishingFlickrUploadTransactionClass; typedef struct _PublishingFlickrUploadTransactionPrivate PublishingFlickrUploadTransactionPrivate; -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; #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY (publishing_flickr_publishing_options_pane_visibility_entry_get_type ()) @@ -260,62 +237,32 @@ struct _PublishingFlickrFlickrPublisherPrivate { GDestroyNotify progress_reporter_target_destroy_notify; gboolean running; gboolean was_started; - PublishingFlickrSession* session; + PublishingRESTSupportOAuth1Session* session; PublishingFlickrPublishingOptionsPane* publishing_options_pane; SpitPublishingAuthenticator* authenticator; PublishingFlickrPublishingParameters* parameters; }; -struct _PublishingFlickrTransaction { - PublishingRESTSupportTransaction parent_instance; - PublishingFlickrTransactionPrivate * priv; -}; - -struct _PublishingFlickrTransactionClass { - PublishingRESTSupportTransactionClass parent_class; -}; - struct _PublishingFlickrAccountInfoFetchTransaction { - PublishingFlickrTransaction parent_instance; + PublishingRESTSupportOAuth1Transaction parent_instance; PublishingFlickrAccountInfoFetchTransactionPrivate * priv; }; struct _PublishingFlickrAccountInfoFetchTransactionClass { - PublishingFlickrTransactionClass parent_class; + PublishingRESTSupportOAuth1TransactionClass parent_class; }; struct _PublishingFlickrUploadTransaction { - PublishingRESTSupportUploadTransaction parent_instance; + PublishingRESTSupportOAuth1UploadTransaction parent_instance; PublishingFlickrUploadTransactionPrivate * priv; }; struct _PublishingFlickrUploadTransactionClass { - PublishingRESTSupportUploadTransactionClass parent_class; + PublishingRESTSupportOAuth1UploadTransactionClass parent_class; }; struct _PublishingFlickrUploadTransactionPrivate { PublishingFlickrPublishingParameters* parameters; - PublishingFlickrSession* session; - PublishingRESTSupportArgument** auth_header_fields; - gint auth_header_fields_length1; - gint _auth_header_fields_size_; -}; - -struct _PublishingFlickrSession { - PublishingRESTSupportSession parent_instance; - PublishingFlickrSessionPrivate * priv; -}; - -struct _PublishingFlickrSessionClass { - PublishingRESTSupportSessionClass parent_class; -}; - -struct _PublishingFlickrSessionPrivate { - gchar* access_phase_token; - gchar* access_phase_token_secret; - gchar* username; - gchar* consumer_key; - gchar* consumer_secret; }; struct _PublishingFlickrPublishingOptionsPane { @@ -410,10 +357,8 @@ static gpointer publishing_flickr_visibility_specification_parent_class = NULL; static gpointer publishing_flickr_publishing_parameters_parent_class = NULL; static gpointer publishing_flickr_flickr_publisher_parent_class = NULL; static SpitPublishingPublisherIface * publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL; -static gpointer publishing_flickr_transaction_parent_class = NULL; static gpointer publishing_flickr_account_info_fetch_transaction_parent_class = NULL; static gpointer publishing_flickr_upload_transaction_parent_class = NULL; -static gpointer publishing_flickr_session_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_size_entry_parent_class = NULL; static gpointer publishing_flickr_publishing_options_pane_visibility_entry_parent_class = NULL; @@ -443,7 +388,6 @@ static void flickr_service_finalize (GObject * obj); #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest" #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1 #define PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE "98" -#define PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\" GType publishing_flickr_user_kind_get_type (void) G_GNUC_CONST; gpointer publishing_flickr_visibility_specification_ref (gpointer instance); void publishing_flickr_visibility_specification_unref (gpointer instance); @@ -471,7 +415,6 @@ enum { PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void); PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type); static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj); -GType publishing_flickr_session_get_type (void) G_GNUC_CONST; GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate)) enum { @@ -479,14 +422,9 @@ enum { }; static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self); static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self); -PublishingFlickrSession* publishing_flickr_session_new (void); -PublishingFlickrSession* publishing_flickr_session_construct (GType object_type); SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self); static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self); static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata); -void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret); -void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username); -gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self); static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self); static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn); static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); @@ -507,10 +445,9 @@ static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_re static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err); static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self); static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self); -GType publishing_flickr_transaction_get_type (void) G_GNUC_CONST; GType publishing_flickr_account_info_fetch_transaction_get_type (void) G_GNUC_CONST; -PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session); -PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session); +PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session); +PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session); PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error); static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self); PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata); @@ -518,8 +455,8 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b); static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); GType publishing_flickr_uploader_get_type (void) G_GNUC_CONST; -PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata); -PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata); +PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata); +PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata); static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self); void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis); @@ -530,46 +467,21 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base); static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base); static void publishing_flickr_flickr_publisher_finalize (GObject * obj); -enum { - PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY -}; -PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method); -PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method); -gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self); -gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self); -gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self); -PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method); -PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method); -static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn); gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc); static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self); enum { PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY }; -gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self); GType publishing_flickr_upload_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransactionPrivate)) enum { PUBLISHING_FLICKR_UPLOAD_TRANSACTION_DUMMY_PROPERTY }; -PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable); -PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable); -void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value); +PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable); +PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable); static void _g_free0_ (gpointer var); -static void _vala_array_add19 (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_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); -#define PUBLISHING_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionPrivate)) -enum { - PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY -}; -static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base); -static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value); -static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj); static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance); static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance); 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) G_GNUC_UNUSED; @@ -602,18 +514,18 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification); static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification); +static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); -static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value); static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size); static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size); +static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); -static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value); void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self); void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self); static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base); @@ -636,7 +548,7 @@ enum { PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY }; static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable); -static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value); static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -658,7 +570,7 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = flickr_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 662 "FlickrPublishing.c" +#line 574 "FlickrPublishing.c" gint _tmp1_; GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -671,18 +583,18 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire flickr_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1; -#line 675 "FlickrPublishing.c" +#line 587 "FlickrPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 679 "FlickrPublishing.c" +#line 591 "FlickrPublishing.c" } FlickrService* flickr_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory); -#line 686 "FlickrPublishing.c" +#line 598 "FlickrPublishing.c" } @@ -704,7 +616,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 708 "FlickrPublishing.c" +#line 620 "FlickrPublishing.c" } @@ -717,7 +629,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.flickr"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 721 "FlickrPublishing.c" +#line 633 "FlickrPublishing.c" } @@ -730,14 +642,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base) result = "Flickr"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 734 "FlickrPublishing.c" +#line 646 "FlickrPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 741 "FlickrPublishing.c" +#line 653 "FlickrPublishing.c" } @@ -748,17 +660,17 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 752 "FlickrPublishing.c" +#line 664 "FlickrPublishing.c" GdkPixbuf* _tmp0_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 758 "FlickrPublishing.c" +#line 670 "FlickrPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 762 "FlickrPublishing.c" +#line 674 "FlickrPublishing.c" } @@ -837,7 +749,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).icons_length1 = _tmp8__length1; -#line 841 "FlickrPublishing.c" +#line 753 "FlickrPublishing.c" } @@ -845,7 +757,7 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable FlickrService * self; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); -#line 849 "FlickrPublishing.c" +#line 761 "FlickrPublishing.c" } @@ -866,7 +778,7 @@ static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 870 "FlickrPublishing.c" +#line 782 "FlickrPublishing.c" } @@ -879,7 +791,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 883 "FlickrPublishing.c" +#line 795 "FlickrPublishing.c" } @@ -888,7 +800,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) { flickr_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize; -#line 892 "FlickrPublishing.c" +#line 804 "FlickrPublishing.c" } @@ -905,7 +817,7 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) flickr_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation; -#line 909 "FlickrPublishing.c" +#line 821 "FlickrPublishing.c" } @@ -916,7 +828,7 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) flickr_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media; -#line 920 "FlickrPublishing.c" +#line 832 "FlickrPublishing.c" } @@ -930,7 +842,7 @@ static void flickr_service_finalize (GObject * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj); -#line 934 "FlickrPublishing.c" +#line 846 "FlickrPublishing.c" } @@ -967,236 +879,236 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat gint _tmp0_; gint _tmp1_; gint _tmp2_; -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type); -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = friends_level; -#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->friends_level = _tmp0_; -#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = family_level; -#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->family_level = _tmp1_; -#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = everyone_level; -#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->everyone_level = _tmp2_; -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 987 "FlickrPublishing.c" +#line 899 "FlickrPublishing.c" } PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) { -#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level); -#line 994 "FlickrPublishing.c" +#line 906 "FlickrPublishing.c" } static void publishing_flickr_value_visibility_specification_init (GValue* value) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1001 "FlickrPublishing.c" +#line 913 "FlickrPublishing.c" } static void publishing_flickr_value_visibility_specification_free_value (GValue* value) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (value->data[0].v_pointer); -#line 1010 "FlickrPublishing.c" +#line 922 "FlickrPublishing.c" } } static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer); -#line 1020 "FlickrPublishing.c" +#line 932 "FlickrPublishing.c" } else { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1024 "FlickrPublishing.c" +#line 936 "FlickrPublishing.c" } } static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1032 "FlickrPublishing.c" +#line 944 "FlickrPublishing.c" } static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1039 "FlickrPublishing.c" +#line 951 "FlickrPublishing.c" PublishingFlickrVisibilitySpecification * object; object = collect_values[0].v_pointer; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/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 1046 "FlickrPublishing.c" +#line 958 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/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 1050 "FlickrPublishing.c" +#line 962 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object); -#line 1054 "FlickrPublishing.c" +#line 966 "FlickrPublishing.c" } else { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1058 "FlickrPublishing.c" +#line 970 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1062 "FlickrPublishing.c" +#line 974 "FlickrPublishing.c" } static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingFlickrVisibilitySpecification ** object_p; object_p = collect_values[0].v_pointer; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/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 1073 "FlickrPublishing.c" +#line 985 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1079 "FlickrPublishing.c" +#line 991 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1083 "FlickrPublishing.c" +#line 995 "FlickrPublishing.c" } else { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1087 "FlickrPublishing.c" +#line 999 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1091 "FlickrPublishing.c" +#line 1003 "FlickrPublishing.c" } GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingFlickrParamSpecVisibilitySpecification* spec; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1105 "FlickrPublishing.c" +#line 1017 "FlickrPublishing.c" } gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1114 "FlickrPublishing.c" +#line 1026 "FlickrPublishing.c" } void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) { PublishingFlickrVisibilitySpecification * old; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1134 "FlickrPublishing.c" +#line 1046 "FlickrPublishing.c" } else { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1138 "FlickrPublishing.c" +#line 1050 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1144 "FlickrPublishing.c" +#line 1056 "FlickrPublishing.c" } } void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) { PublishingFlickrVisibilitySpecification * old; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION)); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1163 "FlickrPublishing.c" +#line 1075 "FlickrPublishing.c" } else { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1167 "FlickrPublishing.c" +#line 1079 "FlickrPublishing.c" } -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1173 "FlickrPublishing.c" +#line 1085 "FlickrPublishing.c" } } static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize; -#line 1183 "FlickrPublishing.c" +#line 1095 "FlickrPublishing.c" } static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1190 "FlickrPublishing.c" +#line 1102 "FlickrPublishing.c" } static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) { PublishingFlickrVisibilitySpecification * self; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 1200 "FlickrPublishing.c" +#line 1112 "FlickrPublishing.c" } @@ -1217,252 +1129,252 @@ GType publishing_flickr_visibility_specification_get_type (void) { gpointer publishing_flickr_visibility_specification_ref (gpointer instance) { PublishingFlickrVisibilitySpecification * self; self = instance; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1225 "FlickrPublishing.c" +#line 1137 "FlickrPublishing.c" } void publishing_flickr_visibility_specification_unref (gpointer instance) { PublishingFlickrVisibilitySpecification * self; self = instance; -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self); -#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1238 "FlickrPublishing.c" +#line 1150 "FlickrPublishing.c" } } PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) { PublishingFlickrPublishingParameters* self = NULL; -#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type); -#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1249 "FlickrPublishing.c" +#line 1161 "FlickrPublishing.c" } PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) { -#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS); -#line 1256 "FlickrPublishing.c" +#line 1168 "FlickrPublishing.c" } static void publishing_flickr_value_publishing_parameters_init (GValue* value) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1263 "FlickrPublishing.c" +#line 1175 "FlickrPublishing.c" } static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer); -#line 1272 "FlickrPublishing.c" +#line 1184 "FlickrPublishing.c" } } static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 1282 "FlickrPublishing.c" +#line 1194 "FlickrPublishing.c" } else { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1286 "FlickrPublishing.c" +#line 1198 "FlickrPublishing.c" } } static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1294 "FlickrPublishing.c" +#line 1206 "FlickrPublishing.c" } static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1301 "FlickrPublishing.c" +#line 1213 "FlickrPublishing.c" PublishingFlickrPublishingParameters * object; object = collect_values[0].v_pointer; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/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 1308 "FlickrPublishing.c" +#line 1220 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/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 1312 "FlickrPublishing.c" +#line 1224 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object); -#line 1316 "FlickrPublishing.c" +#line 1228 "FlickrPublishing.c" } else { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1320 "FlickrPublishing.c" +#line 1232 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1324 "FlickrPublishing.c" +#line 1236 "FlickrPublishing.c" } static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingFlickrPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/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 1335 "FlickrPublishing.c" +#line 1247 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1341 "FlickrPublishing.c" +#line 1253 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1345 "FlickrPublishing.c" +#line 1257 "FlickrPublishing.c" } else { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1349 "FlickrPublishing.c" +#line 1261 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1353 "FlickrPublishing.c" +#line 1265 "FlickrPublishing.c" } GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingFlickrParamSpecPublishingParameters* spec; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1367 "FlickrPublishing.c" +#line 1279 "FlickrPublishing.c" } gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1376 "FlickrPublishing.c" +#line 1288 "FlickrPublishing.c" } void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) { PublishingFlickrPublishingParameters * old; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1396 "FlickrPublishing.c" +#line 1308 "FlickrPublishing.c" } else { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1400 "FlickrPublishing.c" +#line 1312 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1406 "FlickrPublishing.c" +#line 1318 "FlickrPublishing.c" } } void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) { PublishingFlickrPublishingParameters * old; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS)); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1425 "FlickrPublishing.c" +#line 1337 "FlickrPublishing.c" } else { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1429 "FlickrPublishing.c" +#line 1341 "FlickrPublishing.c" } -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1435 "FlickrPublishing.c" +#line 1347 "FlickrPublishing.c" } } static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize; -#line 1445 "FlickrPublishing.c" +#line 1357 "FlickrPublishing.c" } static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1452 "FlickrPublishing.c" +#line 1364 "FlickrPublishing.c" } static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) { PublishingFlickrPublishingParameters * self; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->username); -#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->visibility_specification); -#line 1466 "FlickrPublishing.c" +#line 1378 "FlickrPublishing.c" } @@ -1483,32 +1395,32 @@ GType publishing_flickr_publishing_parameters_get_type (void) { gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) { PublishingFlickrPublishingParameters * self; self = instance; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1491 "FlickrPublishing.c" +#line 1403 "FlickrPublishing.c" } void publishing_flickr_publishing_parameters_unref (gpointer instance) { PublishingFlickrPublishingParameters * self; self = instance; -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); -#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1504 "FlickrPublishing.c" +#line 1416 "FlickrPublishing.c" } } static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) { -#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self); -#line 1512 "FlickrPublishing.c" +#line 1424 "FlickrPublishing.c" } @@ -1518,77 +1430,77 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G SpitPublishingService* _tmp1_; SpitPublishingPluginHost* _tmp2_; SpitPublishingPluginHost* _tmp3_; - PublishingFlickrSession* _tmp4_; + PublishingRESTSupportOAuth1Session* _tmp4_; PublishingFlickrPublishingParameters* _tmp5_; PublishingAuthenticatorFactory* _tmp6_; PublishingAuthenticatorFactory* _tmp7_; SpitPublishingPluginHost* _tmp8_; SpitPublishingAuthenticator* _tmp9_; SpitPublishingAuthenticator* _tmp10_; -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrFlickrPublisher*) g_object_new (object_type, NULL); +#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:106: FlickrPublisher instantiated."); #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:107: FlickrPublisher instantiated."); -#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = service; -#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->service); -#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->service = _tmp1_; -#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = host; -#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->host); -#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->host = _tmp3_; -#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = publishing_flickr_session_new (); -#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp4_ = publishing_rest_support_oauth1_session_new (PUBLISHING_FLICKR_ENDPOINT_URL); +#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->session = _tmp4_; -#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = publishing_flickr_publishing_parameters_new (); -#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp5_; -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_authenticator_factory_get_instance (); -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = host; -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", _tmp8_); -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->authenticator); -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->authenticator = _tmp9_; -#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp7_); -#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->authenticator; -#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0); -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1585 "FlickrPublishing.c" +#line 1497 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { -#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host); -#line 1592 "FlickrPublishing.c" +#line 1504 "FlickrPublishing.c" } @@ -1596,17 +1508,17 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato SpitPublishingAuthenticator* result = NULL; SpitPublishingAuthenticator* _tmp0_; SpitPublishingAuthenticator* _tmp1_; -#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL); -#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->authenticator; -#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1610 "FlickrPublishing.c" +#line 1522 "FlickrPublishing.c" } @@ -1614,39 +1526,39 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata gboolean result = FALSE; SpitPublishingPluginHost* _tmp0_; gboolean _tmp1_; -#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE); -#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE); -#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1628 "FlickrPublishing.c" +#line 1540 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { SpitPublishingPluginHost* _tmp0_; gboolean _tmp1_; -#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = strip_metadata; -#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_); -#line 1643 "FlickrPublishing.c" +#line 1555 "FlickrPublishing.c" } static gpointer _g_variant_ref0 (gpointer self) { -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_variant_ref (self) : NULL; -#line 1650 "FlickrPublishing.c" +#line 1562 "FlickrPublishing.c" } @@ -1666,7 +1578,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish GHashTable* _tmp6_; gconstpointer _tmp7_ = NULL; GVariant* _tmp8_; - PublishingFlickrSession* _tmp9_; + PublishingRESTSupportOAuth1Session* _tmp9_; GVariant* _tmp10_; const gchar* _tmp11_; GVariant* _tmp12_; @@ -1680,7 +1592,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish GHashTable* _tmp20_; gconstpointer _tmp21_ = NULL; GVariant* _tmp22_; - PublishingFlickrSession* _tmp23_; + PublishingRESTSupportOAuth1Session* _tmp23_; GVariant* _tmp24_; const gchar* _tmp25_; GVariant* _tmp26_; @@ -1688,154 +1600,154 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish GVariant* _tmp28_; const gchar* _tmp29_; PublishingFlickrPublishingParameters* _tmp30_; - PublishingFlickrSession* _tmp31_; + PublishingRESTSupportOAuth1Session* _tmp31_; gchar* _tmp32_; -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 133 "/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 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp0_) { -#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1702 "FlickrPublishing.c" +#line 1614 "FlickrPublishing.c" } -#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \ +#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:136: EVENT: a fully authenticated session has be" \ "come available"); -#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->authenticator; -#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_); -#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" params = _tmp2_; -#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" consumer_key = NULL; -#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" consumer_secret = NULL; -#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_token = NULL; -#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_token_secret = NULL; -#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" username = NULL; -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = params; -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_); -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (consumer_key); -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _g_variant_ref0 (_tmp4_); -#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" consumer_key = _tmp5_; -#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = params; -#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_); -#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (consumer_secret); -#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _g_variant_ref0 (_tmp7_); -#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" consumer_secret = _tmp8_; -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->session; -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = consumer_key; -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = g_variant_get_string (_tmp10_, NULL); -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = consumer_secret; -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = g_variant_get_string (_tmp12_, NULL); -#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_); -#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + publishing_rest_support_oauth1_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_); +#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = params; -#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_); -#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (auth_token); -#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _g_variant_ref0 (_tmp15_); -#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_token = _tmp16_; -#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = params; -#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_); -#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (auth_token_secret); -#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _g_variant_ref0 (_tmp18_); -#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_token_secret = _tmp19_; -#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = params; -#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_hash_table_lookup_extended (_tmp20_, "Username", NULL, &_tmp21_); -#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (username); -#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = _g_variant_ref0 (_tmp21_); -#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" username = _tmp22_; -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = self->priv->session; -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = auth_token; -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = g_variant_get_string (_tmp24_, NULL); -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = auth_token_secret; -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = g_variant_get_string (_tmp26_, NULL); -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = username; -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = g_variant_get_string (_tmp28_, NULL); -#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_); -#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_); +#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = self->priv->parameters; -#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = self->priv->session; -#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp32_ = publishing_flickr_session_get_username (_tmp31_); -#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp32_ = publishing_rest_support_oauth1_session_get_username (_tmp31_); +#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp30_->username); -#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_->username = _tmp32_; -#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_fetch_account_info (self); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (username); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (auth_token_secret); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (auth_token); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (consumer_secret); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_variant_unref0 (consumer_key); -#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_hash_table_unref0 (params); -#line 1824 "FlickrPublishing.c" +#line 1736 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { -#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 1831 "FlickrPublishing.c" +#line 1743 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { -#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 1838 "FlickrPublishing.c" +#line 1750 "FlickrPublishing.c" } @@ -1848,44 +1760,44 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P PublishingRESTSupportTransaction* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; -#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); -#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = txn; -#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); -#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 161 "/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_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self); -#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = txn; -#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self); -#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp4_) { -#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1873 "FlickrPublishing.c" +#line 1785 "FlickrPublishing.c" } -#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \ +#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:167: EVENT: account fetch transaction response r" \ "eceived over the network"); -#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = txn; -#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_); -#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_); -#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 1887 "FlickrPublishing.c" +#line 1799 "FlickrPublishing.c" } @@ -1897,75 +1809,75 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi gboolean _tmp4_; SpitPublishingPluginHost* _tmp5_; GError* _tmp6_; -#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); -#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = txn; -#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); -#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 173 "/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_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self); -#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = txn; -#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self); -#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp4_) { -#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1921 "FlickrPublishing.c" +#line 1833 "FlickrPublishing.c" } -#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \ +#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:179: EVENT: account fetch transaction caused a n" \ "etwork error"); -#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->host; -#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = err; -#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 1931 "FlickrPublishing.c" +#line 1843 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) { gboolean _tmp0_; -#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 184 "/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 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp0_) { -#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1945 "FlickrPublishing.c" +#line 1857 "FlickrPublishing.c" } -#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \ +#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:187: EVENT: account information has become avail" \ "able"); -#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self); -#line 1951 "FlickrPublishing.c" +#line 1863 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { -#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata); -#line 1958 "FlickrPublishing.c" +#line 1870 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { -#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self); -#line 1965 "FlickrPublishing.c" +#line 1877 "FlickrPublishing.c" } @@ -1976,36 +1888,36 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis guint _tmp3_; gboolean _tmp4_; gboolean _tmp5_; -#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publishing_options_pane; -#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 192 "/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_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self); -#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->publishing_options_pane; -#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE); -#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self); -#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp4_) { -#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1996 "FlickrPublishing.c" +#line 1908 "FlickrPublishing.c" } -#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \ +#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:198: EVENT: user clicked the 'Publish' button in" \ " the publishing options pane"); -#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = strip_metadata; -#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_publish (self, _tmp5_); -#line 2004 "FlickrPublishing.c" +#line 1916 "FlickrPublishing.c" } @@ -2015,34 +1927,34 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout PublishingFlickrPublishingOptionsPane* _tmp2_; guint _tmp3_; gboolean _tmp4_; -#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publishing_options_pane; -#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 203 "/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_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self); -#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->publishing_options_pane; -#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE); -#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self); -#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp4_) { -#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2034 "FlickrPublishing.c" +#line 1946 "FlickrPublishing.c" } -#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \ +#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:209: EVENT: user clicked the 'Logout' button in " \ "the publishing options pane"); -#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 2040 "FlickrPublishing.c" +#line 1952 "FlickrPublishing.c" } @@ -2055,52 +1967,52 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish void* _tmp3__target; gint _tmp4_; gdouble _tmp5_; -#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 215 "/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 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp0_) { -#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2061 "FlickrPublishing.c" +#line 1973 "FlickrPublishing.c" } -#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = completed_fraction; -#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:219: EVENT: uploader reports upload %.2f percent" \ +#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:218: EVENT: uploader reports upload %.2f percent" \ " complete.", 100.0 * _tmp1_); -#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->progress_reporter; -#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2__target = self->priv->progress_reporter_target; -#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp2_ != NULL, "progress_reporter != null"); -#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->progress_reporter; -#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__target = self->priv->progress_reporter_target; -#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = file_number; -#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = completed_fraction; -#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 2083 "FlickrPublishing.c" +#line 1995 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { -#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published); -#line 2090 "FlickrPublishing.c" +#line 2002 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { -#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2097 "FlickrPublishing.c" +#line 2009 "FlickrPublishing.c" } @@ -2111,38 +2023,38 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli guint _tmp3_; PublishingRESTSupportBatchUploader* _tmp4_; guint _tmp5_; -#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader)); -#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 227 "/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 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp0_) { -#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2118 "FlickrPublishing.c" +#line 2030 "FlickrPublishing.c" } -#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = num_published; -#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:231: EVENT: uploader reports upload complete; %d" \ +#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:230: EVENT: uploader reports upload complete; %d" \ " items published.", _tmp1_); -#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = uploader; -#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE); -#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self); -#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = uploader; -#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE); -#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); -#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_success_pane (self); -#line 2138 "FlickrPublishing.c" +#line 2050 "FlickrPublishing.c" } @@ -2156,44 +2068,44 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr guint _tmp6_; SpitPublishingPluginHost* _tmp7_; GError* _tmp8_; -#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader)); -#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 240 "/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 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp0_) { -#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2162 "FlickrPublishing.c" +#line 2074 "FlickrPublishing.c" } -#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = err; -#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_->message; -#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:244: EVENT: uploader reports upload error = '%s'" \ +#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:243: EVENT: uploader reports upload error = '%s'" \ ".", _tmp2_); -#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = uploader; -#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE); -#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self); -#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = uploader; -#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE); -#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); -#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->host; -#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = err; -#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 2188 "FlickrPublishing.c" +#line 2100 "FlickrPublishing.c" } @@ -2201,52 +2113,52 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing SpitPublishingPluginHost* _tmp0_; SpitPublishingPluginHost* _tmp1_; PublishingFlickrAccountInfoFetchTransaction* txn = NULL; - PublishingFlickrSession* _tmp2_; + PublishingRESTSupportOAuth1Session* _tmp2_; PublishingFlickrAccountInfoFetchTransaction* _tmp3_; GError * _inner_error_ = NULL; -#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:253: ACTION: running network transaction to fetc" \ +#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:252: ACTION: running network transaction to fetc" \ "h account information"); -#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE); -#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_); -#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->session; -#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_); -#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" txn = _tmp3_; -#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 258 "/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 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 259 "/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 2221 "FlickrPublishing.c" +#line 2133 "FlickrPublishing.c" { -#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2229 "FlickrPublishing.c" +#line 2141 "FlickrPublishing.c" goto __catch13_spit_publishing_publishing_error; } -#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2240 "FlickrPublishing.c" +#line 2152 "FlickrPublishing.c" } } goto __finally13; @@ -2255,36 +2167,36 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing GError* err = NULL; SpitPublishingPluginHost* _tmp4_; GError* _tmp5_; -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->host; -#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = err; -#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 2261 "FlickrPublishing.c" +#line 2173 "FlickrPublishing.c" } __finally13: -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/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 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2274 "FlickrPublishing.c" +#line 2186 "FlickrPublishing.c" } -#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2278 "FlickrPublishing.c" +#line 2190 "FlickrPublishing.c" } @@ -2302,23 +2214,23 @@ static gint64 int64_parse (const gchar* str) { result = _tmp1_; #line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2296 "FlickrPublishing.c" +#line 2208 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) { const gchar* _tmp0_; GError * _inner_error_ = NULL; -#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (xml != NULL); -#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = xml; -#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \ +#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:269: ACTION: parsing account information from xm" \ "l = '%s'", _tmp0_); -#line 2311 "FlickrPublishing.c" +#line 2223 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* response_doc = NULL; const gchar* _tmp1_; @@ -2351,222 +2263,222 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P gint64 _tmp23_; PublishingFlickrPublishingParameters* _tmp24_; PublishingFlickrUserKind _tmp25_; -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_); -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" response_doc = _tmp2_; -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2354 "FlickrPublishing.c" +#line 2266 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/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 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2363 "FlickrPublishing.c" +#line 2275 "FlickrPublishing.c" } -#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = response_doc; -#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_); -#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" root_node = _tmp4_; -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = response_doc; -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = root_node; -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_); -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_node = _tmp7_; -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2385 "FlickrPublishing.c" +#line 2297 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/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 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2396 "FlickrPublishing.c" +#line 2308 "FlickrPublishing.c" } -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = response_doc; -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = user_node; -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_); -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" is_pro_str = _tmp10_; -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2412 "FlickrPublishing.c" +#line 2324 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/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 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2423 "FlickrPublishing.c" +#line 2335 "FlickrPublishing.c" } -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = response_doc; -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = user_node; -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" bandwidth_node = _tmp13_; -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2441 "FlickrPublishing.c" +#line 2353 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/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 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2454 "FlickrPublishing.c" +#line 2366 "FlickrPublishing.c" } -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = response_doc; -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = bandwidth_node; -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" remaining_kb_str = _tmp16_; -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2472 "FlickrPublishing.c" +#line 2384 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/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 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2485 "FlickrPublishing.c" +#line 2397 "FlickrPublishing.c" } -#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = is_pro_str; -#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp17_, "0") == 0) { -#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_FREE; -#line 2493 "FlickrPublishing.c" +#line 2405 "FlickrPublishing.c" } else { const gchar* _tmp18_; -#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = is_pro_str; -#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp18_, "1") == 0) { -#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_PRO; -#line 2502 "FlickrPublishing.c" +#line 2414 "FlickrPublishing.c" } else { GError* _tmp19_; -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp19_; -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2517 "FlickrPublishing.c" +#line 2429 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2532 "FlickrPublishing.c" +#line 2444 "FlickrPublishing.c" } } -#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = remaining_kb_str; -#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = int64_parse (_tmp20_); -#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" quota_bytes_left = _tmp21_ * 1024; -#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = self->priv->parameters; -#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = quota_bytes_left; -#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_->quota_free_bytes = _tmp23_; -#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = self->priv->parameters; -#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = user_kind; -#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_->user_kind = _tmp25_; -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (remaining_kb_str); -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (is_pro_str); -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 2559 "FlickrPublishing.c" +#line 2471 "FlickrPublishing.c" } goto __finally14; __catch14_spit_publishing_publishing_error: @@ -2575,78 +2487,78 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P GError* _tmp26_; SpitPublishingPluginHost* _tmp27_; GError* _tmp28_; -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = err; -#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 300 "/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 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2582 "FlickrPublishing.c" +#line 2494 "FlickrPublishing.c" } -#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = self->priv->host; -#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = err; -#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_); -#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2594 "FlickrPublishing.c" +#line 2506 "FlickrPublishing.c" } __finally14: -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/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 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2605 "FlickrPublishing.c" +#line 2517 "FlickrPublishing.c" } -#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_info_available (self); -#line 2609 "FlickrPublishing.c" +#line 2521 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) { SpitPublishingAuthenticator* _tmp0_; gboolean _tmp1_; -#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:314: ACTION: logging user out, deauthenticating " \ +#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:313: ACTION: logging user out, deauthenticating " \ "session, and erasing stored credentials"); -#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->authenticator; -#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_); -#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 2626 "FlickrPublishing.c" +#line 2538 "FlickrPublishing.c" SpitPublishingAuthenticator* _tmp2_; -#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->authenticator; -#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_authenticator_logout (_tmp2_); -#line 2632 "FlickrPublishing.c" +#line 2544 "FlickrPublishing.c" } -#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 2638 "FlickrPublishing.c" +#line 2550 "FlickrPublishing.c" } @@ -2665,28 +2577,28 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( SpitPublishingPluginHost* _tmp16_; PublishingFlickrPublishingOptionsPane* _tmp17_; GError * _inner_error_ = NULL; -#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:326: ACTION: displaying publishing options pane"); -#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:325: ACTION: displaying publishing options pane"); +#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE); -#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = gtk_builder_new (); -#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp1_; -#line 2669 "FlickrPublishing.c" +#line 2581 "FlickrPublishing.c" { GtkBuilder* _tmp2_; -#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; -#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 334 "/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 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2678 "FlickrPublishing.c" +#line 2590 "FlickrPublishing.c" goto __catch15_g_error; } } @@ -2699,81 +2611,81 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( SpitPublishingPluginHost* _tmp5_; GError* _tmp6_; GError* _tmp7_; -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = e; -#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_->message; +#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:337: Could not parse UI file! Error: %s.", _tmp4_); #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:338: Could not parse UI file! Error: %s.", _tmp4_); -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->host; -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 338 "/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, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \ "n’t continue.")); -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); -#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp7_); -#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2717 "FlickrPublishing.c" +#line 2629 "FlickrPublishing.c" } __finally15: -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/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 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2730 "FlickrPublishing.c" +#line 2642 "FlickrPublishing.c" } -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->parameters; -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->host; -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_); -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = builder; -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_); -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publishing_options_pane); -#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publishing_options_pane = _tmp13_; -#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->publishing_options_pane; -#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0); -#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = self->priv->publishing_options_pane; -#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = self->priv->host; -#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = self->priv->publishing_options_pane; -#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); -#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 2764 "FlickrPublishing.c" +#line 2676 "FlickrPublishing.c" } @@ -2787,51 +2699,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli GDateTime* _tmp5_; gint _tmp6_; gint _tmp7_; -#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0); -#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = a; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = _tmp1_; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = b; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_date_time_compare (_tmp2_, _tmp5_); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_date_time_unref0 (_tmp5_); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_date_time_unref0 (_tmp2_); -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp7_; -#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 2806 "FlickrPublishing.c" +#line 2718 "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 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 2815 "FlickrPublishing.c" +#line 2727 "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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete); -#line 2822 "FlickrPublishing.c" +#line 2734 "FlickrPublishing.c" } @@ -2858,7 +2770,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick gint _tmp14__length1; GeeArrayList* _tmp18_; PublishingFlickrUploader* uploader = NULL; - PublishingFlickrSession* _tmp19_; + PublishingRESTSupportOAuth1Session* _tmp19_; GeeArrayList* _tmp20_; gint _tmp21_; gpointer* _tmp22_; @@ -2871,168 +2783,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick PublishingFlickrUploader* _tmp28_; PublishingFlickrUploader* _tmp29_; PublishingFlickrUploader* _tmp30_; -#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = strip_metadata; -#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_); -#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:359: ACTION: uploading media items to remote ser" \ +#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:358: ACTION: uploading media items to remote ser" \ "ver."); -#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE); -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->host; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->parameters; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp3_->photo_major_axis_size; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = strip_metadata; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_); -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/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 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = NULL; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = NULL; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = NULL; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = _tmp8_; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = _tmp6_; -#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = _tmp7_; -#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 367 "/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 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp9_) { -#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2904 "FlickrPublishing.c" +#line 2816 "FlickrPublishing.c" } -#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->host; -#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_); -#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables = _tmp12_; -#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables_length1 = _tmp11_; -#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishables_size_ = publishables_length1; -#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); -#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" sorted_list = _tmp13_; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishables; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14__length1 = publishables_length1; -#line 2924 "FlickrPublishing.c" +#line 2836 "FlickrPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; gint _p_collection_size_ = 0; gint p_it = 0; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p_collection = _tmp14_; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p_collection_length1 = _tmp14__length1; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { -#line 2936 "FlickrPublishing.c" +#line 2848 "FlickrPublishing.c" SpitPublishingPublishable* _tmp15_; SpitPublishingPublishable* p = NULL; -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); -#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p = _tmp15_; -#line 2943 "FlickrPublishing.c" +#line 2855 "FlickrPublishing.c" { GeeArrayList* _tmp16_; SpitPublishingPublishable* _tmp17_; -#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = sorted_list; -#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = p; -#line 376 "/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 375 "/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 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (p); -#line 2955 "FlickrPublishing.c" +#line 2867 "FlickrPublishing.c" } } } -#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = sorted_list; -#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 377 "/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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = self->priv->session; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = sorted_list; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = _tmp22_; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23__length1 = _tmp21_; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = self->priv->parameters; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = strip_metadata; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_); -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = _tmp26_; -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL); -#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" uploader = _tmp27_; -#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = uploader; -#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 380 "/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 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = uploader; -#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 381 "/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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = uploader; -#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 382 "/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 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (sorted_list); -#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3003 "FlickrPublishing.c" +#line 2915 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) { SpitPublishingPluginHost* _tmp0_; SpitPublishingPluginHost* _tmp1_; -#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 385 "/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" - g_debug ("FlickrPublishing.vala:387: ACTION: showing success pane."); -#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:386: ACTION: showing success pane."); +#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE); -#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->host; -#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 3022 "FlickrPublishing.c" +#line 2934 "FlickrPublishing.c" } @@ -3040,32 +2952,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli gint result = 0; SpitPublishingPluginHost* _tmp0_; gint _tmp1_; -#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 393 "/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 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3040 "FlickrPublishing.c" +#line 2952 "FlickrPublishing.c" } void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) { SpitPublishingPluginHost* _tmp0_; gint _tmp1_; -#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = vis; -#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 397 "/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 3055 "FlickrPublishing.c" +#line 2967 "FlickrPublishing.c" } @@ -3073,32 +2985,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF gint result = 0; SpitPublishingPluginHost* _tmp0_; gint _tmp1_; -#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0); -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 401 "/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 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3073 "FlickrPublishing.c" +#line 2985 "FlickrPublishing.c" } void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) { SpitPublishingPluginHost* _tmp0_; gint _tmp1_; -#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->host; -#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = size; -#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 405 "/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 3088 "FlickrPublishing.c" +#line 3000 "FlickrPublishing.c" } @@ -3107,17 +3019,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic SpitPublishingService* result = NULL; SpitPublishingService* _tmp0_; SpitPublishingService* _tmp1_; -#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->service; -#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3107 "FlickrPublishing.c" +#line 3019 "FlickrPublishing.c" } @@ -3125,31 +3037,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi PublishingFlickrFlickrPublisher * self; gboolean result = FALSE; gboolean _tmp0_; -#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->running; -#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; -#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3123 "FlickrPublishing.c" +#line 3035 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) { SpitPublishingAuthenticator* _tmp0_; -#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); -#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = TRUE; -#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->was_started = TRUE; -#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->authenticator; -#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_authenticator_authenticate (_tmp0_); -#line 3139 "FlickrPublishing.c" +#line 3051 "FlickrPublishing.c" } @@ -3157,106 +3069,106 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish PublishingFlickrFlickrPublisher * self; gboolean _tmp0_; gboolean _tmp1_; -#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 426 "/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 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_) { -#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3155 "FlickrPublishing.c" +#line 3067 "FlickrPublishing.c" } -#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->was_started; -#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_error ("FlickrPublishing.vala:431: FlickrPublisher: start( ): can't start; thi" \ +#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_error ("FlickrPublishing.vala:430: FlickrPublisher: start( ): can't start; thi" \ "s publisher is not restartable."); -#line 3163 "FlickrPublishing.c" +#line 3075 "FlickrPublishing.c" } -#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:433: FlickrPublisher: starting interaction."); -#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:432: FlickrPublisher: starting interaction."); +#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 3169 "FlickrPublishing.c" +#line 3081 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; - PublishingFlickrSession* _tmp0_; -#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + PublishingRESTSupportOAuth1Session* _tmp0_; +#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:439: FlickrPublisher: stop( ) invoked."); -#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_debug ("FlickrPublishing.vala:438: FlickrPublisher: stop( ) invoked."); +#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->session; -#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ != NULL) { -#line 3184 "FlickrPublishing.c" - PublishingFlickrSession* _tmp1_; -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 3096 "FlickrPublishing.c" + PublishingRESTSupportOAuth1Session* _tmp1_; +#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; -#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 441 "/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 3190 "FlickrPublishing.c" +#line 3102 "FlickrPublishing.c" } -#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 3194 "FlickrPublishing.c" +#line 3106 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) { -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass); -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate)); -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize; -#line 3205 "FlickrPublishing.c" +#line 3117 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) { -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service; -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running; -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start; -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop; -#line 3220 "FlickrPublishing.c" +#line 3132 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) { -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self); -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = NULL; -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = self; -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = NULL; -#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->was_started = FALSE; -#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->session = NULL; -#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publishing_options_pane = NULL; -#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->authenticator = NULL; -#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 3245 "FlickrPublishing.c" +#line 3157 "FlickrPublishing.c" } @@ -3264,37 +3176,37 @@ static void publishing_flickr_flickr_publisher_finalize (GObject * obj) { PublishingFlickrFlickrPublisher * self; SpitPublishingAuthenticator* _tmp0_; guint _tmp1_; -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher); -#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->authenticator; -#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &_tmp1_, NULL, FALSE); -#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 117 "/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_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self); -#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->service); -#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->host); -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/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 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter = NULL; -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target = NULL; -#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->progress_reporter_target_destroy_notify = NULL; -#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publishing_options_pane); -#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->authenticator); -#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj); -#line 3283 "FlickrPublishing.c" +#line 3195 "FlickrPublishing.c" } @@ -3312,190 +3224,6 @@ GType publishing_flickr_flickr_publisher_get_type (void) { } -PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { - PublishingFlickrTransaction* self = NULL; - PublishingFlickrSession* _tmp0_; - PublishingRESTSupportHttpMethod _tmp1_; - PublishingFlickrSession* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - PublishingFlickrSession* _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - PublishingFlickrSession* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; -#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = session; -#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = method; -#line 451 "/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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = session; -#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_); -#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _tmp3_; -#line 453 "/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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp4_); -#line 454 "/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 455 "/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 456 "/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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = session; -#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_); -#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _tmp6_; -#line 457 "/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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp7_); -#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = session; -#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = publishing_flickr_session_get_consumer_key (_tmp8_); -#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = _tmp9_; -#line 458 "/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", _tmp10_); -#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp10_); -#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self; -#line 3360 "FlickrPublishing.c" -} - - -PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { -#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method); -#line 3367 "FlickrPublishing.c" -} - - -PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { - PublishingFlickrTransaction* self = NULL; - PublishingFlickrSession* _tmp0_; - const gchar* _tmp1_; - PublishingRESTSupportHttpMethod _tmp2_; - PublishingFlickrSession* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - PublishingFlickrSession* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - PublishingFlickrSession* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; -#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (uri != NULL, NULL); -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = session; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = uri; -#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = method; -#line 463 "/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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = session; -#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_); -#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _tmp4_; -#line 465 "/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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp5_); -#line 466 "/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 467 "/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 468 "/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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = session; -#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_); -#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _tmp7_; -#line 469 "/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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp8_); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = session; -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = publishing_flickr_session_get_consumer_key (_tmp9_); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _tmp10_; -#line 470 "/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", _tmp11_); -#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp11_); -#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self; -#line 3435 "FlickrPublishing.c" -} - - -PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { -#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method); -#line 3442 "FlickrPublishing.c" -} - - -static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { - PublishingFlickrTransaction * self; - PublishingRESTSupportSession* _tmp0_; - PublishingFlickrSession* _tmp1_; - GError * _inner_error_ = NULL; -#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction); -#line 474 "/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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 474 "/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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_rest_support_session_unref0 (_tmp1_); -#line 476 "/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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_propagate_error (error, _inner_error_); -#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return; -#line 3471 "FlickrPublishing.c" - } else { -#line 476 "/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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_clear_error (&_inner_error_); -#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return; -#line 3479 "FlickrPublishing.c" - } - } -} - - gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; @@ -3516,152 +3244,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum gchar* _tmp18_; gchar* _tmp19_; GError * _inner_error_ = NULL; -#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); -#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = doc; -#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); -#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" root = _tmp1_; -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = root; -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat"); -#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" status = _tmp3_; -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = status; -#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_ == NULL) { -#line 3523 "FlickrPublishing.c" +#line 3251 "FlickrPublishing.c" gchar* _tmp5_; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp5_; -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3533 "FlickrPublishing.c" +#line 3261 "FlickrPublishing.c" } -#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = status; -#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp6_, "ok") == 0) { -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = NULL; -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3545 "FlickrPublishing.c" +#line 3273 "FlickrPublishing.c" } { xmlNode* _tmp7_ = NULL; PublishingRESTSupportXmlDocument* _tmp8_; xmlNode* _tmp9_; xmlNode* _tmp10_; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = doc; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = root; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_); -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp10_; -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3564 "FlickrPublishing.c" +#line 3292 "FlickrPublishing.c" goto __catch16_spit_publishing_publishing_error; } -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/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 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3575 "FlickrPublishing.c" +#line 3303 "FlickrPublishing.c" } -#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" errcode = _tmp7_; -#line 3579 "FlickrPublishing.c" +#line 3307 "FlickrPublishing.c" } goto __finally16; __catch16_spit_publishing_publishing_error: { GError* err = NULL; gchar* _tmp11_; -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = g_strdup ("No error code specified"); -#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp11_; -#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3600 "FlickrPublishing.c" +#line 3328 "FlickrPublishing.c" } __finally16: -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/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 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3613 "FlickrPublishing.c" +#line 3341 "FlickrPublishing.c" } -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = errcode; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg"); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _tmp13_; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = errcode; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code"); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _tmp16_; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _tmp18_; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp17_); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp14_); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp19_; -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (status); -#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3641 "FlickrPublishing.c" +#line 3369 "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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3650 "FlickrPublishing.c" +#line 3378 "FlickrPublishing.c" } @@ -3681,14 +3409,14 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { result = _tmp1_ != NULL; #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3670 "FlickrPublishing.c" +#line 3398 "FlickrPublishing.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_error_copy (self) : NULL; -#line 3677 "FlickrPublishing.c" +#line 3405 "FlickrPublishing.c" } @@ -3696,50 +3424,50 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res PublishingRESTSupportXmlDocument* result = NULL; PublishingRESTSupportXmlDocument* _result_ = NULL; GError * _inner_error_ = NULL; -#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (xml != NULL, NULL); -#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = NULL; -#line 3689 "FlickrPublishing.c" +#line 3417 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; const gchar* _tmp1_; PublishingRESTSupportXmlDocument* _tmp2_; PublishingRESTSupportXmlDocument* _tmp3_; -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _tmp2_; -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3705 "FlickrPublishing.c" +#line 3433 "FlickrPublishing.c" goto __catch17_spit_publishing_publishing_error; } -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3716 "FlickrPublishing.c" +#line 3444 "FlickrPublishing.c" } -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp0_; -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = NULL; -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp3_; -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 3728 "FlickrPublishing.c" +#line 3456 "FlickrPublishing.c" } goto __finally17; __catch17_spit_publishing_publishing_error: @@ -3751,158 +3479,120 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res gchar* _tmp7_; gboolean _tmp8_; gboolean _tmp9_; -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = e; -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_->message; -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = string_contains (_tmp5_, _tmp7_); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _tmp8_; -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9_) { -#line 3760 "FlickrPublishing.c" +#line 3488 "FlickrPublishing.c" GError* _tmp10_; const gchar* _tmp11_; GError* _tmp12_; -#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = e; -#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_->message; -#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/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 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp12_; -#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3774 "FlickrPublishing.c" +#line 3502 "FlickrPublishing.c" goto __finally17; } else { GError* _tmp13_; GError* _tmp14_; -#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = e; -#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = _g_error_copy0 (_tmp13_); -#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = _tmp14_; -#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3787 "FlickrPublishing.c" +#line 3515 "FlickrPublishing.c" goto __finally17; } -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3792 "FlickrPublishing.c" +#line 3520 "FlickrPublishing.c" } __finally17: -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3805 "FlickrPublishing.c" +#line 3533 "FlickrPublishing.c" } else { -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/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 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3815 "FlickrPublishing.c" +#line 3543 "FlickrPublishing.c" } } -#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; -#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3822 "FlickrPublishing.c" -} - - -static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) { -#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass); -#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute; -#line 3831 "FlickrPublishing.c" -} - - -static void publishing_flickr_transaction_instance_init (PublishingFlickrTransaction * self) { +#line 3550 "FlickrPublishing.c" } -GType publishing_flickr_transaction_get_type (void) { - static volatile gsize publishing_flickr_transaction_type_id__volatile = 0; - if (g_once_init_enter (&publishing_flickr_transaction_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrTransaction), 0, (GInstanceInitFunc) publishing_flickr_transaction_instance_init, NULL }; - GType publishing_flickr_transaction_type_id; - publishing_flickr_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingFlickrTransaction", &g_define_type_info, 0); - g_once_init_leave (&publishing_flickr_transaction_type_id__volatile, publishing_flickr_transaction_type_id); - } - return publishing_flickr_transaction_type_id__volatile; -} - - -PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) { +PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) { PublishingFlickrAccountInfoFetchTransaction* self = NULL; - PublishingFlickrSession* _tmp0_; - PublishingFlickrSession* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + PublishingRESTSupportOAuth1Session* _tmp0_; +#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL); +#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 530 "/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 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); +#line 500 "/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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = session; -#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_); -#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = _tmp2_; -#line 532 "/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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp3_); -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3877 "FlickrPublishing.c" +#line 3567 "FlickrPublishing.c" } -PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) { -#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session) { +#line 498 "/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 3884 "FlickrPublishing.c" +#line 3574 "FlickrPublishing.c" } static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) { -#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3891 "FlickrPublishing.c" +#line 3581 "FlickrPublishing.c" } @@ -3915,7 +3605,7 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) { if (g_once_init_enter (&publishing_flickr_account_info_fetch_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccountInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_account_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccountInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_account_info_fetch_transaction_instance_init, NULL }; GType publishing_flickr_account_info_fetch_transaction_type_id; - publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0); + publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0); g_once_init_leave (&publishing_flickr_account_info_fetch_transaction_type_id__volatile, publishing_flickr_account_info_fetch_transaction_type_id); } return publishing_flickr_account_info_fetch_transaction_type_id__volatile; @@ -3923,651 +3613,270 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) { static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) { -#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_parameters_ref (self) : NULL; -#line 3914 "FlickrPublishing.c" -} - - -static gpointer _publishing_rest_support_session_ref0 (gpointer self) { -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self ? publishing_rest_support_session_ref (self) : NULL; -#line 3921 "FlickrPublishing.c" +#line 3604 "FlickrPublishing.c" } static void _g_free0_ (gpointer var) { -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" var = (g_free (var), NULL); -#line 3928 "FlickrPublishing.c" +#line 3611 "FlickrPublishing.c" } -PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { +PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingFlickrUploadTransaction* self = NULL; - PublishingFlickrSession* _tmp0_; + PublishingRESTSupportOAuth1Session* _tmp0_; SpitPublishingPublishable* _tmp1_; PublishingFlickrPublishingParameters* _tmp2_; PublishingFlickrPublishingParameters* _tmp3_; - PublishingFlickrSession* _tmp4_; - PublishingFlickrSession* _tmp5_; - PublishingRESTSupportArgument** _tmp6_; - PublishingFlickrSession* _tmp7_; + PublishingFlickrPublishingParameters* _tmp4_; + PublishingFlickrVisibilitySpecification* _tmp5_; + gint _tmp6_; + gchar* _tmp7_; gchar* _tmp8_; - gchar* _tmp9_; - PublishingFlickrSession* _tmp10_; - gchar* _tmp11_; + PublishingFlickrPublishingParameters* _tmp9_; + PublishingFlickrVisibilitySpecification* _tmp10_; + gint _tmp11_; gchar* _tmp12_; - PublishingFlickrSession* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - PublishingFlickrSession* _tmp16_; + gchar* _tmp13_; + PublishingFlickrPublishingParameters* _tmp14_; + PublishingFlickrVisibilitySpecification* _tmp15_; + gint _tmp16_; gchar* _tmp17_; gchar* _tmp18_; - PublishingFlickrPublishingParameters* _tmp19_; - PublishingFlickrVisibilitySpecification* _tmp20_; - gint _tmp21_; - gchar* _tmp22_; + GHashTable* disposition_table = NULL; + GHashFunc _tmp19_; + GEqualFunc _tmp20_; + GHashTable* _tmp21_; + gchar* filename = NULL; + SpitPublishingPublishable* _tmp22_; gchar* _tmp23_; - PublishingFlickrPublishingParameters* _tmp24_; - PublishingFlickrVisibilitySpecification* _tmp25_; - gint _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; - PublishingFlickrPublishingParameters* _tmp29_; - PublishingFlickrVisibilitySpecification* _tmp30_; - gint _tmp31_; + gboolean _tmp24_ = FALSE; + const gchar* _tmp25_; + GHashTable* _tmp29_; + gchar* _tmp30_; + SpitPublishingPublishable* _tmp31_; gchar* _tmp32_; gchar* _tmp33_; - GHashTable* disposition_table = NULL; - GHashFunc _tmp34_; - GEqualFunc _tmp35_; - GHashTable* _tmp36_; - gchar* filename = NULL; - SpitPublishingPublishable* _tmp37_; - gchar* _tmp38_; - gboolean _tmp39_ = FALSE; - const gchar* _tmp40_; - GHashTable* _tmp44_; - gchar* _tmp45_; - SpitPublishingPublishable* _tmp46_; - gchar* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - GHashTable* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; - GHashTable* _tmp53_; -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + gchar* _tmp34_; + GHashTable* _tmp35_; + gchar* _tmp36_; + gchar* _tmp37_; + GHashTable* _tmp38_; +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL); +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishable; -#line 543 "/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 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + self = (PublishingFlickrUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, _tmp0_, _tmp1_, "https://api.flickr.com/services/upload"); +#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = parameters; -#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_); -#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp3_; -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = session; -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_); -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_rest_support_session_unref0 (self->priv->session); -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->session = _tmp5_; -#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1); -#line 547 "/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 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->auth_header_fields = _tmp6_; -#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->auth_header_fields_length1 = 0; -#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = session; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_); -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = _tmp8_; -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_); -#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp9_); -#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1"); -#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0"); -#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob"); -#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = session; -#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_); -#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = _tmp11_; -#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_); -#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp12_); -#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = session; -#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = publishing_flickr_session_get_consumer_key (_tmp13_); -#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = _tmp14_; -#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp15_); -#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp15_); -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = session; -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = publishing_flickr_session_get_access_phase_token (_tmp16_); -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp4_ = parameters; +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp5_ = _tmp4_->visibility_specification; +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp6_ = _tmp5_->everyone_level; +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp7_ = g_strdup_printf ("%d", _tmp6_); +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp8_ = _tmp7_; +#line 513 "/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", _tmp8_); +#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp8_); +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp9_ = parameters; +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp10_ = _tmp9_->visibility_specification; +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp11_ = _tmp10_->friends_level; +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp12_ = g_strdup_printf ("%d", _tmp11_); +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp13_ = _tmp12_; +#line 514 "/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", _tmp13_); +#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp13_); +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp14_ = parameters; +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp15_ = _tmp14_->visibility_specification; +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp16_ = _tmp15_->family_level; +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp17_ = g_strdup_printf ("%d", _tmp16_); +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = _tmp17_; -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp18_); -#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 515 "/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", _tmp18_); +#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp18_); -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = parameters; -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = _tmp19_->visibility_specification; -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = _tmp20_->everyone_level; -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = g_strdup_printf ("%d", _tmp21_); -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = _tmp22_; -#line 557 "/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", _tmp23_); -#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp23_); -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = parameters; -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = _tmp24_->visibility_specification; -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = _tmp25_->friends_level; -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp27_ = g_strdup_printf ("%d", _tmp26_); -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp28_ = _tmp27_; -#line 558 "/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", _tmp28_); -#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp28_); -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29_ = parameters; -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp30_ = _tmp29_->visibility_specification; -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp31_ = _tmp30_->family_level; -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp32_ = g_strdup_printf ("%d", _tmp31_); -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp33_ = _tmp32_; -#line 559 "/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", _tmp33_); -#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp33_); -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp34_ = g_str_hash; -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp35_ = g_str_equal; -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp36_ = g_hash_table_new_full (_tmp34_, _tmp35_, _g_free0_, _g_free0_); -#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - disposition_table = _tmp36_; -#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp37_ = publishable; -#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp38_ = spit_publishing_publishable_get_publishing_name (_tmp37_); -#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - filename = _tmp38_; -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp40_ = filename; -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp40_ == NULL) { -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp39_ = TRUE; -#line 4133 "FlickrPublishing.c" +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp19_ = g_str_hash; +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp20_ = g_str_equal; +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, _g_free0_); +#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + disposition_table = _tmp21_; +#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp22_ = publishable; +#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp23_ = spit_publishing_publishable_get_publishing_name (_tmp22_); +#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + filename = _tmp23_; +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp25_ = filename; +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp25_ == NULL) { +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp24_ = TRUE; +#line 3737 "FlickrPublishing.c" } else { - const gchar* _tmp41_; -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp41_ = filename; -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp39_ = g_strcmp0 (_tmp41_, "") == 0; -#line 4140 "FlickrPublishing.c" + const gchar* _tmp26_; +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp26_ = filename; +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp24_ = g_strcmp0 (_tmp26_, "") == 0; +#line 3744 "FlickrPublishing.c" } -#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp39_) { -#line 4144 "FlickrPublishing.c" - SpitPublishingPublishable* _tmp42_; - gchar* _tmp43_; -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp42_ = publishable; -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp43_ = spit_publishing_publishable_get_param_string (_tmp42_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + if (_tmp24_) { +#line 3748 "FlickrPublishing.c" + SpitPublishingPublishable* _tmp27_; + gchar* _tmp28_; +#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp27_ = publishable; +#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp28_ = spit_publishing_publishable_get_param_string (_tmp27_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); +#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (filename); -#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - filename = _tmp43_; -#line 4155 "FlickrPublishing.c" - } -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp44_ = disposition_table; -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp45_ = g_strdup ("filename"); -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp46_ = publishable; -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp47_ = spit_publishing_publishable_get_param_string (_tmp46_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp48_ = _tmp47_; -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp49_ = soup_uri_encode (_tmp48_, NULL); -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_hash_table_insert (_tmp44_, _tmp45_, _tmp49_); -#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp48_); -#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp50_ = disposition_table; -#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp51_ = g_strdup ("name"); -#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp52_ = g_strdup ("photo"); -#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_hash_table_insert (_tmp50_, _tmp51_, _tmp52_); -#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp53_ = disposition_table; -#line 574 "/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), _tmp53_); -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + filename = _tmp28_; +#line 3759 "FlickrPublishing.c" + } +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp29_ = disposition_table; +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp30_ = g_strdup ("filename"); +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp31_ = publishable; +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp33_ = _tmp32_; +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp34_ = soup_uri_encode (_tmp33_, NULL); +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_hash_table_insert (_tmp29_, _tmp30_, _tmp34_); +#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp33_); +#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp35_ = disposition_table; +#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp36_ = g_strdup ("name"); +#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp37_ = g_strdup ("photo"); +#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_hash_table_insert (_tmp35_, _tmp36_, _tmp37_); +#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp38_ = disposition_table; +#line 530 "/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), _tmp38_); +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (filename); -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_hash_table_unref0 (disposition_table); -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4191 "FlickrPublishing.c" +#line 3795 "FlickrPublishing.c" } -PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { -#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { +#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 4198 "FlickrPublishing.c" -} - - -static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if ((*length) == (*size)) { -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 4209 "FlickrPublishing.c" - } -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*array)[(*length)++] = value; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*array)[*length] = NULL; -#line 4215 "FlickrPublishing.c" -} - - -void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) { - PublishingRESTSupportArgument** _tmp0_; - gint _tmp0__length1; - const gchar* _tmp1_; - const gchar* _tmp2_; - PublishingRESTSupportArgument* _tmp3_; -#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self)); -#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (key != NULL); -#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (value != NULL); -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = self->priv->auth_header_fields; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = key; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = value; -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); -#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add19 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 4243 "FlickrPublishing.c" -} - - -static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 4250 "FlickrPublishing.c" -} - - -static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) { - PublishingRESTSupportArgument** result; - int i; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = g_new0 (PublishingRESTSupportArgument*, length + 1); -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - for (i = 0; i < length; i++) { -#line 4261 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp0_; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result[i] = _tmp0_; -#line 4267 "FlickrPublishing.c" - } -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 4271 "FlickrPublishing.c" -} - - -PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) { - PublishingRESTSupportArgument** result = NULL; - PublishingRESTSupportArgument** _tmp0_; - gint _tmp0__length1; - PublishingRESTSupportArgument** _tmp1_; - gint _tmp1__length1; - PublishingRESTSupportArgument** _tmp2_; - gint _tmp2__length1; -#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = self->priv->auth_header_fields; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1__length1 = _tmp0__length1; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _tmp1_; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2__length1 = _tmp1__length1; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (result_length1) { -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *result_length1 = _tmp2__length1; -#line 4301 "FlickrPublishing.c" - } -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp2_; -#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 4307 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) { - gchar* result = NULL; - gchar* _result_ = NULL; - gchar* _tmp0_; -#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL); -#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = g_strdup ("OAuth "); -#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _result_ = _tmp0_; -#line 4321 "FlickrPublishing.c" - { - gint i = 0; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - i = 0; -#line 4326 "FlickrPublishing.c" - { - gboolean _tmp1_ = FALSE; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = TRUE; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - while (TRUE) { -#line 4333 "FlickrPublishing.c" - gint _tmp3_; - PublishingRESTSupportArgument** _tmp4_; - gint _tmp4__length1; - const gchar* _tmp5_; - PublishingRESTSupportArgument** _tmp6_; - gint _tmp6__length1; - gint _tmp7_; - PublishingRESTSupportArgument* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; - gchar* _tmp12_; - const gchar* _tmp13_; - PublishingRESTSupportArgument** _tmp14_; - gint _tmp14__length1; - gint _tmp15_; - PublishingRESTSupportArgument* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; - gchar* _tmp21_; - gchar* _tmp22_; - gint _tmp23_; - PublishingRESTSupportArgument** _tmp24_; - gint _tmp24__length1; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (!_tmp1_) { -#line 4362 "FlickrPublishing.c" - gint _tmp2_; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = i; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - i = _tmp2_ + 1; -#line 4368 "FlickrPublishing.c" - } -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = FALSE; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = i; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = self->priv->auth_header_fields; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4__length1 = self->priv->auth_header_fields_length1; -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (!(_tmp3_ < _tmp4__length1)) { -#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - break; -#line 4382 "FlickrPublishing.c" - } -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _result_; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = self->priv->auth_header_fields; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6__length1 = self->priv->auth_header_fields_length1; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = i; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _tmp6_[_tmp7_]; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = _tmp8_->key; -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL); -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_result_); -#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _result_ = _tmp10_; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _result_; -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = g_strconcat (_tmp11_, "=", NULL); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_result_); -#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _result_ = _tmp12_; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = _result_; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = self->priv->auth_header_fields; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14__length1 = self->priv->auth_header_fields_length1; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = i; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _tmp14_[_tmp15_]; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = _tmp16_->value; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = g_strconcat ("\"", _tmp17_, NULL); -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = _tmp18_; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = g_strconcat (_tmp19_, "\"", NULL); -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = _tmp20_; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL); -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_result_); -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _result_ = _tmp22_; -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp21_); -#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp19_); -#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = i; -#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = self->priv->auth_header_fields; -#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24__length1 = self->priv->auth_header_fields_length1; -#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 4448 "FlickrPublishing.c" - const gchar* _tmp25_; - gchar* _tmp26_; -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = _result_; -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = g_strconcat (_tmp25_, ", ", NULL); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_result_); -#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _result_ = _tmp26_; -#line 4459 "FlickrPublishing.c" - } - } - } - } -#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _result_; -#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 4468 "FlickrPublishing.c" +#line 3802 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingFlickrUploadTransaction * self; - PublishingFlickrSession* _tmp0_; - gchar* authorization_header = NULL; - gchar* _tmp1_; GError * _inner_error_ = NULL; -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); -#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = self->priv->session; -#line 601 "/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 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self); -#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - authorization_header = _tmp1_; -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:605: executing upload transaction: authorization" \ -" header string = '%s'", authorization_header); -#line 607 "/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 609 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + publishing_rest_support_oauth1_upload_transaction_authorize (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction)); +#line 535 "/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_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (authorization_header); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4504 "FlickrPublishing.c" +#line 3823 "FlickrPublishing.c" } else { -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (authorization_header); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4514 "FlickrPublishing.c" +#line 3831 "FlickrPublishing.c" } } -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (authorization_header); -#line 4519 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) { -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass); -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize; -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate)); -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute; -#line 4532 "FlickrPublishing.c" +#line 3846 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) { -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 4539 "FlickrPublishing.c" +#line 3853 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingFlickrUploadTransaction * self; -#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); -#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_rest_support_session_unref0 (self->priv->session); -#line 539 "/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 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj); -#line 4555 "FlickrPublishing.c" +#line 3865 "FlickrPublishing.c" } @@ -4576,1068 +3885,38 @@ GType publishing_flickr_upload_transaction_get_type (void) { if (g_once_init_enter (&publishing_flickr_upload_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploadTransaction), 0, (GInstanceInitFunc) publishing_flickr_upload_transaction_instance_init, NULL }; GType publishing_flickr_upload_transaction_type_id; - publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0); + publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0); g_once_init_leave (&publishing_flickr_upload_transaction_type_id__volatile, publishing_flickr_upload_transaction_type_id); } return publishing_flickr_upload_transaction_type_id__volatile; } -PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) { - PublishingFlickrSession* self = NULL; -#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL); -#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self; -#line 4577 "FlickrPublishing.c" -} - - -PublishingFlickrSession* publishing_flickr_session_new (void) { -#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION); -#line 4584 "FlickrPublishing.c" -} - - -static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base) { - PublishingFlickrSession * self; - gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - const gchar* _tmp2_; -#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = self->priv->access_phase_token; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp2_ != NULL) { -#line 4600 "FlickrPublishing.c" - const gchar* _tmp3_; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = self->priv->access_phase_token_secret; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = _tmp3_ != NULL; -#line 4606 "FlickrPublishing.c" - } else { -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = FALSE; -#line 4610 "FlickrPublishing.c" - } -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp1_) { -#line 4614 "FlickrPublishing.c" - const gchar* _tmp4_; -#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = self->priv->username; -#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = _tmp4_ != NULL; -#line 4620 "FlickrPublishing.c" - } else { -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = FALSE; -#line 4624 "FlickrPublishing.c" - } -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp0_; -#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 4630 "FlickrPublishing.c" -} - - -void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) { - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (consumer_key != NULL); -#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (consumer_secret != NULL); -#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = consumer_key; -#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->consumer_key); -#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->consumer_key = _tmp1_; -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = consumer_secret; -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->consumer_secret); -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->consumer_secret = _tmp3_; -#line 4661 "FlickrPublishing.c" -} - - -static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { -#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 4668 "FlickrPublishing.c" -} - - -static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if ((*length) == (*size)) { -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 4679 "FlickrPublishing.c" - } -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*array)[(*length)++] = value; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*array)[*length] = NULL; -#line 4685 "FlickrPublishing.c" -} - - -void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) { - gchar* http_method = NULL; - PublishingRESTSupportTransaction* _tmp0_; - PublishingRESTSupportHttpMethod _tmp1_; - gchar* _tmp2_; - const gchar* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; - PublishingRESTSupportArgument** base_string_arguments = NULL; - PublishingRESTSupportTransaction* _tmp6_; - gint _tmp7_; - PublishingRESTSupportArgument** _tmp8_; - gint base_string_arguments_length1; - gint _base_string_arguments_size_; - PublishingFlickrUploadTransaction* upload_txn = NULL; - PublishingRESTSupportTransaction* _tmp9_; - PublishingFlickrUploadTransaction* _tmp10_; - PublishingFlickrUploadTransaction* _tmp11_; - PublishingRESTSupportArgument** sorted_args = NULL; - PublishingRESTSupportArgument** _tmp20_; - gint _tmp20__length1; - gint _tmp21_; - PublishingRESTSupportArgument** _tmp22_; - gint sorted_args_length1; - gint _sorted_args_size_; - gchar* arguments_string = NULL; - gchar* _tmp23_; - gchar* signing_key = NULL; - const gchar* _tmp46_; - gchar* signature_base_string = NULL; - const gchar* _tmp54_; - gchar* _tmp55_; - gchar* _tmp56_; - PublishingRESTSupportTransaction* _tmp57_; - gchar* _tmp58_; - gchar* _tmp59_; - gchar* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - gchar* _tmp65_; - const gchar* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - gchar* _tmp69_; - gchar* _tmp70_; - const gchar* _tmp71_; - const gchar* _tmp72_; - gchar* signature = NULL; - const gchar* _tmp73_; - const gchar* _tmp74_; - gchar* _tmp75_; - const gchar* _tmp76_; - gchar* _tmp77_; - const gchar* _tmp78_; - PublishingFlickrUploadTransaction* _tmp79_; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = txn; -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_); -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_); -#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - http_method = _tmp2_; -#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:637: signing transaction with parameters:"); -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = http_method; -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL); -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _tmp4_; -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:638: %s", _tmp5_); -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp5_); -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = txn; -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_); -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - base_string_arguments = _tmp8_; -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - base_string_arguments_length1 = _tmp7_; -#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _base_string_arguments_size_ = base_string_arguments_length1; -#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = txn; -#line 642 "/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 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_txn = _tmp10_; -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = upload_txn; -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp11_ != NULL) { -#line 4790 "FlickrPublishing.c" - PublishingRESTSupportArgument** auth_header_args = NULL; - PublishingFlickrUploadTransaction* _tmp12_; - gint _tmp13_; - PublishingRESTSupportArgument** _tmp14_; - gint auth_header_args_length1; - gint _auth_header_args_size_; - PublishingRESTSupportArgument** _tmp15_; - gint _tmp15__length1; -#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:644: %s", "this transaction is an UploadTransaction; including Authorization head" \ -"er " "fields in signature base string"); -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = upload_txn; -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_); -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - auth_header_args = _tmp14_; -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - auth_header_args_length1 = _tmp13_; -#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _auth_header_args_size_ = auth_header_args_length1; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = auth_header_args; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15__length1 = auth_header_args_length1; -#line 4815 "FlickrPublishing.c" - { - PublishingRESTSupportArgument** arg_collection = NULL; - gint arg_collection_length1 = 0; - gint _arg_collection_size_ = 0; - gint arg_it = 0; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arg_collection = _tmp15_; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arg_collection_length1 = _tmp15__length1; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) { -#line 4827 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp16_; - PublishingRESTSupportArgument* arg = NULL; -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arg = _tmp16_; -#line 4834 "FlickrPublishing.c" - { - PublishingRESTSupportArgument** _tmp17_; - gint _tmp17__length1; - PublishingRESTSupportArgument* _tmp18_; - PublishingRESTSupportArgument* _tmp19_; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = base_string_arguments; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17__length1 = base_string_arguments_length1; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = arg; -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_); -#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add20 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_); -#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_rest_support_argument_unref0 (arg); -#line 4852 "FlickrPublishing.c" - } - } - } -#line 643 "/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 4858 "FlickrPublishing.c" - } -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = base_string_arguments; -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20__length1 = base_string_arguments_length1; -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_); -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - sorted_args = _tmp22_; -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - sorted_args_length1 = _tmp21_; -#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _sorted_args_size_ = sorted_args_length1; -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = g_strdup (""); -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arguments_string = _tmp23_; -#line 4876 "FlickrPublishing.c" - { - gint i = 0; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - i = 0; -#line 4881 "FlickrPublishing.c" - { - gboolean _tmp24_ = FALSE; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = TRUE; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - while (TRUE) { -#line 4888 "FlickrPublishing.c" - gint _tmp26_; - PublishingRESTSupportArgument** _tmp27_; - gint _tmp27__length1; - const gchar* _tmp28_; - PublishingRESTSupportArgument** _tmp29_; - gint _tmp29__length1; - gint _tmp30_; - PublishingRESTSupportArgument* _tmp31_; - const gchar* _tmp32_; - gchar* _tmp33_; - gchar* _tmp34_; - PublishingRESTSupportArgument** _tmp35_; - gint _tmp35__length1; - gint _tmp36_; - PublishingRESTSupportArgument* _tmp37_; - const gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; - gint _tmp42_; - PublishingRESTSupportArgument** _tmp43_; - gint _tmp43__length1; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (!_tmp24_) { -#line 4913 "FlickrPublishing.c" - gint _tmp25_; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = i; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - i = _tmp25_ + 1; -#line 4919 "FlickrPublishing.c" - } -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = FALSE; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = i; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp27_ = sorted_args; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp27__length1 = sorted_args_length1; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (!(_tmp26_ < _tmp27__length1)) { -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - break; -#line 4933 "FlickrPublishing.c" - } -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp28_ = arguments_string; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29_ = sorted_args; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp29__length1 = sorted_args_length1; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp30_ = i; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp31_ = _tmp29_[_tmp30_]; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp32_ = _tmp31_->key; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp33_ = g_strconcat (_tmp32_, "=", NULL); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp34_ = _tmp33_; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp35_ = sorted_args; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp35__length1 = sorted_args_length1; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp36_ = i; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp37_ = _tmp35_[_tmp36_]; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp38_ = _tmp37_->value; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp40_ = _tmp39_; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (arguments_string); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arguments_string = _tmp41_; -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp40_); -#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp34_); -#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp42_ = i; -#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp43_ = sorted_args; -#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp43__length1 = sorted_args_length1; -#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp42_ < (_tmp43__length1 - 1)) { -#line 4983 "FlickrPublishing.c" - const gchar* _tmp44_; - gchar* _tmp45_; -#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp44_ = arguments_string; -#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp45_ = g_strconcat (_tmp44_, "&", NULL); -#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (arguments_string); -#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - arguments_string = _tmp45_; -#line 4994 "FlickrPublishing.c" - } - } - } - } -#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signing_key = NULL; -#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp46_ = self->priv->access_phase_token_secret; -#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp46_ != NULL) { -#line 5005 "FlickrPublishing.c" - const gchar* _tmp47_; - gchar* _tmp48_; - gchar* _tmp49_; - const gchar* _tmp50_; - gchar* _tmp51_; -#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:666: access phase token secret available; using " \ -"it as signing key"); -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp47_ = self->priv->consumer_secret; -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp48_ = g_strconcat (_tmp47_, "&", NULL); -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp49_ = _tmp48_; -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp50_ = self->priv->access_phase_token_secret; -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp51_ = g_strconcat (_tmp49_, _tmp50_, NULL); -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signing_key); -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signing_key = _tmp51_; -#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp49_); -#line 5029 "FlickrPublishing.c" - } else { - const gchar* _tmp52_; - gchar* _tmp53_; -#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:670: %s", "neither access phase nor request phase token secrets available; using " \ -"API " "key as signing key"); -#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp52_ = self->priv->consumer_secret; -#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp53_ = g_strconcat (_tmp52_, "&", NULL); -#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signing_key); -#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signing_key = _tmp53_; -#line 5043 "FlickrPublishing.c" - } -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp54_ = http_method; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp55_ = g_strconcat (_tmp54_, "&", NULL); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp56_ = _tmp55_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp57_ = txn; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (_tmp57_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp59_ = _tmp58_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp60_ = soup_uri_encode (_tmp59_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp61_ = _tmp60_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp62_ = g_strconcat (_tmp56_, _tmp61_, NULL); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp63_ = _tmp62_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp64_ = g_strconcat (_tmp63_, "&", NULL); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp65_ = _tmp64_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp66_ = arguments_string; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp67_ = soup_uri_encode (_tmp66_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp68_ = _tmp67_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp69_ = g_strconcat (_tmp65_, _tmp68_, NULL); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp70_ = _tmp69_; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp68_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp65_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp63_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp61_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp59_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp56_); -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signature_base_string = _tmp70_; -#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp71_ = signature_base_string; -#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:680: signature base string = '%s'", _tmp71_); -#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp72_ = signing_key; -#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:682: signing key = '%s'", _tmp72_); -#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp73_ = signing_key; -#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp74_ = signature_base_string; -#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp75_ = publishing_rest_support_hmac_sha1 (_tmp73_, _tmp74_); -#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signature = _tmp75_; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp76_ = signature; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp77_ = soup_uri_encode (_tmp76_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signature); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - signature = _tmp77_; -#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp78_ = signature; -#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_debug ("FlickrPublishing.vala:688: signature = '%s'", _tmp78_); -#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp79_ = upload_txn; -#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp79_ != NULL) { -#line 5125 "FlickrPublishing.c" - PublishingFlickrUploadTransaction* _tmp80_; - const gchar* _tmp81_; -#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp80_ = upload_txn; -#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp81_ = signature; -#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_upload_transaction_add_authorization_header_field (_tmp80_, "oauth_signature", _tmp81_); -#line 5134 "FlickrPublishing.c" - } else { - PublishingRESTSupportTransaction* _tmp82_; - const gchar* _tmp83_; -#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp82_ = txn; -#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp83_ = signature; -#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_rest_support_transaction_add_argument (_tmp82_, "oauth_signature", _tmp83_); -#line 5144 "FlickrPublishing.c" - } -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signature); -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signature_base_string); -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (signing_key); -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (arguments_string); -#line 634 "/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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_rest_support_transaction_unref0 (upload_txn); -#line 634 "/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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (http_method); -#line 5162 "FlickrPublishing.c" -} - - -void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) { - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; -#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self)); -#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (token != NULL); -#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (secret != NULL); -#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_if_fail (username != NULL); -#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = token; -#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->access_phase_token); -#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->access_phase_token = _tmp1_; -#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = secret; -#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = g_strdup (_tmp2_); -#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->access_phase_token_secret); -#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->access_phase_token_secret = _tmp3_; -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = username; -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->username); -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->username = _tmp5_; -#line 701 "/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 5207 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) { - gchar* result = NULL; - GTimeVal currtime = {0}; - GTimeVal _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - GTimeVal _tmp4_; - glong _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; -#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_get_current_time (&currtime); -#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_get_current_time (&currtime); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = currtime; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = _tmp0_.tv_sec; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup_printf ("%li", _tmp1_); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = _tmp2_; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = currtime; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _tmp4_.tv_usec; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = g_strdup_printf ("%li", _tmp5_); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _tmp6_; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = _tmp8_; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _tmp10_; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp9_); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp7_); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp3_); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp11_; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 5266 "FlickrPublishing.c" -} - - -static glong string_strnlen (gchar* str, glong maxlen) { - glong result = 0L; - gchar* end = NULL; - gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 5289 "FlickrPublishing.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - return result; -#line 5297 "FlickrPublishing.c" - } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - return result; -#line 5309 "FlickrPublishing.c" - } -} - - -static gchar* string_substring (const gchar* self, glong offset, glong len) { - gchar* result = NULL; - glong string_length = 0L; - gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 5333 "FlickrPublishing.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 5339 "FlickrPublishing.c" - } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = FALSE; -#line 5343 "FlickrPublishing.c" - } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_) { -#line 5347 "FlickrPublishing.c" - glong _tmp3_; - glong _tmp4_; - glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 5359 "FlickrPublishing.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 5369 "FlickrPublishing.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 5375 "FlickrPublishing.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 5389 "FlickrPublishing.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 5399 "FlickrPublishing.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 5405 "FlickrPublishing.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 5414 "FlickrPublishing.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - return result; -#line 5434 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) { - gchar* result = NULL; - gint64 _tmp0_; - gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = g_get_real_time (); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _tmp1_; -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _tmp3_; -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp2_); -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp4_; -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 5463 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) { - gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; -#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = self->priv->consumer_key; -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_assert (_tmp0_ != NULL, "consumer_key != null"); -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = self->priv->consumer_key; -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp2_; -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 5486 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) { - gchar* result = NULL; - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp0_ = self->priv->access_phase_token; -#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_assert (_tmp0_ != NULL, "access_phase_token != null"); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = self->priv->access_phase_token; -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp2_; -#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 5509 "FlickrPublishing.c" -} - - -gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { - gchar* result = NULL; - gboolean _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL); -#line 727 "/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 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_assert (_tmp0_, "is_authenticated()"); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = self->priv->username; -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp2_; -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - return result; -#line 5532 "FlickrPublishing.c" -} - - -static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) { -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - publishing_flickr_session_parent_class = g_type_class_peek_parent (klass); -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize; -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate)); -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated; -#line 5545 "FlickrPublishing.c" -} - - -static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) { -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self); -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->access_phase_token = NULL; -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->access_phase_token_secret = NULL; -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->username = NULL; -#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->consumer_key = NULL; -#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self->priv->consumer_secret = NULL; -#line 5562 "FlickrPublishing.c" -} - - -static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj) { - PublishingFlickrSession * self; -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->access_phase_token); -#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->access_phase_token_secret); -#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->username); -#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->consumer_key); -#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (self->priv->consumer_secret); -#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj); -#line 5582 "FlickrPublishing.c" -} - - -GType publishing_flickr_session_get_type (void) { - static volatile gsize publishing_flickr_session_type_id__volatile = 0; - if (g_once_init_enter (&publishing_flickr_session_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrSession), 0, (GInstanceInitFunc) publishing_flickr_session_instance_init, NULL }; - GType publishing_flickr_session_type_id; - publishing_flickr_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingFlickrSession", &g_define_type_info, 0); - g_once_init_leave (&publishing_flickr_session_type_id__volatile, publishing_flickr_session_type_id); - } - return publishing_flickr_session_type_id__volatile; -} - - static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5601 "FlickrPublishing.c" +#line 3884 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5608 "FlickrPublishing.c" +#line 3891 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5615 "FlickrPublishing.c" +#line 3898 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5622 "FlickrPublishing.c" +#line 3905 "FlickrPublishing.c" } @@ -5710,214 +3989,214 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane gboolean _tmp82_; GtkButton* _tmp83_; GtkButton* _tmp84_; -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL); -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = builder; -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->builder = _tmp1_; -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp2_ != NULL, "builder != null"); -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = builder; -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = gtk_builder_get_objects (_tmp3_); -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_; -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = g_slist_length (_tmp5_); -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0"); -#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_slist_free0 (_tmp5_); -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->builder; -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane"); -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 586 "/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 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = _tmp9_; -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->builder; -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label"); -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/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 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_label); -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_label = _tmp12_; -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = self->priv->builder; -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label"); -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->upload_info_label); -#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->upload_info_label = _tmp15_; -#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = self->priv->builder; -#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button"); -#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 589 "/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 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->logout_button = _tmp18_; -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = self->priv->builder; -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button"); -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 590 "/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 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publish_button = _tmp21_; -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = self->priv->builder; -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo"); -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/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 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_combo); -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_combo = _tmp24_; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = self->priv->builder; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo"); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/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 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_combo); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_combo = _tmp27_; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = self->priv->builder; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = gtk_builder_get_object (_tmp28_, "size_label"); -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 593 "/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 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_label); -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_label = _tmp30_; -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = self->priv->builder; -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check"); -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 594 "/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 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->strip_metadata_check); -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata_check = _tmp33_; -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = publisher; -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = publishing_flickr_flickr_publisher_get_authenticator (_tmp34_); -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = _tmp35_; -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = spit_publishing_authenticator_can_logout (_tmp36_); -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = !_tmp37_; -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp36_); -#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_) { -#line 5831 "FlickrPublishing.c" +#line 4114 "FlickrPublishing.c" GtkButton* _tmp39_; GtkContainer* _tmp40_; GtkContainer* _tmp41_; GtkButton* _tmp42_; -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = self->priv->logout_button; -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = _tmp40_; -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = self->priv->logout_button; -#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget)); -#line 5846 "FlickrPublishing.c" +#line 4129 "FlickrPublishing.c" } -#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = parameters; -#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = _publishing_flickr_publishing_parameters_ref0 (_tmp43_); -#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp44_; -#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = publisher; -#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = _g_object_ref0 (_tmp45_); -#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = _tmp46_; -#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = media_type; -#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->media_type = _tmp47_; -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp48_); -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 604 "/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 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = _tmp49_; -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = _tmp48_; -#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp51_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp50_); -#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/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 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = _tmp51_; -#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = _tmp50_; -#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp52_ = parameters; -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp53_ = _tmp52_->username; -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_); -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp54_; -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp55_ = parameters; -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_ = _tmp55_->user_kind; -#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) { -#line 5902 "FlickrPublishing.c" +#line 4185 "FlickrPublishing.c" const gchar* _tmp57_; PublishingFlickrPublishingParameters* _tmp58_; gint64 _tmp59_; @@ -5926,168 +4205,168 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane gchar* _tmp62_; gchar* _tmp63_; gchar* _tmp64_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp57_ = upload_label_text; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp58_ = parameters; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59_ = _tmp58_->quota_free_bytes; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS); -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = _tmp60_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \ ".\n" \ "This month you have %s remaining in your upload quota."), _tmp61_); -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp63_ = _tmp62_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL); -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp64_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp63_); -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp61_); -#line 5935 "FlickrPublishing.c" +#line 4218 "FlickrPublishing.c" } else { const gchar* _tmp65_; gchar* _tmp66_; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp65_ = upload_label_text; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL); -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp66_; -#line 5947 "FlickrPublishing.c" +#line 4230 "FlickrPublishing.c" } -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp67_ = self->priv->upload_info_label; -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = upload_label_text; -#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_label_set_label (_tmp67_, _tmp68_); -#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp69_ = g_strdup (_ ("Photos _visible to:")); -#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp69_; -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp70_ = media_type; -#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 5963 "FlickrPublishing.c" +#line 4246 "FlickrPublishing.c" gchar* _tmp71_; -#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp71_ = g_strdup (_ ("Videos _visible to:")); -#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp71_; -#line 5971 "FlickrPublishing.c" +#line 4254 "FlickrPublishing.c" } else { SpitPublishingPublisherMediaType _tmp72_; -#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp72_ = media_type; -#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 5978 "FlickrPublishing.c" +#line 4261 "FlickrPublishing.c" gchar* _tmp73_; -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp73_ = g_strdup (_ ("Photos and videos _visible to:")); -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp73_; -#line 5986 "FlickrPublishing.c" +#line 4269 "FlickrPublishing.c" } } -#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp74_ = self->priv->visibility_label; -#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp75_ = visibility_label_text; -#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_label_set_label (_tmp74_, _tmp75_); -#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_visibility_combo (self); -#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp76_ = self->priv->visibility_combo; -#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0); -#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp77_ = media_type; -#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 6005 "FlickrPublishing.c" +#line 4288 "FlickrPublishing.c" GtkComboBoxText* _tmp78_; -#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_size_combo (self); -#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp78_ = self->priv->size_combo; -#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 6013 "FlickrPublishing.c" +#line 4296 "FlickrPublishing.c" } else { GtkComboBoxText* _tmp79_; GtkLabel* _tmp80_; -#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp79_ = self->priv->size_combo; -#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp80_ = self->priv->size_label; -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 6025 "FlickrPublishing.c" +#line 4308 "FlickrPublishing.c" } -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp81_ = self->priv->strip_metadata_check; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp82_ = strip_metadata; -#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_); -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp83_ = self->priv->logout_button; -#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp83_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp84_ = self->priv->publish_button; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (_tmp84_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (visibility_label_text); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (upload_label_text); -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6047 "FlickrPublishing.c" +#line 4330 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 579 "/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 6054 "FlickrPublishing.c" +#line 4337 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) { -#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); -#line 6063 "FlickrPublishing.c" +#line 4346 "FlickrPublishing.c" } static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) { -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_visibility_specification_ref (self) : NULL; -#line 6070 "FlickrPublishing.c" +#line 4353 "FlickrPublishing.c" } @@ -6103,33 +4382,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis SpitPublishingPublisherMediaType _tmp7_; GtkCheckButton* _tmp14_; gboolean _tmp15_; -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->parameters; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->visibilities; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = self->priv->visibilities_length1; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->visibility_combo; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/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 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _tmp1_[_tmp3_]; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _tmp4_->specification; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_); -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification); -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_->visibility_specification = _tmp6_; -#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = self->priv->media_type; -#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 6112 "FlickrPublishing.c" +#line 4395 "FlickrPublishing.c" PublishingFlickrPublishingParameters* _tmp8_; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_; gint _tmp9__length1; @@ -6137,116 +4416,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis gint _tmp11_; PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_; gint _tmp13_; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->parameters; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->sizes; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9__length1 = self->priv->sizes_length1; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->size_combo; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/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 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = _tmp9_[_tmp11_]; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _tmp12_->size; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_->photo_major_axis_size = _tmp13_; -#line 6136 "FlickrPublishing.c" +#line 4419 "FlickrPublishing.c" } -#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->strip_metadata_check; -#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 655 "/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 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_); -#line 6144 "FlickrPublishing.c" +#line 4427 "FlickrPublishing.c" } -static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6155 "FlickrPublishing.c" +#line 4438 "FlickrPublishing.c" } -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6161 "FlickrPublishing.c" +#line 4444 "FlickrPublishing.c" } -static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6172 "FlickrPublishing.c" +#line 4455 "FlickrPublishing.c" } -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6178 "FlickrPublishing.c" +#line 4461 "FlickrPublishing.c" } -static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6189 "FlickrPublishing.c" +#line 4472 "FlickrPublishing.c" } -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6195 "FlickrPublishing.c" +#line 4478 "FlickrPublishing.c" } -static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6206 "FlickrPublishing.c" +#line 4489 "FlickrPublishing.c" } -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6212 "FlickrPublishing.c" +#line 4495 "FlickrPublishing.c" } -static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6223 "FlickrPublishing.c" +#line 4506 "FlickrPublishing.c" } -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6229 "FlickrPublishing.c" +#line 4512 "FlickrPublishing.c" } @@ -6283,108 +4562,108 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_ PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_; gint _tmp21__length1; -#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1); -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result__length1 = 0; -#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" __result__size_ = _result__length1; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _result_; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1); -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp2_; -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Everyone"), _tmp3_); -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_); -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp4_); +#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp3_); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5__length1 = _result__length1; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_; -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends & family only"), _tmp7_); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp8_); +#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp7_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _result_; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9__length1 = _result__length1; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Family only"), _tmp11_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp12_); +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp11_); -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _result_; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13__length1 = _result__length1; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0); -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _tmp14_; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends only"), _tmp15_); -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_); -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp16_); +#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp15_); -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = _result_; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17__length1 = _result__length1; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0); -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = _tmp18_; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Just me"), _tmp19_); -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_); -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_); +#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (_tmp19_); -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _result_; -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21__length1 = _result__length1; -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp21__length1; -#line 6354 "FlickrPublishing.c" +#line 4637 "FlickrPublishing.c" } -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp21_; -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6360 "FlickrPublishing.c" +#line 4643 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) { -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL; -#line 6367 "FlickrPublishing.c" +#line 4650 "FlickrPublishing.c" } @@ -6396,165 +4675,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo GtkComboBoxText* _tmp8_; PublishingFlickrFlickrPublisher* _tmp9_; gint _tmp10_; -#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->visibilities; -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->visibilities_length1; -#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6387 "FlickrPublishing.c" +#line 4670 "FlickrPublishing.c" gint _tmp1_; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_; -#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_); -#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/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 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = _tmp2_; -#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = _tmp1_; -#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 6400 "FlickrPublishing.c" +#line 4683 "FlickrPublishing.c" } -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->visibilities; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->visibilities_length1; -#line 6406 "FlickrPublishing.c" +#line 4689 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL; gint v_collection_length1 = 0; gint _v_collection_size_ = 0; gint v_it = 0; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v_collection = _tmp3_; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v_collection_length1 = _tmp3__length1; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) { -#line 6418 "FlickrPublishing.c" +#line 4701 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]); -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v = _tmp4_; -#line 6425 "FlickrPublishing.c" +#line 4708 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_; PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_; const gchar* _tmp7_; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->visibility_combo; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = v; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_->title; -#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_text_append_text (_tmp5_, _tmp7_); -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v); -#line 6440 "FlickrPublishing.c" +#line 4723 "FlickrPublishing.c" } } } -#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->visibility_combo; -#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->publisher; -#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_); -#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 677 "/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 6452 "FlickrPublishing.c" +#line 4735 "FlickrPublishing.c" } -static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6463 "FlickrPublishing.c" +#line 4746 "FlickrPublishing.c" } -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6469 "FlickrPublishing.c" +#line 4752 "FlickrPublishing.c" } -static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6480 "FlickrPublishing.c" +#line 4763 "FlickrPublishing.c" } -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6486 "FlickrPublishing.c" +#line 4769 "FlickrPublishing.c" } -static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6497 "FlickrPublishing.c" +#line 4780 "FlickrPublishing.c" } -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6503 "FlickrPublishing.c" +#line 4786 "FlickrPublishing.c" } -static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6514 "FlickrPublishing.c" +#line 4797 "FlickrPublishing.c" } -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6520 "FlickrPublishing.c" +#line 4803 "FlickrPublishing.c" } -static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6531 "FlickrPublishing.c" +#line 4814 "FlickrPublishing.c" } -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6537 "FlickrPublishing.c" +#line 4820 "FlickrPublishing.c" } @@ -6581,78 +4860,78 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_; gint _tmp11__length1; -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL); -#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1); -#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result__length1 = 0; -#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" __result__size_ = _result__length1; -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _result_; -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("500 × 375 pixels"), 500); -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp2_); +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _result_; -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = _result__length1; -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("1024 × 768 pixels"), 1024); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_); -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp4_); +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5__length1 = _result__length1; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("2048 × 1536 pixels"), 2048); -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_); +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _result_; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7__length1 = _result__length1; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("4096 × 3072 pixels"), 4096); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_); -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp8_); +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = _result_; -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9__length1 = _result__length1; -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("Original size"), PUBLISHING_FLICKR_ORIGINAL_SIZE); -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_); -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp10_); +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _result_; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11__length1 = _result__length1; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp11__length1; -#line 6622 "FlickrPublishing.c" +#line 4905 "FlickrPublishing.c" } -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp11_; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6628 "FlickrPublishing.c" +#line 4911 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) { -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL; -#line 6635 "FlickrPublishing.c" +#line 4918 "FlickrPublishing.c" } @@ -6664,80 +4943,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi GtkComboBoxText* _tmp8_; PublishingFlickrFlickrPublisher* _tmp9_; gint _tmp10_; -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->sizes; -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0__length1 = self->priv->sizes_length1; -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6655 "FlickrPublishing.c" +#line 4938 "FlickrPublishing.c" gint _tmp1_; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_; -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_); -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 694 "/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 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = _tmp2_; -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = _tmp1_; -#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 6668 "FlickrPublishing.c" +#line 4951 "FlickrPublishing.c" } -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->sizes; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->sizes_length1; -#line 6674 "FlickrPublishing.c" +#line 4957 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; gint _e_collection_size_ = 0; gint e_it = 0; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e_collection = _tmp3_; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e_collection_length1 = _tmp3__length1; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) { -#line 6686 "FlickrPublishing.c" +#line 4969 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _tmp4_; -#line 6693 "FlickrPublishing.c" +#line 4976 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_; PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_; const gchar* _tmp7_; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = self->priv->size_combo; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = e; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = _tmp6_->title; -#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_text_append_text (_tmp5_, _tmp7_); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_size_entry_unref0 (e); -#line 6708 "FlickrPublishing.c" +#line 4991 "FlickrPublishing.c" } } } -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->size_combo; -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->publisher; -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_); -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 699 "/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 6720 "FlickrPublishing.c" +#line 5003 "FlickrPublishing.c" } @@ -6745,17 +5024,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin PublishingFlickrFlickrPublisher* _tmp0_; GtkComboBoxText* _tmp1_; gint _tmp2_; -#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->size_combo; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/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 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 6738 "FlickrPublishing.c" +#line 5021 "FlickrPublishing.c" } @@ -6763,41 +5042,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub PublishingFlickrFlickrPublisher* _tmp0_; GtkComboBoxText* _tmp1_; gint _tmp2_; -#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->visibility_combo; -#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/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 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_); -#line 6756 "FlickrPublishing.c" +#line 5039 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) { GtkCheckButton* _tmp0_; gboolean _tmp1_; -#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->strip_metadata_check; -#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 711 "/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 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_); -#line 6771 "FlickrPublishing.c" +#line 5054 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) { -#line 907 "/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_PUBLISHING_OPTIONS_PANE (self)); -#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); -#line 6780 "FlickrPublishing.c" +#line 5063 "FlickrPublishing.c" } @@ -6806,56 +5085,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi GtkWidget* result = NULL; GtkBox* _tmp0_; GtkWidget* _tmp1_; -#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/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 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp1_; -#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6799 "FlickrPublishing.c" +#line 5082 "FlickrPublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 915 "/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_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6812 "FlickrPublishing.c" +#line 5095 "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 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self); -#line 6819 "FlickrPublishing.c" +#line 5102 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self); -#line 6826 "FlickrPublishing.c" +#line 5109 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; -#line 919 "/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_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 727 "/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 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 728 "/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 6838 "FlickrPublishing.c" +#line 5121 "FlickrPublishing.c" } @@ -6863,17 +5142,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( PublishingFlickrPublishingOptionsPane * self; guint _tmp0_; guint _tmp1_; -#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE); -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 732 "/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 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 733 "/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 6856 "FlickrPublishing.c" +#line 5139 "FlickrPublishing.c" } @@ -6882,240 +5161,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish const gchar* _tmp0_; gchar* _tmp1_; gint _tmp2_; -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type); -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = creator_title; -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->title = _tmp1_; -#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = creator_size; -#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->size = _tmp2_; -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6883 "FlickrPublishing.c" +#line 5166 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) { -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 544 "/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 6890 "FlickrPublishing.c" +#line 5173 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 6897 "FlickrPublishing.c" +#line 5180 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer); -#line 6906 "FlickrPublishing.c" +#line 5189 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 6916 "FlickrPublishing.c" +#line 5199 "FlickrPublishing.c" } else { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6920 "FlickrPublishing.c" +#line 5203 "FlickrPublishing.c" } } static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 6928 "FlickrPublishing.c" +#line 5211 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 6935 "FlickrPublishing.c" +#line 5218 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry * object; object = collect_values[0].v_pointer; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 6942 "FlickrPublishing.c" +#line 5225 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 6946 "FlickrPublishing.c" +#line 5229 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object); -#line 6950 "FlickrPublishing.c" +#line 5233 "FlickrPublishing.c" } else { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 6954 "FlickrPublishing.c" +#line 5237 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 6958 "FlickrPublishing.c" +#line 5241 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 6969 "FlickrPublishing.c" +#line 5252 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 6975 "FlickrPublishing.c" +#line 5258 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 6979 "FlickrPublishing.c" +#line 5262 "FlickrPublishing.c" } else { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 6983 "FlickrPublishing.c" +#line 5266 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 6987 "FlickrPublishing.c" +#line 5270 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7001 "FlickrPublishing.c" +#line 5284 "FlickrPublishing.c" } static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7010 "FlickrPublishing.c" +#line 5293 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneSizeEntry * old; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 7030 "FlickrPublishing.c" +#line 5313 "FlickrPublishing.c" } else { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7034 "FlickrPublishing.c" +#line 5317 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7040 "FlickrPublishing.c" +#line 5323 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneSizeEntry * old; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 7059 "FlickrPublishing.c" +#line 5342 "FlickrPublishing.c" } else { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7063 "FlickrPublishing.c" +#line 5346 "FlickrPublishing.c" } -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7069 "FlickrPublishing.c" +#line 5352 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize; -#line 7079 "FlickrPublishing.c" +#line 5362 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 7086 "FlickrPublishing.c" +#line 5369 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) { PublishingFlickrPublishingOptionsPaneSizeEntry * self; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7098 "FlickrPublishing.c" +#line 5381 "FlickrPublishing.c" } @@ -7136,24 +5415,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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 7123 "FlickrPublishing.c" +#line 5406 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) { PublishingFlickrPublishingOptionsPaneSizeEntry * self; self = instance; -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self); -#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7136 "FlickrPublishing.c" +#line 5419 "FlickrPublishing.c" } } @@ -7164,248 +5443,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p PublishingFlickrVisibilitySpecification* _tmp1_; const gchar* _tmp2_; gchar* _tmp3_; -#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (creator_title != NULL, NULL); -#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL); -#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type); -#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = creator_specification; -#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_); -#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->specification); -#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->specification = _tmp1_; -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = creator_title; -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->title = _tmp3_; -#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7171 "FlickrPublishing.c" +#line 5454 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { -#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 554 "/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 7178 "FlickrPublishing.c" +#line 5461 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7185 "FlickrPublishing.c" +#line 5468 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (value->data[0].v_pointer) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer); -#line 7194 "FlickrPublishing.c" +#line 5477 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (src_value->data[0].v_pointer) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 7204 "FlickrPublishing.c" +#line 5487 "FlickrPublishing.c" } else { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 7208 "FlickrPublishing.c" +#line 5491 "FlickrPublishing.c" } } static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7216 "FlickrPublishing.c" +#line 5499 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 7223 "FlickrPublishing.c" +#line 5506 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry * object; object = collect_values[0].v_pointer; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 7230 "FlickrPublishing.c" +#line 5513 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 7234 "FlickrPublishing.c" +#line 5517 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object); -#line 7238 "FlickrPublishing.c" +#line 5521 "FlickrPublishing.c" } else { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7242 "FlickrPublishing.c" +#line 5525 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7246 "FlickrPublishing.c" +#line 5529 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 7257 "FlickrPublishing.c" +#line 5540 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 7263 "FlickrPublishing.c" +#line 5546 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7267 "FlickrPublishing.c" +#line 5550 "FlickrPublishing.c" } else { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 7271 "FlickrPublishing.c" +#line 5554 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7275 "FlickrPublishing.c" +#line 5558 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7289 "FlickrPublishing.c" +#line 5572 "FlickrPublishing.c" } static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 7298 "FlickrPublishing.c" +#line 5581 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 7318 "FlickrPublishing.c" +#line 5601 "FlickrPublishing.c" } else { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7322 "FlickrPublishing.c" +#line 5605 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7328 "FlickrPublishing.c" +#line 5611 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" old = value->data[0].v_pointer; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (v_object) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 7347 "FlickrPublishing.c" +#line 5630 "FlickrPublishing.c" } else { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7351 "FlickrPublishing.c" +#line 5634 "FlickrPublishing.c" } -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7357 "FlickrPublishing.c" +#line 5640 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize; -#line 7367 "FlickrPublishing.c" +#line 5650 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 7374 "FlickrPublishing.c" +#line 5657 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->specification); -#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7388 "FlickrPublishing.c" +#line 5671 "FlickrPublishing.c" } @@ -7426,134 +5705,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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 7413 "FlickrPublishing.c" +#line 5696 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) { PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; self = instance; -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self); -#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7426 "FlickrPublishing.c" +#line 5709 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) { -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate)); -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize; -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 7442 "FlickrPublishing.c" +#line 5725 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget; -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/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 7457 "FlickrPublishing.c" +#line 5740 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) { -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->pane_widget = NULL; -#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_label = NULL; -#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->upload_info_label = NULL; -#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_label = NULL; -#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->logout_button = NULL; -#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publish_button = NULL; -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibility_combo = NULL; -#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->size_combo = NULL; -#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata_check = NULL; -#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities = NULL; -#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->visibilities_length1 = 0; -#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes = NULL; -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->sizes_length1 = 0; -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = NULL; -#line 7498 "FlickrPublishing.c" +#line 5781 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) { PublishingFlickrPublishingOptionsPane * self; -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); -#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_label); -#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->upload_info_label); -#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_label); -#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->visibility_combo); -#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->size_combo); -#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->strip_metadata_check); -#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 570 "/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 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 571 "/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 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj); -#line 7536 "FlickrPublishing.c" +#line 5819 "FlickrPublishing.c" } @@ -7571,65 +5850,65 @@ GType publishing_flickr_publishing_options_pane_get_type (void) { } -PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { +PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { PublishingFlickrUploader* self = NULL; - PublishingFlickrSession* _tmp0_; + PublishingRESTSupportOAuth1Session* _tmp0_; SpitPublishingPublishable** _tmp1_; gint _tmp1__length1; PublishingFlickrPublishingParameters* _tmp2_; PublishingFlickrPublishingParameters* _tmp3_; gboolean _tmp4_; -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL); -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL); +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = session; -#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = publishables; -#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = publishables_length1; -#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 743 "/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 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = parameters; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_); -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = _tmp3_; -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = strip_metadata; -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->strip_metadata = _tmp4_; -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7588 "FlickrPublishing.c" +#line 5871 "FlickrPublishing.c" } -PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { +#line 741 "/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 7595 "FlickrPublishing.c" +#line 5878 "FlickrPublishing.c" } -static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) { -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value) { +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 7606 "FlickrPublishing.c" +#line 5889 "FlickrPublishing.c" } -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 7612 "FlickrPublishing.c" +#line 5895 "FlickrPublishing.c" } @@ -7647,25 +5926,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GExiv2Metadata* _tmp32_; gboolean _tmp33_; GError * _inner_error_ = NULL; -#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self)); -#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable)); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = publishable; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { -#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7642 "FlickrPublishing.c" +#line 5925 "FlickrPublishing.c" } -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gexiv2_metadata_new (); -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishable_metadata = _tmp2_; -#line 7648 "FlickrPublishing.c" +#line 5931 "FlickrPublishing.c" { GExiv2Metadata* _tmp3_; SpitPublishingPublishable* _tmp4_; @@ -7673,27 +5952,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishable_metadata; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = publishable; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _tmp5_; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = g_file_get_path (_tmp6_); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = _tmp7_; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp8_); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp6_); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7676 "FlickrPublishing.c" +#line 5959 "FlickrPublishing.c" goto __catch18_g_error; } } @@ -7706,129 +5985,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = publishable; -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = _tmp10_; -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = _tmp12_; -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:950: couldn't read metadata from file '%s' for u" \ +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:757: couldn't read metadata from file '%s' for u" \ "pload preprocessing.", _tmp13_); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp13_); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp11_); -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 7711 "FlickrPublishing.c" +#line 5994 "FlickrPublishing.c" } __finally18: -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/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 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7724 "FlickrPublishing.c" +#line 6007 "FlickrPublishing.c" } -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishable_metadata; -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = gexiv2_metadata_has_iptc (_tmp14_); -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp15_) { -#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7736 "FlickrPublishing.c" +#line 6019 "FlickrPublishing.c" } -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishable_metadata; -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption"); -#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp17_) { -#line 7744 "FlickrPublishing.c" +#line 6027 "FlickrPublishing.c" GExiv2Metadata* _tmp18_; GExiv2Metadata* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; gchar* _tmp23_; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = publishable_metadata; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = publishable_metadata; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption"); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp21_ = _tmp20_; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = publishing_rest_support_asciify_string (_tmp21_); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp23_ = _tmp22_; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp23_); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 7769 "FlickrPublishing.c" +#line 6052 "FlickrPublishing.c" } -#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = publishable_metadata; -#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline"); -#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp25_) { -#line 7777 "FlickrPublishing.c" +#line 6060 "FlickrPublishing.c" GExiv2Metadata* _tmp26_; GExiv2Metadata* _tmp27_; gchar* _tmp28_; gchar* _tmp29_; gchar* _tmp30_; gchar* _tmp31_; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = publishable_metadata; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = publishable_metadata; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline"); -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = _tmp28_; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp30_ = publishing_rest_support_asciify_string (_tmp29_); -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = _tmp30_; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_); -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp31_); -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp29_); -#line 7802 "FlickrPublishing.c" +#line 6085 "FlickrPublishing.c" } -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = publishable_metadata; -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords"); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp33_) { -#line 7810 "FlickrPublishing.c" +#line 6093 "FlickrPublishing.c" GeeSet* keyword_set = NULL; GeeHashSet* _tmp34_; gchar** iptc_keywords = NULL; @@ -7868,179 +6147,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GExiv2Metadata* _tmp60_; gchar** _tmp61_; gint _tmp61__length1; -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet); -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp35_ = publishable_metadata; -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords"); -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = _tmp37_; -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords_length1 = _vala_array_length (_tmp36_); -#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _iptc_keywords_size_ = iptc_keywords_length1; -#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = iptc_keywords; -#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38__length1 = iptc_keywords_length1; -#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_ != NULL) { -#line 7870 "FlickrPublishing.c" +#line 6153 "FlickrPublishing.c" gchar** _tmp39_; gint _tmp39__length1; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = iptc_keywords; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39__length1 = iptc_keywords_length1; -#line 7877 "FlickrPublishing.c" +#line 6160 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; gint _keyword_collection_size_ = 0; gint keyword_it = 0; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection = _tmp39_; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection_length1 = _tmp39__length1; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) { -#line 7889 "FlickrPublishing.c" +#line 6172 "FlickrPublishing.c" gchar* _tmp40_; gchar* keyword = NULL; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = g_strdup (keyword_collection[keyword_it]); -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp40_; -#line 7896 "FlickrPublishing.c" +#line 6179 "FlickrPublishing.c" { GeeSet* _tmp41_; const gchar* _tmp42_; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = keyword_set; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp42_ = keyword; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 7908 "FlickrPublishing.c" +#line 6191 "FlickrPublishing.c" } } } } -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = publishable_metadata; -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject"); -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = _tmp45_; -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords_length1 = _vala_array_length (_tmp44_); -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _xmp_keywords_size_ = xmp_keywords_length1; -#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46_ = xmp_keywords; -#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp46__length1 = xmp_keywords_length1; -#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 7929 "FlickrPublishing.c" +#line 6212 "FlickrPublishing.c" gchar** _tmp47_; gint _tmp47__length1; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = xmp_keywords; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47__length1 = xmp_keywords_length1; -#line 7936 "FlickrPublishing.c" +#line 6219 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; gint _keyword_collection_size_ = 0; gint keyword_it = 0; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection = _tmp47_; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword_collection_length1 = _tmp47__length1; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) { -#line 7948 "FlickrPublishing.c" +#line 6231 "FlickrPublishing.c" gchar* _tmp48_; gchar* keyword = NULL; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strdup (keyword_collection[keyword_it]); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp48_; -#line 7955 "FlickrPublishing.c" +#line 6238 "FlickrPublishing.c" { GeeSet* _tmp49_; const gchar* _tmp50_; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = keyword_set; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp50_ = keyword; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 7967 "FlickrPublishing.c" +#line 6250 "FlickrPublishing.c" } } } } -#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp51_ = keyword_set; -#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 790 "/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 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = _tmp53_; -#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords_length1 = _tmp52_; -#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _all_keywords_size_ = all_keywords_length1; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = all_keywords; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54__length1 = all_keywords_length1; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _vala_array_add31 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL); -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL); +#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp55_ = g_new0 (gchar*, 1 + 1); -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = _tmp55_; -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords_length1 = 1; -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _no_keywords_size_ = no_keywords_length1; -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_ = no_keywords; -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56__length1 = no_keywords_length1; -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp56_[0]); -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp56_[0] = NULL; -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp57_ = _tmp56_[0]; -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp58_ = publishable_metadata; -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59_ = all_keywords; -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp59__length1 = all_keywords_length1; -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_); -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp60_ = publishable_metadata; -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = no_keywords; -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61__length1 = no_keywords_length1; -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_); -#line 8022 "FlickrPublishing.c" +#line 6305 "FlickrPublishing.c" { GExiv2Metadata* _tmp62_; SpitPublishingPublishable* _tmp63_; @@ -8048,27 +6327,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp65_; gchar* _tmp66_; gchar* _tmp67_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = publishable_metadata; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp63_ = publishable; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp65_ = _tmp64_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp66_ = g_file_get_path (_tmp65_); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp67_ = _tmp66_; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp67_); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp65_); -#line 1001 "/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 8050 "FlickrPublishing.c" +#line 6333 "FlickrPublishing.c" goto __catch19_g_error; } } @@ -8081,69 +6360,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU GFile* _tmp70_; gchar* _tmp71_; gchar* _tmp72_; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _inner_error_ = NULL; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = publishable; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp70_ = _tmp69_; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp71_ = g_file_get_path (_tmp70_); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp72_ = _tmp71_; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_warning ("FlickrPublishing.vala:1003: couldn't write metadata to file '%s' for u" \ -"pload preprocessing.", _tmp72_); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + g_warning ("FlickrPublishing.vala:810: couldn't write metadata to file '%s' for up" \ +"load preprocessing.", _tmp72_); +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp72_); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp70_); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 8085 "FlickrPublishing.c" +#line 6368 "FlickrPublishing.c" } __finally19: -#line 1000 "/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 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 1000 "/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 1000 "/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 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 8108 "FlickrPublishing.c" +#line 6391 "FlickrPublishing.c" } -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 8120 "FlickrPublishing.c" +#line 6403 "FlickrPublishing.c" } -#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 8124 "FlickrPublishing.c" +#line 6407 "FlickrPublishing.c" } @@ -8153,79 +6432,79 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_ SpitPublishingPublishable* _tmp0_; SpitPublishingPublishable* _tmp1_; PublishingRESTSupportSession* _tmp2_; - PublishingFlickrSession* _tmp3_; + PublishingRESTSupportOAuth1Session* _tmp3_; PublishingFlickrPublishingParameters* _tmp4_; SpitPublishingPublishable* _tmp5_; SpitPublishingPublishable* _tmp6_; PublishingFlickrUploadTransaction* _tmp7_; PublishingRESTSupportTransaction* _tmp8_; -#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); -#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 818 "/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 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp0_; -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_uploader_preprocess_publishable (self, _tmp1_); -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp1_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session); +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->parameters; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = _tmp5_; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (_tmp6_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_session_unref0 (_tmp3_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp8_; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8174 "FlickrPublishing.c" +#line 6457 "FlickrPublishing.c" } static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) { -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass); -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize; -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate)); -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; -#line 8187 "FlickrPublishing.c" +#line 6470 "FlickrPublishing.c" } static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) { -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self); -#line 8194 "FlickrPublishing.c" +#line 6477 "FlickrPublishing.c" } static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingFlickrUploader * self; -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); -#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); -#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" +#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj); -#line 8206 "FlickrPublishing.c" +#line 6489 "FlickrPublishing.c" } |