diff options
Diffstat (limited to 'plugins/shotwell-publishing/FlickrPublishing.c')
| -rw-r--r-- | plugins/shotwell-publishing/FlickrPublishing.c | 3312 |
1 files changed, 1634 insertions, 1678 deletions
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index a15a23d..25f2d69 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.34.7, the Vala compiler +/* FlickrPublishing.c generated by valac 0.36.6, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -179,6 +179,12 @@ typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate Publishing #define _publishing_flickr_publishing_options_pane_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_options_pane_size_entry_unref (var), NULL))) typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry; typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry; +enum { + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -398,12 +404,12 @@ static gint flickr_service_icon_pixbuf_set_length1; static GdkPixbuf** flickr_service_icon_pixbuf_set = NULL; static gint flickr_service_icon_pixbuf_set_length1 = 0; static gint _flickr_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* flickr_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* flickr_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * flickr_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * flickr_service_spit_publishing_service_parent_iface = NULL; 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 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; @@ -411,7 +417,7 @@ 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; -static SpitPublishingDialogPaneIface* publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_flickr_uploader_parent_class = NULL; GType flickr_service_get_type (void) G_GNUC_CONST; @@ -432,7 +438,7 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPub PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base); -static void flickr_service_finalize (GObject* obj); +static void flickr_service_finalize (GObject * obj); #define PUBLISHING_FLICKR_SERVICE_NAME "Flickr" #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest" #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1 @@ -451,7 +457,7 @@ enum { }; PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level); PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level); -static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj); +static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj); gpointer publishing_flickr_publishing_parameters_ref (gpointer instance); void publishing_flickr_publishing_parameters_unref (gpointer instance); GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -464,7 +470,7 @@ 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); +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)) @@ -523,7 +529,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base); 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); +static void publishing_flickr_flickr_publisher_finalize (GObject * obj); enum { PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY }; @@ -551,19 +557,19 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (Pub 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); static void _g_free0_ (gpointer var); -static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value); +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); +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 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; @@ -596,18 +602,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_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 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_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); +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); @@ -619,20 +625,20 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( enum { PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_DUMMY_PROPERTY }; -static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj); +static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj); enum { PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_DUMMY_PROPERTY }; -static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj); -static void publishing_flickr_publishing_options_pane_finalize (GObject* obj); +static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj); +static void publishing_flickr_publishing_options_pane_finalize (GObject * obj); #define PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploaderPrivate)) 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_add31 (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 publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -640,8 +646,8 @@ static gint _vala_array_length (gpointer array); FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory) { FlickrService * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -652,9 +658,9 @@ 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 656 "FlickrPublishing.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 662 "FlickrPublishing.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" FLICKR_SERVICE_ICON_FILENAME, &_tmp1_); #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -665,27 +671,27 @@ 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 669 "FlickrPublishing.c" +#line 675 "FlickrPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 673 "FlickrPublishing.c" +#line 679 "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 680 "FlickrPublishing.c" +#line 686 "FlickrPublishing.c" } static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { FlickrService * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -698,7 +704,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 702 "FlickrPublishing.c" +#line 708 "FlickrPublishing.c" } @@ -711,7 +717,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 715 "FlickrPublishing.c" +#line 721 "FlickrPublishing.c" } @@ -724,14 +730,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 728 "FlickrPublishing.c" +#line 734 "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 735 "FlickrPublishing.c" +#line 741 "FlickrPublishing.c" } @@ -742,34 +748,33 @@ 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 746 "FlickrPublishing.c" - GdkPixbuf* _tmp0_ = NULL; +#line 752 "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 752 "FlickrPublishing.c" +#line 758 "FlickrPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 756 "FlickrPublishing.c" +#line 762 "FlickrPublishing.c" } static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { FlickrService * self; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GdkPixbuf** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - GdkPixbuf** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; + GdkPixbuf** _tmp8_; + gint _tmp8__length1; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -781,60 +786,58 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).authors = _tmp0_; #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc."); -#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc.")); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).copyright); #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).copyright = _tmp2_; + (*info).copyright = _tmp1_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = g_strdup (RESOURCES_TRANSLATORS); + _tmp2_ = g_strdup (RESOURCES_TRANSLATORS); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).translators); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).translators = _tmp3_; + (*info).translators = _tmp2_; #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = g_strdup (_VERSION); + _tmp3_ = g_strdup (_VERSION); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).version); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).version = _tmp4_; + (*info).version = _tmp3_; #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME); + _tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).website_name); #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).website_name = _tmp5_; + (*info).website_name = _tmp4_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = g_strdup (RESOURCES_WEBSITE_URL); + _tmp5_ = g_strdup (RESOURCES_WEBSITE_URL); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).website_url); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).website_url = _tmp6_; + (*info).website_url = _tmp5_; #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).is_license_wordwrapped = FALSE; #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = g_strdup (RESOURCES_LICENSE); + _tmp6_ = g_strdup (RESOURCES_LICENSE); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 ((*info).license); #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).license = _tmp7_; + (*info).license = _tmp6_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = flickr_service_icon_pixbuf_set; + _tmp7_ = flickr_service_icon_pixbuf_set; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8__length1 = flickr_service_icon_pixbuf_set_length1; + _tmp7__length1 = flickr_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup7 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9__length1 = _tmp8__length1; + _tmp8__length1 = _tmp7__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).icons = _tmp9_; + (*info).icons = _tmp8_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - (*info).icons_length1 = _tmp9__length1; -#line 838 "FlickrPublishing.c" + (*info).icons_length1 = _tmp8__length1; +#line 841 "FlickrPublishing.c" } @@ -842,15 +845,15 @@ 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 846 "FlickrPublishing.c" +#line 849 "FlickrPublishing.c" } static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { FlickrService * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingFlickrFlickrPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingFlickrFlickrPublisher* _tmp1_; #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -863,7 +866,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 867 "FlickrPublishing.c" +#line 870 "FlickrPublishing.c" } @@ -876,7 +879,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 880 "FlickrPublishing.c" +#line 883 "FlickrPublishing.c" } @@ -885,7 +888,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 889 "FlickrPublishing.c" +#line 892 "FlickrPublishing.c" } @@ -893,16 +896,16 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" flickr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) flickr_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) flickr_service_real_get_pluggable_interface; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_id; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) flickr_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) flickr_service_real_get_pluggable_name; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) flickr_service_real_get_info; + 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 906 "FlickrPublishing.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation; +#line 909 "FlickrPublishing.c" } @@ -910,10 +913,10 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" flickr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) flickr_service_real_create_publisher; + 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 917 "FlickrPublishing.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media; +#line 920 "FlickrPublishing.c" } @@ -921,13 +924,13 @@ static void flickr_service_instance_init (FlickrService * self) { } -static void flickr_service_finalize (GObject* obj) { +static void flickr_service_finalize (GObject * obj) { FlickrService * self; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" 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 931 "FlickrPublishing.c" +#line 934 "FlickrPublishing.c" } @@ -961,9 +964,9 @@ GType publishing_flickr_user_kind_get_type (void) { PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_construct (GType object_type, gint friends_level, gint family_level, gint everyone_level) { PublishingFlickrVisibilitySpecification* self = NULL; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 74 "/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" @@ -980,21 +983,21 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat self->everyone_level = _tmp2_; #line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 984 "FlickrPublishing.c" +#line 987 "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" return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level); -#line 991 "FlickrPublishing.c" +#line 994 "FlickrPublishing.c" } static void publishing_flickr_value_visibility_specification_init (GValue* value) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 998 "FlickrPublishing.c" +#line 1001 "FlickrPublishing.c" } @@ -1003,7 +1006,7 @@ static void publishing_flickr_value_visibility_specification_free_value (GValue* if (value->data[0].v_pointer) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (value->data[0].v_pointer); -#line 1007 "FlickrPublishing.c" +#line 1010 "FlickrPublishing.c" } } @@ -1013,11 +1016,11 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G if (src_value->data[0].v_pointer) { #line 69 "/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 1017 "FlickrPublishing.c" +#line 1020 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1021 "FlickrPublishing.c" +#line 1024 "FlickrPublishing.c" } } @@ -1025,66 +1028,66 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1029 "FlickrPublishing.c" +#line 1032 "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" if (collect_values[0].v_pointer) { -#line 1036 "FlickrPublishing.c" - PublishingFlickrVisibilitySpecification* object; +#line 1039 "FlickrPublishing.c" + PublishingFlickrVisibilitySpecification * object; object = collect_values[0].v_pointer; #line 69 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1043 "FlickrPublishing.c" +#line 1046 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1047 "FlickrPublishing.c" +#line 1050 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object); -#line 1051 "FlickrPublishing.c" +#line 1054 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1055 "FlickrPublishing.c" +#line 1058 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1059 "FlickrPublishing.c" +#line 1062 "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; + PublishingFlickrVisibilitySpecification ** object_p; object_p = collect_values[0].v_pointer; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 69 "/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 1070 "FlickrPublishing.c" +#line 1073 "FlickrPublishing.c" } #line 69 "/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" *object_p = NULL; -#line 1076 "FlickrPublishing.c" +#line 1079 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1080 "FlickrPublishing.c" +#line 1083 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1084 "FlickrPublishing.c" +#line 1087 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1088 "FlickrPublishing.c" +#line 1091 "FlickrPublishing.c" } @@ -1098,7 +1101,7 @@ GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1102 "FlickrPublishing.c" +#line 1105 "FlickrPublishing.c" } @@ -1107,12 +1110,12 @@ gpointer publishing_flickr_value_get_visibility_specification (const GValue* val 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" return value->data[0].v_pointer; -#line 1111 "FlickrPublishing.c" +#line 1114 "FlickrPublishing.c" } void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) { - PublishingFlickrVisibilitySpecification* old; + PublishingFlickrVisibilitySpecification * old; #line 69 "/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" @@ -1127,23 +1130,23 @@ void publishing_flickr_value_set_visibility_specification (GValue* value, gpoint value->data[0].v_pointer = v_object; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1131 "FlickrPublishing.c" +#line 1134 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1135 "FlickrPublishing.c" +#line 1138 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1141 "FlickrPublishing.c" +#line 1144 "FlickrPublishing.c" } } void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) { - PublishingFlickrVisibilitySpecification* old; + PublishingFlickrVisibilitySpecification * old; #line 69 "/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" @@ -1156,17 +1159,17 @@ void publishing_flickr_value_take_visibility_specification (GValue* value, gpoin 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" value->data[0].v_pointer = v_object; -#line 1160 "FlickrPublishing.c" +#line 1163 "FlickrPublishing.c" } else { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1164 "FlickrPublishing.c" +#line 1167 "FlickrPublishing.c" } #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1170 "FlickrPublishing.c" +#line 1173 "FlickrPublishing.c" } } @@ -1176,24 +1179,24 @@ static void publishing_flickr_visibility_specification_class_init (PublishingFli publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize; -#line 1180 "FlickrPublishing.c" +#line 1183 "FlickrPublishing.c" } static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) { #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1187 "FlickrPublishing.c" +#line 1190 "FlickrPublishing.c" } -static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj) { +static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) { PublishingFlickrVisibilitySpecification * self; #line 69 "/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" g_signal_handlers_destroy (self); -#line 1197 "FlickrPublishing.c" +#line 1200 "FlickrPublishing.c" } @@ -1212,18 +1215,18 @@ GType publishing_flickr_visibility_specification_get_type (void) { gpointer publishing_flickr_visibility_specification_ref (gpointer instance) { - PublishingFlickrVisibilitySpecification* self; + PublishingFlickrVisibilitySpecification * self; self = instance; #line 69 "/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" return instance; -#line 1222 "FlickrPublishing.c" +#line 1225 "FlickrPublishing.c" } void publishing_flickr_visibility_specification_unref (gpointer instance) { - PublishingFlickrVisibilitySpecification* self; + PublishingFlickrVisibilitySpecification * self; self = instance; #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1231,7 +1234,7 @@ void publishing_flickr_visibility_specification_unref (gpointer instance) { PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self); #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1235 "FlickrPublishing.c" +#line 1238 "FlickrPublishing.c" } } @@ -1242,21 +1245,21 @@ PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_co self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1246 "FlickrPublishing.c" +#line 1249 "FlickrPublishing.c" } PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) { #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS); -#line 1253 "FlickrPublishing.c" +#line 1256 "FlickrPublishing.c" } static void publishing_flickr_value_publishing_parameters_init (GValue* value) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1260 "FlickrPublishing.c" +#line 1263 "FlickrPublishing.c" } @@ -1265,7 +1268,7 @@ static void publishing_flickr_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer); -#line 1269 "FlickrPublishing.c" +#line 1272 "FlickrPublishing.c" } } @@ -1275,11 +1278,11 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 82 "/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 1279 "FlickrPublishing.c" +#line 1282 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1283 "FlickrPublishing.c" +#line 1286 "FlickrPublishing.c" } } @@ -1287,66 +1290,66 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1291 "FlickrPublishing.c" +#line 1294 "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" if (collect_values[0].v_pointer) { -#line 1298 "FlickrPublishing.c" - PublishingFlickrPublishingParameters* object; +#line 1301 "FlickrPublishing.c" + PublishingFlickrPublishingParameters * object; object = collect_values[0].v_pointer; #line 82 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1305 "FlickrPublishing.c" +#line 1308 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1309 "FlickrPublishing.c" +#line 1312 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object); -#line 1313 "FlickrPublishing.c" +#line 1316 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1317 "FlickrPublishing.c" +#line 1320 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1321 "FlickrPublishing.c" +#line 1324 "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; + PublishingFlickrPublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 82 "/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 1332 "FlickrPublishing.c" +#line 1335 "FlickrPublishing.c" } #line 82 "/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" *object_p = NULL; -#line 1338 "FlickrPublishing.c" +#line 1341 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1342 "FlickrPublishing.c" +#line 1345 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1346 "FlickrPublishing.c" +#line 1349 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1350 "FlickrPublishing.c" +#line 1353 "FlickrPublishing.c" } @@ -1360,7 +1363,7 @@ GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1364 "FlickrPublishing.c" +#line 1367 "FlickrPublishing.c" } @@ -1369,12 +1372,12 @@ gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) 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" return value->data[0].v_pointer; -#line 1373 "FlickrPublishing.c" +#line 1376 "FlickrPublishing.c" } void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFlickrPublishingParameters* old; + PublishingFlickrPublishingParameters * old; #line 82 "/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" @@ -1389,23 +1392,23 @@ void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1393 "FlickrPublishing.c" +#line 1396 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1397 "FlickrPublishing.c" +#line 1400 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1403 "FlickrPublishing.c" +#line 1406 "FlickrPublishing.c" } } void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingFlickrPublishingParameters* old; + PublishingFlickrPublishingParameters * old; #line 82 "/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" @@ -1418,17 +1421,17 @@ void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1422 "FlickrPublishing.c" +#line 1425 "FlickrPublishing.c" } else { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1426 "FlickrPublishing.c" +#line 1429 "FlickrPublishing.c" } #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1432 "FlickrPublishing.c" +#line 1435 "FlickrPublishing.c" } } @@ -1438,18 +1441,18 @@ static void publishing_flickr_publishing_parameters_class_init (PublishingFlickr publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize; -#line 1442 "FlickrPublishing.c" +#line 1445 "FlickrPublishing.c" } static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) { #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1449 "FlickrPublishing.c" +#line 1452 "FlickrPublishing.c" } -static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj) { +static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) { PublishingFlickrPublishingParameters * self; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters); @@ -1459,7 +1462,7 @@ static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPu _g_free0 (self->username); #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->visibility_specification); -#line 1463 "FlickrPublishing.c" +#line 1466 "FlickrPublishing.c" } @@ -1478,18 +1481,18 @@ GType publishing_flickr_publishing_parameters_get_type (void) { gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) { - PublishingFlickrPublishingParameters* self; + PublishingFlickrPublishingParameters * self; self = instance; #line 82 "/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" return instance; -#line 1488 "FlickrPublishing.c" +#line 1491 "FlickrPublishing.c" } void publishing_flickr_publishing_parameters_unref (gpointer instance) { - PublishingFlickrPublishingParameters* self; + PublishingFlickrPublishingParameters * self; self = instance; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1497,7 +1500,7 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1501 "FlickrPublishing.c" +#line 1504 "FlickrPublishing.c" } } @@ -1505,23 +1508,23 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { 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" publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self); -#line 1509 "FlickrPublishing.c" +#line 1512 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingFlickrFlickrPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - SpitPublishingPluginHost* _tmp3_ = NULL; - PublishingFlickrSession* _tmp4_ = NULL; - PublishingFlickrPublishingParameters* _tmp5_ = NULL; - PublishingAuthenticatorFactory* _tmp6_ = NULL; - PublishingAuthenticatorFactory* _tmp7_ = NULL; - SpitPublishingPluginHost* _tmp8_ = NULL; - SpitPublishingAuthenticator* _tmp9_ = NULL; - SpitPublishingAuthenticator* _tmp10_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + SpitPublishingPluginHost* _tmp3_; + PublishingFlickrSession* _tmp4_; + PublishingFlickrPublishingParameters* _tmp5_; + PublishingAuthenticatorFactory* _tmp6_; + PublishingAuthenticatorFactory* _tmp7_; + SpitPublishingPluginHost* _tmp8_; + SpitPublishingAuthenticator* _tmp9_; + SpitPublishingAuthenticator* _tmp10_; #line 105 "/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" @@ -1578,21 +1581,21 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G 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" return self; -#line 1582 "FlickrPublishing.c" +#line 1585 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host); -#line 1589 "FlickrPublishing.c" +#line 1592 "FlickrPublishing.c" } SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) { SpitPublishingAuthenticator* result = NULL; - SpitPublishingAuthenticator* _tmp0_ = NULL; - SpitPublishingAuthenticator* _tmp1_ = NULL; + SpitPublishingAuthenticator* _tmp0_; + SpitPublishingAuthenticator* _tmp1_; #line 121 "/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" @@ -1603,14 +1606,14 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato result = _tmp1_; #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1607 "FlickrPublishing.c" +#line 1610 "FlickrPublishing.c" } static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self) { gboolean result = FALSE; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 125 "/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" @@ -1621,13 +1624,13 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata result = _tmp1_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1625 "FlickrPublishing.c" +#line 1628 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 129 "/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" @@ -1636,57 +1639,57 @@ static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (Pu _tmp1_ = strip_metadata; #line 130 "/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 1640 "FlickrPublishing.c" +#line 1643 "FlickrPublishing.c" } static gpointer _g_variant_ref0 (gpointer self) { #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_variant_ref (self) : NULL; -#line 1647 "FlickrPublishing.c" +#line 1650 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GHashTable* params = NULL; - SpitPublishingAuthenticator* _tmp1_ = NULL; - GHashTable* _tmp2_ = NULL; + SpitPublishingAuthenticator* _tmp1_; + GHashTable* _tmp2_; GVariant* consumer_key = NULL; GVariant* consumer_secret = NULL; GVariant* auth_token = NULL; GVariant* auth_token_secret = NULL; GVariant* username = NULL; - GHashTable* _tmp3_ = NULL; + GHashTable* _tmp3_; gconstpointer _tmp4_ = NULL; - GVariant* _tmp5_ = NULL; - GHashTable* _tmp6_ = NULL; + GVariant* _tmp5_; + GHashTable* _tmp6_; gconstpointer _tmp7_ = NULL; - GVariant* _tmp8_ = NULL; - PublishingFlickrSession* _tmp9_ = NULL; - GVariant* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GVariant* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GHashTable* _tmp14_ = NULL; + GVariant* _tmp8_; + PublishingFlickrSession* _tmp9_; + GVariant* _tmp10_; + const gchar* _tmp11_; + GVariant* _tmp12_; + const gchar* _tmp13_; + GHashTable* _tmp14_; gconstpointer _tmp15_ = NULL; - GVariant* _tmp16_ = NULL; - GHashTable* _tmp17_ = NULL; + GVariant* _tmp16_; + GHashTable* _tmp17_; gconstpointer _tmp18_ = NULL; - GVariant* _tmp19_ = NULL; - GHashTable* _tmp20_ = NULL; + GVariant* _tmp19_; + GHashTable* _tmp20_; gconstpointer _tmp21_ = NULL; - GVariant* _tmp22_ = NULL; - PublishingFlickrSession* _tmp23_ = NULL; - GVariant* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - GVariant* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GVariant* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - PublishingFlickrPublishingParameters* _tmp30_ = NULL; - PublishingFlickrSession* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + GVariant* _tmp22_; + PublishingFlickrSession* _tmp23_; + GVariant* _tmp24_; + const gchar* _tmp25_; + GVariant* _tmp26_; + const gchar* _tmp27_; + GVariant* _tmp28_; + const gchar* _tmp29_; + PublishingFlickrPublishingParameters* _tmp30_; + PublishingFlickrSession* _tmp31_; + gchar* _tmp32_; #line 133 "/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" @@ -1695,7 +1698,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish if (!_tmp0_) { #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1699 "FlickrPublishing.c" +#line 1702 "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" \ @@ -1818,33 +1821,33 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish _g_variant_unref0 (consumer_key); #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_hash_table_unref0 (params); -#line 1821 "FlickrPublishing.c" +#line 1824 "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" publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 1828 "FlickrPublishing.c" +#line 1831 "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" publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 1835 "FlickrPublishing.c" +#line 1838 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingRESTSupportTransaction* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingRESTSupportTransaction* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 161 "/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" @@ -1867,7 +1870,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P if (!_tmp4_) { #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1870 "FlickrPublishing.c" +#line 1873 "FlickrPublishing.c" } #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \ @@ -1882,18 +1885,18 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_); #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 1884 "FlickrPublishing.c" +#line 1887 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - SpitPublishingPluginHost* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; #line 172 "/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" @@ -1916,7 +1919,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi if (!_tmp4_) { #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1918 "FlickrPublishing.c" +#line 1921 "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" \ @@ -1927,12 +1930,12 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi _tmp6_ = err; #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 1928 "FlickrPublishing.c" +#line 1931 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 184 "/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" @@ -1941,38 +1944,38 @@ static void publishing_flickr_flickr_publisher_on_account_info_available (Publis if (!_tmp0_) { #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1942 "FlickrPublishing.c" +#line 1945 "FlickrPublishing.c" } #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \ "able"); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self); -#line 1948 "FlickrPublishing.c" +#line 1951 "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" publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata); -#line 1955 "FlickrPublishing.c" +#line 1958 "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" publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self); -#line 1962 "FlickrPublishing.c" +#line 1965 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + PublishingFlickrPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFlickrPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 192 "/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" @@ -1993,7 +1996,7 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis if (!_tmp4_) { #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1993 "FlickrPublishing.c" +#line 1996 "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" \ @@ -2002,16 +2005,16 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis _tmp5_ = strip_metadata; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_publish (self, _tmp5_); -#line 2001 "FlickrPublishing.c" +#line 2004 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout (PublishingFlickrFlickrPublisher* self) { - PublishingFlickrPublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; + PublishingFlickrPublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingFlickrPublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; #line 203 "/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" @@ -2032,26 +2035,26 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout if (!_tmp4_) { #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2031 "FlickrPublishing.c" +#line 2034 "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 " \ "the publishing options pane"); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 2037 "FlickrPublishing.c" +#line 2040 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_status_updated (PublishingFlickrFlickrPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_ = FALSE; - gdouble _tmp1_ = 0.0; - SpitPublishingProgressCallback _tmp2_ = NULL; - void* _tmp2__target = NULL; - SpitPublishingProgressCallback _tmp3_ = NULL; - void* _tmp3__target = NULL; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gboolean _tmp0_; + gdouble _tmp1_; + SpitPublishingProgressCallback _tmp2_; + void* _tmp2__target; + SpitPublishingProgressCallback _tmp3_; + void* _tmp3__target; + gint _tmp4_; + gdouble _tmp5_; #line 215 "/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" @@ -2060,7 +2063,7 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2058 "FlickrPublishing.c" +#line 2061 "FlickrPublishing.c" } #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = completed_fraction; @@ -2083,31 +2086,31 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 2080 "FlickrPublishing.c" +#line 2083 "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" publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published); -#line 2087 "FlickrPublishing.c" +#line 2090 "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" publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2094 "FlickrPublishing.c" +#line 2097 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - PublishingRESTSupportBatchUploader* _tmp4_ = NULL; - guint _tmp5_ = 0U; + gboolean _tmp0_; + gint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + PublishingRESTSupportBatchUploader* _tmp4_; + guint _tmp5_; #line 226 "/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" @@ -2118,7 +2121,7 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli if (!_tmp0_) { #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2115 "FlickrPublishing.c" +#line 2118 "FlickrPublishing.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = num_published; @@ -2139,20 +2142,20 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli 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" publishing_flickr_flickr_publisher_do_show_success_pane (self); -#line 2135 "FlickrPublishing.c" +#line 2138 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) { - gboolean _tmp0_ = FALSE; - GError* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportBatchUploader* _tmp3_ = NULL; - guint _tmp4_ = 0U; - PublishingRESTSupportBatchUploader* _tmp5_ = NULL; - guint _tmp6_ = 0U; - SpitPublishingPluginHost* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + gboolean _tmp0_; + GError* _tmp1_; + const gchar* _tmp2_; + PublishingRESTSupportBatchUploader* _tmp3_; + guint _tmp4_; + PublishingRESTSupportBatchUploader* _tmp5_; + guint _tmp6_; + SpitPublishingPluginHost* _tmp7_; + GError* _tmp8_; #line 239 "/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" @@ -2163,7 +2166,7 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr if (!_tmp0_) { #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2159 "FlickrPublishing.c" +#line 2162 "FlickrPublishing.c" } #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = err; @@ -2190,16 +2193,16 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr _tmp8_ = err; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 2185 "FlickrPublishing.c" +#line 2188 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; PublishingFlickrAccountInfoFetchTransaction* txn = NULL; - PublishingFlickrSession* _tmp2_ = NULL; - PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL; + PublishingFlickrSession* _tmp2_; + PublishingFlickrAccountInfoFetchTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2224,7 +2227,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing 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" 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 2218 "FlickrPublishing.c" +#line 2221 "FlickrPublishing.c" { #line 263 "/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_); @@ -2232,7 +2235,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2226 "FlickrPublishing.c" +#line 2229 "FlickrPublishing.c" goto __catch13_spit_publishing_publishing_error; } #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2243,15 +2246,15 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2237 "FlickrPublishing.c" +#line 2240 "FlickrPublishing.c" } } goto __finally13; __catch13_spit_publishing_publishing_error: { GError* err = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - GError* _tmp5_ = NULL; + SpitPublishingPluginHost* _tmp4_; + GError* _tmp5_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2264,7 +2267,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 2258 "FlickrPublishing.c" +#line 2261 "FlickrPublishing.c" } __finally13: #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2277,34 +2280,34 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2271 "FlickrPublishing.c" +#line 2274 "FlickrPublishing.c" } #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2275 "FlickrPublishing.c" +#line 2278 "FlickrPublishing.c" } static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; - const gchar* _tmp0_ = NULL; - gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gint64 _tmp1_; +#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2293 "FlickrPublishing.c" +#line 2296 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; GError * _inner_error_ = NULL; #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2315,39 +2318,39 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \ "l = '%s'", _tmp0_); -#line 2308 "FlickrPublishing.c" +#line 2311 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* response_doc = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; + const gchar* _tmp1_; + PublishingRESTSupportXmlDocument* _tmp2_; xmlNode* root_node = NULL; - PublishingRESTSupportXmlDocument* _tmp3_ = NULL; - xmlNode* _tmp4_ = NULL; + PublishingRESTSupportXmlDocument* _tmp3_; + xmlNode* _tmp4_; xmlNode* user_node = NULL; - PublishingRESTSupportXmlDocument* _tmp5_ = NULL; - xmlNode* _tmp6_ = NULL; - xmlNode* _tmp7_ = NULL; + PublishingRESTSupportXmlDocument* _tmp5_; + xmlNode* _tmp6_; + xmlNode* _tmp7_; gchar* is_pro_str = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; - xmlNode* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp8_; + xmlNode* _tmp9_; + gchar* _tmp10_; xmlNode* bandwidth_node = NULL; - PublishingRESTSupportXmlDocument* _tmp11_ = NULL; - xmlNode* _tmp12_ = NULL; - xmlNode* _tmp13_ = NULL; + PublishingRESTSupportXmlDocument* _tmp11_; + xmlNode* _tmp12_; + xmlNode* _tmp13_; gchar* remaining_kb_str = NULL; - PublishingRESTSupportXmlDocument* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; + PublishingRESTSupportXmlDocument* _tmp14_; + xmlNode* _tmp15_; + gchar* _tmp16_; PublishingFlickrUserKind user_kind = 0; - const gchar* _tmp17_ = NULL; + const gchar* _tmp17_; gint64 quota_bytes_left = 0LL; - const gchar* _tmp20_ = NULL; - gint64 _tmp21_ = 0LL; - PublishingFlickrPublishingParameters* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - PublishingFlickrUserKind _tmp25_ = 0; + const gchar* _tmp20_; + gint64 _tmp21_; + PublishingFlickrPublishingParameters* _tmp22_; + gint64 _tmp23_; + PublishingFlickrPublishingParameters* _tmp24_; + PublishingFlickrUserKind _tmp25_; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2358,7 +2361,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (G_UNLIKELY (_inner_error_ != NULL)) { #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2351 "FlickrPublishing.c" +#line 2354 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2367,7 +2370,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2360 "FlickrPublishing.c" +#line 2363 "FlickrPublishing.c" } #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = response_doc; @@ -2389,7 +2392,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2382 "FlickrPublishing.c" +#line 2385 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2400,7 +2403,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2393 "FlickrPublishing.c" +#line 2396 "FlickrPublishing.c" } #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = response_doc; @@ -2416,7 +2419,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2409 "FlickrPublishing.c" +#line 2412 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2427,7 +2430,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2420 "FlickrPublishing.c" +#line 2423 "FlickrPublishing.c" } #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = response_doc; @@ -2445,7 +2448,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2438 "FlickrPublishing.c" +#line 2441 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2458,7 +2461,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2451 "FlickrPublishing.c" +#line 2454 "FlickrPublishing.c" } #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = response_doc; @@ -2476,7 +2479,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2469 "FlickrPublishing.c" +#line 2472 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2489,7 +2492,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2482 "FlickrPublishing.c" +#line 2485 "FlickrPublishing.c" } #line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = is_pro_str; @@ -2497,18 +2500,18 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (g_strcmp0 (_tmp17_, "0") == 0) { #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_FREE; -#line 2490 "FlickrPublishing.c" +#line 2493 "FlickrPublishing.c" } else { - const gchar* _tmp18_ = NULL; + const gchar* _tmp18_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp18_ = is_pro_str; #line 286 "/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" user_kind = PUBLISHING_FLICKR_USER_KIND_PRO; -#line 2499 "FlickrPublishing.c" +#line 2502 "FlickrPublishing.c" } else { - GError* _tmp19_ = NULL; + GError* _tmp19_; #line 289 "/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" @@ -2521,7 +2524,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2514 "FlickrPublishing.c" +#line 2517 "FlickrPublishing.c" goto __catch14_spit_publishing_publishing_error; } #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2536,7 +2539,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2529 "FlickrPublishing.c" +#line 2532 "FlickrPublishing.c" } } #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2563,15 +2566,15 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_free0 (is_pro_str); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 2556 "FlickrPublishing.c" +#line 2559 "FlickrPublishing.c" } goto __finally14; __catch14_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp26_ = NULL; - SpitPublishingPluginHost* _tmp27_ = NULL; - GError* _tmp28_ = NULL; + GError* _tmp26_; + SpitPublishingPluginHost* _tmp27_; + GError* _tmp28_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2586,7 +2589,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2579 "FlickrPublishing.c" +#line 2582 "FlickrPublishing.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = self->priv->host; @@ -2598,7 +2601,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2591 "FlickrPublishing.c" +#line 2594 "FlickrPublishing.c" } __finally14: #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2609,17 +2612,17 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2602 "FlickrPublishing.c" +#line 2605 "FlickrPublishing.c" } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_info_available (self); -#line 2606 "FlickrPublishing.c" +#line 2609 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) { - SpitPublishingAuthenticator* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingAuthenticator* _tmp0_; + gboolean _tmp1_; #line 313 "/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" @@ -2631,36 +2634,36 @@ static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickr _tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 2623 "FlickrPublishing.c" - SpitPublishingAuthenticator* _tmp2_ = NULL; +#line 2626 "FlickrPublishing.c" + SpitPublishingAuthenticator* _tmp2_; #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = self->priv->authenticator; #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_authenticator_logout (_tmp2_); -#line 2629 "FlickrPublishing.c" +#line 2632 "FlickrPublishing.c" } #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 2635 "FlickrPublishing.c" +#line 2638 "FlickrPublishing.c" } static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; GtkBuilder* builder = NULL; - GtkBuilder* _tmp1_ = NULL; - PublishingFlickrPublishingParameters* _tmp9_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - SpitPublishingPublisherMediaType _tmp11_ = 0; - GtkBuilder* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - PublishingFlickrPublishingOptionsPane* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp16_ = NULL; - SpitPublishingPluginHost* _tmp17_ = NULL; - PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL; + GtkBuilder* _tmp1_; + PublishingFlickrPublishingParameters* _tmp8_; + SpitPublishingPluginHost* _tmp9_; + SpitPublishingPublisherMediaType _tmp10_; + GtkBuilder* _tmp11_; + gboolean _tmp12_; + PublishingFlickrPublishingOptionsPane* _tmp13_; + PublishingFlickrPublishingOptionsPane* _tmp14_; + PublishingFlickrPublishingOptionsPane* _tmp15_; + SpitPublishingPluginHost* _tmp16_; + PublishingFlickrPublishingOptionsPane* _tmp17_; GError * _inner_error_ = NULL; #line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self)); @@ -2674,16 +2677,16 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( _tmp1_ = gtk_builder_new (); #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp1_; -#line 2666 "FlickrPublishing.c" +#line 2669 "FlickrPublishing.c" { - GtkBuilder* _tmp2_ = NULL; + GtkBuilder* _tmp2_; #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = builder; #line 335 "/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" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2675 "FlickrPublishing.c" +#line 2678 "FlickrPublishing.c" goto __catch15_g_error; } } @@ -2691,12 +2694,11 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( __catch15_g_error: { GError* e = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - SpitPublishingPluginHost* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - GError* _tmp8_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; + SpitPublishingPluginHost* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2710,16 +2712,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( #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" - _tmp6_ = _ ("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" - _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); + _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" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_); + spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_); #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_error_free0 (_tmp8_); + _g_error_free0 (_tmp7_); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2742,35 +2742,35 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( #line 2730 "FlickrPublishing.c" } #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = self->priv->parameters; + _tmp8_ = self->priv->parameters; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = self->priv->host; + _tmp9_ = self->priv->host; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_); + _tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = builder; + _tmp11_ = builder; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); + _tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_); + _tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_); #line 345 "/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" - self->priv->publishing_options_pane = _tmp14_; + self->priv->publishing_options_pane = _tmp13_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = self->priv->publishing_options_pane; + _tmp14_ = self->priv->publishing_options_pane; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp15_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0); + 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" - _tmp16_ = self->priv->publishing_options_pane; + _tmp15_ = self->priv->publishing_options_pane; #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0); + 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" - _tmp17_ = self->priv->host; + _tmp16_ = self->priv->host; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = self->priv->publishing_options_pane; + _tmp17_ = self->priv->publishing_options_pane; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + 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" _g_object_unref0 (builder); #line 2764 "FlickrPublishing.c" @@ -2779,14 +2779,14 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) { gint result = 0; - SpitPublishingPublishable* _tmp0_ = NULL; - GDateTime* _tmp1_ = NULL; - GDateTime* _tmp2_ = NULL; - SpitPublishingPublishable* _tmp3_ = NULL; - GDateTime* _tmp4_ = NULL; - GDateTime* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + SpitPublishingPublishable* _tmp0_; + GDateTime* _tmp1_; + GDateTime* _tmp2_; + SpitPublishingPublishable* _tmp3_; + GDateTime* _tmp4_; + GDateTime* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 352 "/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" @@ -2836,41 +2836,41 @@ static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_pu static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) { - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - gint _tmp4_ = 0; - gboolean _tmp5_ = FALSE; - void* _tmp6_ = NULL; - GDestroyNotify _tmp7_ = NULL; - SpitPublishingProgressCallback _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + SpitPublishingPluginHost* _tmp2_; + PublishingFlickrPublishingParameters* _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + void* _tmp6_; + GDestroyNotify _tmp7_; + SpitPublishingProgressCallback _tmp8_; + gboolean _tmp9_; SpitPublishingPublishable** publishables = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - gint _tmp11_ = 0; - SpitPublishingPublishable** _tmp12_ = NULL; - gint publishables_length1 = 0; - gint _publishables_size_ = 0; + SpitPublishingPluginHost* _tmp10_; + gint _tmp11_; + SpitPublishingPublishable** _tmp12_; + gint publishables_length1; + gint _publishables_size_; GeeArrayList* sorted_list = NULL; - GeeArrayList* _tmp13_ = NULL; - SpitPublishingPublishable** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - GeeArrayList* _tmp18_ = NULL; + GeeArrayList* _tmp13_; + SpitPublishingPublishable** _tmp14_; + gint _tmp14__length1; + GeeArrayList* _tmp18_; PublishingFlickrUploader* uploader = NULL; - PublishingFlickrSession* _tmp19_ = NULL; - GeeArrayList* _tmp20_ = NULL; - gint _tmp21_ = 0; - gpointer* _tmp22_ = NULL; - SpitPublishingPublishable** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - PublishingFlickrUploader* _tmp26_ = NULL; - PublishingFlickrUploader* _tmp27_ = NULL; - PublishingFlickrUploader* _tmp28_ = NULL; - PublishingFlickrUploader* _tmp29_ = NULL; - PublishingFlickrUploader* _tmp30_ = NULL; + PublishingFlickrSession* _tmp19_; + GeeArrayList* _tmp20_; + gint _tmp21_; + gpointer* _tmp22_; + SpitPublishingPublishable** _tmp23_; + gint _tmp23__length1; + PublishingFlickrPublishingParameters* _tmp24_; + gboolean _tmp25_; + PublishingFlickrUploader* _tmp26_; + PublishingFlickrUploader* _tmp27_; + PublishingFlickrUploader* _tmp28_; + PublishingFlickrUploader* _tmp29_; + PublishingFlickrUploader* _tmp30_; #line 357 "/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" @@ -2947,7 +2947,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick #line 375 "/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" - SpitPublishingPublishable* _tmp15_ = NULL; + SpitPublishingPublishable* _tmp15_; SpitPublishingPublishable* p = NULL; #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); @@ -2955,8 +2955,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick p = _tmp15_; #line 2943 "FlickrPublishing.c" { - GeeArrayList* _tmp16_ = NULL; - SpitPublishingPublishable* _tmp17_ = NULL; + GeeArrayList* _tmp16_; + SpitPublishingPublishable* _tmp17_; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = sorted_list; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3018,8 +3018,8 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 386 "/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" @@ -3038,8 +3038,8 @@ static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingF gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 393 "/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" @@ -3055,8 +3055,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 397 "/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" @@ -3071,8 +3071,8 @@ void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFli gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingFlickrFlickrPublisher* self) { gint result = 0; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 401 "/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" @@ -3088,8 +3088,8 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 405 "/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" @@ -3105,8 +3105,8 @@ void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingF static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 409 "/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" @@ -3124,7 +3124,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 413 "/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" @@ -3138,7 +3138,7 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) { - SpitPublishingAuthenticator* _tmp0_ = NULL; + SpitPublishingAuthenticator* _tmp0_; #line 419 "/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" @@ -3155,8 +3155,8 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; #line 426 "/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" @@ -3186,7 +3186,7 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) { PublishingFlickrFlickrPublisher * self; - PublishingFlickrSession* _tmp0_ = NULL; + PublishingFlickrSession* _tmp0_; #line 438 "/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" @@ -3196,7 +3196,7 @@ static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublishe #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ != NULL) { #line 3184 "FlickrPublishing.c" - PublishingFlickrSession* _tmp1_ = NULL; + PublishingFlickrSession* _tmp1_; #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3224,13 +3224,13 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa #line 93 "/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" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop; + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop; #line 3220 "FlickrPublishing.c" } @@ -3240,6 +3240,10 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self); #line 96 "/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" + self->priv->progress_reporter_target = self; +#line 96 "/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" self->priv->running = FALSE; #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3252,14 +3256,14 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv->authenticator = NULL; #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 3241 "FlickrPublishing.c" +#line 3245 "FlickrPublishing.c" } -static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { +static void publishing_flickr_flickr_publisher_finalize (GObject * obj) { PublishingFlickrFlickrPublisher * self; - SpitPublishingAuthenticator* _tmp0_ = NULL; - guint _tmp1_ = 0U; + SpitPublishingAuthenticator* _tmp0_; + guint _tmp1_; #line 93 "/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" @@ -3290,7 +3294,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj); -#line 3279 "FlickrPublishing.c" +#line 3283 "FlickrPublishing.c" } @@ -3310,17 +3314,17 @@ 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_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - PublishingFlickrSession* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - PublishingFlickrSession* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - PublishingFlickrSession* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = 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" @@ -3367,31 +3371,31 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje _g_free0 (_tmp10_); #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3356 "FlickrPublishing.c" +#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 3363 "FlickrPublishing.c" +#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_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportHttpMethod _tmp2_ = 0; - PublishingFlickrSession* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - PublishingFlickrSession* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - PublishingFlickrSession* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = 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" @@ -3442,21 +3446,21 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G _g_free0 (_tmp11_); #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3431 "FlickrPublishing.c" +#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 3438 "FlickrPublishing.c" +#line 3442 "FlickrPublishing.c" } static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingFlickrTransaction * self; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingFlickrSession* _tmp1_ = NULL; + 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); @@ -3478,7 +3482,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_propagate_error (error, _inner_error_); #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3467 "FlickrPublishing.c" +#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); @@ -3486,7 +3490,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_clear_error (&_inner_error_); #line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3475 "FlickrPublishing.c" +#line 3479 "FlickrPublishing.c" } } } @@ -3495,22 +3499,22 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) { gchar* result = NULL; xmlNode* root = NULL; - PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - xmlNode* _tmp1_ = NULL; + PublishingRESTSupportXmlDocument* _tmp0_; + xmlNode* _tmp1_; gchar* status = NULL; - xmlNode* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp6_ = NULL; + xmlNode* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp6_; xmlNode* errcode = NULL; - xmlNode* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - xmlNode* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; + xmlNode* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + xmlNode* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; GError * _inner_error_ = NULL; #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); @@ -3530,8 +3534,8 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _tmp4_ = status; #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_ == NULL) { -#line 3519 "FlickrPublishing.c" - gchar* _tmp5_ = NULL; +#line 3523 "FlickrPublishing.c" + gchar* _tmp5_; #line 485 "/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" @@ -3540,7 +3544,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3529 "FlickrPublishing.c" +#line 3533 "FlickrPublishing.c" } #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = status; @@ -3552,13 +3556,13 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3541 "FlickrPublishing.c" +#line 3545 "FlickrPublishing.c" } { xmlNode* _tmp7_ = NULL; - PublishingRESTSupportXmlDocument* _tmp8_ = NULL; - xmlNode* _tmp9_ = NULL; - xmlNode* _tmp10_ = NULL; + PublishingRESTSupportXmlDocument* _tmp8_; + xmlNode* _tmp9_; + xmlNode* _tmp10_; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = doc; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3571,7 +3575,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3560 "FlickrPublishing.c" +#line 3564 "FlickrPublishing.c" goto __catch16_spit_publishing_publishing_error; } #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3582,17 +3586,17 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3571 "FlickrPublishing.c" +#line 3575 "FlickrPublishing.c" } #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" errcode = _tmp7_; -#line 3575 "FlickrPublishing.c" +#line 3579 "FlickrPublishing.c" } goto __finally16; __catch16_spit_publishing_publishing_error: { GError* err = NULL; - gchar* _tmp11_ = NULL; + gchar* _tmp11_; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3607,7 +3611,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3596 "FlickrPublishing.c" +#line 3600 "FlickrPublishing.c" } __finally16: #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3620,7 +3624,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3609 "FlickrPublishing.c" +#line 3613 "FlickrPublishing.c" } #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = errcode; @@ -3648,7 +3652,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3637 "FlickrPublishing.c" +#line 3641 "FlickrPublishing.c" } @@ -3657,34 +3661,34 @@ static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_suppor result = publishing_flickr_transaction_validate_xml (doc); #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3646 "FlickrPublishing.c" +#line 3650 "FlickrPublishing.c" } static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3666 "FlickrPublishing.c" +#line 3670 "FlickrPublishing.c" } static gpointer _g_error_copy0 (gpointer self) { #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_error_copy (self) : NULL; -#line 3673 "FlickrPublishing.c" +#line 3677 "FlickrPublishing.c" } @@ -3696,12 +3700,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_return_val_if_fail (xml != NULL, NULL); #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = NULL; -#line 3685 "FlickrPublishing.c" +#line 3689 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - PublishingRESTSupportXmlDocument* _tmp2_ = NULL; - PublishingRESTSupportXmlDocument* _tmp3_ = NULL; + const gchar* _tmp1_; + PublishingRESTSupportXmlDocument* _tmp2_; + PublishingRESTSupportXmlDocument* _tmp3_; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = xml; #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3712,7 +3716,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res if (G_UNLIKELY (_inner_error_ != NULL)) { #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3701 "FlickrPublishing.c" +#line 3705 "FlickrPublishing.c" goto __catch17_spit_publishing_publishing_error; } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3723,7 +3727,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3712 "FlickrPublishing.c" +#line 3716 "FlickrPublishing.c" } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp0_; @@ -3735,18 +3739,18 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _result_ = _tmp3_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 3724 "FlickrPublishing.c" +#line 3728 "FlickrPublishing.c" } goto __finally17; __catch17_spit_publishing_publishing_error: { GError* e = NULL; - GError* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + GError* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _inner_error_; #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3767,10 +3771,10 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _g_free0 (_tmp7_); #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9_) { -#line 3756 "FlickrPublishing.c" - GError* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; +#line 3760 "FlickrPublishing.c" + GError* _tmp10_; + const gchar* _tmp11_; + GError* _tmp12_; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = e; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3781,11 +3785,11 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp12_; #line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3770 "FlickrPublishing.c" +#line 3774 "FlickrPublishing.c" goto __finally17; } else { - GError* _tmp13_ = NULL; - GError* _tmp14_ = NULL; + GError* _tmp13_; + GError* _tmp14_; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp13_ = e; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3794,12 +3798,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp14_; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3783 "FlickrPublishing.c" +#line 3787 "FlickrPublishing.c" goto __finally17; } #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 3788 "FlickrPublishing.c" +#line 3792 "FlickrPublishing.c" } __finally17: #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3812,7 +3816,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _publishing_rest_support_xml_document_unref0 (_result_); #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3801 "FlickrPublishing.c" +#line 3805 "FlickrPublishing.c" } else { #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); @@ -3822,14 +3826,14 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 3811 "FlickrPublishing.c" +#line 3815 "FlickrPublishing.c" } } #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 3818 "FlickrPublishing.c" +#line 3822 "FlickrPublishing.c" } @@ -3837,8 +3841,8 @@ static void publishing_flickr_transaction_class_init (PublishingFlickrTransactio #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 3827 "FlickrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute; +#line 3831 "FlickrPublishing.c" } @@ -3860,10 +3864,10 @@ GType publishing_flickr_transaction_get_type (void) { PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) { PublishingFlickrAccountInfoFetchTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - PublishingFlickrSession* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = 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" @@ -3884,21 +3888,21 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc _g_free0 (_tmp3_); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 3873 "FlickrPublishing.c" +#line 3877 "FlickrPublishing.c" } PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) { #line 529 "/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 3880 "FlickrPublishing.c" +#line 3884 "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" publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3887 "FlickrPublishing.c" +#line 3891 "FlickrPublishing.c" } @@ -3921,79 +3925,79 @@ 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" return self ? publishing_flickr_publishing_parameters_ref (self) : NULL; -#line 3910 "FlickrPublishing.c" +#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 3917 "FlickrPublishing.c" +#line 3921 "FlickrPublishing.c" } static void _g_free0_ (gpointer var) { #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" var = (g_free (var), NULL); -#line 3924 "FlickrPublishing.c" +#line 3928 "FlickrPublishing.c" } PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingFlickrUploadTransaction* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - PublishingFlickrPublishingParameters* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - PublishingFlickrSession* _tmp4_ = NULL; - PublishingFlickrSession* _tmp5_ = NULL; - PublishingRESTSupportArgument** _tmp6_ = NULL; - PublishingFlickrSession* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingFlickrSession* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - PublishingFlickrSession* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PublishingFlickrSession* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - PublishingFlickrPublishingParameters* _tmp19_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp20_ = NULL; - gint _tmp21_ = 0; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - PublishingFlickrPublishingParameters* _tmp24_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp25_ = NULL; - gint _tmp26_ = 0; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - PublishingFlickrPublishingParameters* _tmp29_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp30_ = NULL; - gint _tmp31_ = 0; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; + PublishingFlickrSession* _tmp0_; + SpitPublishingPublishable* _tmp1_; + PublishingFlickrPublishingParameters* _tmp2_; + PublishingFlickrPublishingParameters* _tmp3_; + PublishingFlickrSession* _tmp4_; + PublishingFlickrSession* _tmp5_; + PublishingRESTSupportArgument** _tmp6_; + PublishingFlickrSession* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingFlickrSession* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + PublishingFlickrSession* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + PublishingFlickrSession* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + PublishingFlickrPublishingParameters* _tmp19_; + PublishingFlickrVisibilitySpecification* _tmp20_; + gint _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + PublishingFlickrPublishingParameters* _tmp24_; + PublishingFlickrVisibilitySpecification* _tmp25_; + gint _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PublishingFlickrPublishingParameters* _tmp29_; + PublishingFlickrVisibilitySpecification* _tmp30_; + gint _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; GHashTable* disposition_table = NULL; - GHashFunc _tmp34_ = NULL; - GEqualFunc _tmp35_ = NULL; - GHashTable* _tmp36_ = NULL; + GHashFunc _tmp34_; + GEqualFunc _tmp35_; + GHashTable* _tmp36_; gchar* filename = NULL; - SpitPublishingPublishable* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + SpitPublishingPublishable* _tmp37_; + gchar* _tmp38_; gboolean _tmp39_ = FALSE; - const gchar* _tmp40_ = NULL; - GHashTable* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - SpitPublishingPublishable* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - GHashTable* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - GHashTable* _tmp53_ = NULL; + 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" @@ -4140,20 +4144,20 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc if (_tmp40_ == NULL) { #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = TRUE; -#line 4129 "FlickrPublishing.c" +#line 4133 "FlickrPublishing.c" } else { - const gchar* _tmp41_ = NULL; + 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 4136 "FlickrPublishing.c" +#line 4140 "FlickrPublishing.c" } #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp39_) { -#line 4140 "FlickrPublishing.c" - SpitPublishingPublishable* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; +#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" @@ -4162,7 +4166,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_free0 (filename); #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" filename = _tmp43_; -#line 4151 "FlickrPublishing.c" +#line 4155 "FlickrPublishing.c" } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp44_ = disposition_table; @@ -4198,40 +4202,40 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_hash_table_unref0 (disposition_table); #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4187 "FlickrPublishing.c" +#line 4191 "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" return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 4194 "FlickrPublishing.c" +#line 4198 "FlickrPublishing.c" } -static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +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 4205 "FlickrPublishing.c" +#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 4211 "FlickrPublishing.c" +#line 4215 "FlickrPublishing.c" } void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) { - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingRESTSupportArgument* _tmp3_ = NULL; + 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" @@ -4250,14 +4254,14 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis _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 4239 "FlickrPublishing.c" +#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 4246 "FlickrPublishing.c" +#line 4250 "FlickrPublishing.c" } @@ -4268,28 +4272,28 @@ static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 4257 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp0_ = NULL; +#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 4263 "FlickrPublishing.c" +#line 4267 "FlickrPublishing.c" } #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4267 "FlickrPublishing.c" +#line 4271 "FlickrPublishing.c" } PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) { PublishingRESTSupportArgument** result = NULL; - PublishingRESTSupportArgument** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingRESTSupportArgument** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingRESTSupportArgument** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + 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" @@ -4308,74 +4312,74 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori if (result_length1) { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp2__length1; -#line 4297 "FlickrPublishing.c" +#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 4303 "FlickrPublishing.c" +#line 4307 "FlickrPublishing.c" } gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = 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 4317 "FlickrPublishing.c" +#line 4321 "FlickrPublishing.c" { gint i = 0; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 4322 "FlickrPublishing.c" +#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 4329 "FlickrPublishing.c" - gint _tmp3_ = 0; - PublishingRESTSupportArgument** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingRESTSupportArgument** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - PublishingRESTSupportArgument* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - PublishingRESTSupportArgument** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - gint _tmp15_ = 0; - PublishingRESTSupportArgument* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gint _tmp23_ = 0; - PublishingRESTSupportArgument** _tmp24_ = NULL; - gint _tmp24__length1 = 0; +#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 4358 "FlickrPublishing.c" - gint _tmp2_ = 0; +#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 4364 "FlickrPublishing.c" +#line 4368 "FlickrPublishing.c" } #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; @@ -4389,7 +4393,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub if (!(_tmp3_ < _tmp4__length1)) { #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 4378 "FlickrPublishing.c" +#line 4382 "FlickrPublishing.c" } #line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; @@ -4455,9 +4459,9 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _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 4444 "FlickrPublishing.c" - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; +#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" @@ -4466,7 +4470,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _g_free0 (_result_); #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp26_; -#line 4455 "FlickrPublishing.c" +#line 4459 "FlickrPublishing.c" } } } @@ -4475,15 +4479,15 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub result = _result_; #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4464 "FlickrPublishing.c" +#line 4468 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { PublishingFlickrUploadTransaction * self; - PublishingFlickrSession* _tmp0_ = NULL; + PublishingFlickrSession* _tmp0_; gchar* authorization_header = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp1_; GError * _inner_error_ = NULL; #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); @@ -4512,7 +4516,7 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup _g_free0 (authorization_header); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4500 "FlickrPublishing.c" +#line 4504 "FlickrPublishing.c" } else { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); @@ -4522,12 +4526,12 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4510 "FlickrPublishing.c" +#line 4514 "FlickrPublishing.c" } } #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 4515 "FlickrPublishing.c" +#line 4519 "FlickrPublishing.c" } @@ -4539,19 +4543,19 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl #line 536 "/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" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_flickr_upload_transaction_real_execute; -#line 4528 "FlickrPublishing.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute; +#line 4532 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) { #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 4535 "FlickrPublishing.c" +#line 4539 "FlickrPublishing.c" } -static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingFlickrUploadTransaction * self; #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction); @@ -4563,7 +4567,7 @@ static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupport 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" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj); -#line 4551 "FlickrPublishing.c" +#line 4555 "FlickrPublishing.c" } @@ -4585,14 +4589,14 @@ PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) 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 4573 "FlickrPublishing.c" +#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 4580 "FlickrPublishing.c" +#line 4584 "FlickrPublishing.c" } @@ -4601,52 +4605,52 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; + 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 4596 "FlickrPublishing.c" - const gchar* _tmp3_ = 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 4602 "FlickrPublishing.c" +#line 4606 "FlickrPublishing.c" } else { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 4606 "FlickrPublishing.c" +#line 4610 "FlickrPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 4610 "FlickrPublishing.c" - const gchar* _tmp4_ = NULL; +#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 4616 "FlickrPublishing.c" +#line 4620 "FlickrPublishing.c" } else { #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = FALSE; -#line 4620 "FlickrPublishing.c" +#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 4626 "FlickrPublishing.c" +#line 4630 "FlickrPublishing.c" } void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + 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" @@ -4669,91 +4673,91 @@ void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* sel _g_free0 (self->priv->consumer_secret); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->consumer_secret = _tmp3_; -#line 4657 "FlickrPublishing.c" +#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 4664 "FlickrPublishing.c" +#line 4668 "FlickrPublishing.c" } -static void _vala_array_add20 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { +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 4675 "FlickrPublishing.c" +#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 4681 "FlickrPublishing.c" +#line 4685 "FlickrPublishing.c" } void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) { gchar* http_method = NULL; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - PublishingRESTSupportHttpMethod _tmp1_ = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + PublishingRESTSupportHttpMethod _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; PublishingRESTSupportArgument** base_string_arguments = NULL; - PublishingRESTSupportTransaction* _tmp6_ = NULL; - gint _tmp7_ = 0; - PublishingRESTSupportArgument** _tmp8_ = NULL; - gint base_string_arguments_length1 = 0; - gint _base_string_arguments_size_ = 0; + PublishingRESTSupportTransaction* _tmp6_; + gint _tmp7_; + PublishingRESTSupportArgument** _tmp8_; + gint base_string_arguments_length1; + gint _base_string_arguments_size_; PublishingFlickrUploadTransaction* upload_txn = NULL; - PublishingRESTSupportTransaction* _tmp9_ = NULL; - PublishingFlickrUploadTransaction* _tmp10_ = NULL; - PublishingFlickrUploadTransaction* _tmp11_ = NULL; + PublishingRESTSupportTransaction* _tmp9_; + PublishingFlickrUploadTransaction* _tmp10_; + PublishingFlickrUploadTransaction* _tmp11_; PublishingRESTSupportArgument** sorted_args = NULL; - PublishingRESTSupportArgument** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - PublishingRESTSupportArgument** _tmp22_ = NULL; - gint sorted_args_length1 = 0; - gint _sorted_args_size_ = 0; + PublishingRESTSupportArgument** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + PublishingRESTSupportArgument** _tmp22_; + gint sorted_args_length1; + gint _sorted_args_size_; gchar* arguments_string = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp23_; gchar* signing_key = NULL; - const gchar* _tmp46_ = NULL; + const gchar* _tmp46_; gchar* signature_base_string = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - PublishingRESTSupportTransaction* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - const gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; - const gchar* _tmp72_ = 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_ = NULL; - const gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - const gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - const gchar* _tmp78_ = NULL; - PublishingFlickrUploadTransaction* _tmp79_ = 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" @@ -4798,15 +4802,15 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp11_ = upload_txn; #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp11_ != NULL) { -#line 4786 "FlickrPublishing.c" +#line 4790 "FlickrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; - PublishingFlickrUploadTransaction* _tmp12_ = NULL; - gint _tmp13_ = 0; - PublishingRESTSupportArgument** _tmp14_ = NULL; - gint auth_header_args_length1 = 0; - gint _auth_header_args_size_ = 0; - PublishingRESTSupportArgument** _tmp15_ = NULL; - gint _tmp15__length1 = 0; + 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"); @@ -4824,7 +4828,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp15_ = auth_header_args; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15__length1 = auth_header_args_length1; -#line 4811 "FlickrPublishing.c" +#line 4815 "FlickrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -4836,19 +4840,19 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, 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 4823 "FlickrPublishing.c" - PublishingRESTSupportArgument* _tmp16_ = NULL; +#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 4830 "FlickrPublishing.c" +#line 4834 "FlickrPublishing.c" { - PublishingRESTSupportArgument** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - PublishingRESTSupportArgument* _tmp18_ = NULL; - PublishingRESTSupportArgument* _tmp19_ = NULL; + 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" @@ -4861,13 +4865,13 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _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 4848 "FlickrPublishing.c" +#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 4854 "FlickrPublishing.c" +#line 4858 "FlickrPublishing.c" } #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = base_string_arguments; @@ -4885,50 +4889,50 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp23_ = g_strdup (""); #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp23_; -#line 4872 "FlickrPublishing.c" +#line 4876 "FlickrPublishing.c" { gint i = 0; #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 4877 "FlickrPublishing.c" +#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 4884 "FlickrPublishing.c" - gint _tmp26_ = 0; - PublishingRESTSupportArgument** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - const gchar* _tmp28_ = NULL; - PublishingRESTSupportArgument** _tmp29_ = NULL; - gint _tmp29__length1 = 0; - gint _tmp30_ = 0; - PublishingRESTSupportArgument* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - PublishingRESTSupportArgument** _tmp35_ = NULL; - gint _tmp35__length1 = 0; - gint _tmp36_ = 0; - PublishingRESTSupportArgument* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gint _tmp42_ = 0; - PublishingRESTSupportArgument** _tmp43_ = NULL; - gint _tmp43__length1 = 0; +#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 4909 "FlickrPublishing.c" - gint _tmp25_ = 0; +#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 4915 "FlickrPublishing.c" +#line 4919 "FlickrPublishing.c" } #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = FALSE; @@ -4942,7 +4946,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, if (!(_tmp26_ < _tmp27__length1)) { #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 4929 "FlickrPublishing.c" +#line 4933 "FlickrPublishing.c" } #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = arguments_string; @@ -4992,9 +4996,9 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp43__length1 = sorted_args_length1; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp42_ < (_tmp43__length1 - 1)) { -#line 4979 "FlickrPublishing.c" - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; +#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" @@ -5003,7 +5007,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (arguments_string); #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp45_; -#line 4990 "FlickrPublishing.c" +#line 4994 "FlickrPublishing.c" } } } @@ -5014,12 +5018,12 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp46_ = self->priv->access_phase_token_secret; #line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 5001 "FlickrPublishing.c" - const gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; - gchar* _tmp51_ = 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"); @@ -5039,10 +5043,10 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, signing_key = _tmp51_; #line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp49_); -#line 5025 "FlickrPublishing.c" +#line 5029 "FlickrPublishing.c" } else { - const gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; + 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"); @@ -5054,7 +5058,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (signing_key); #line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp53_; -#line 5039 "FlickrPublishing.c" +#line 5043 "FlickrPublishing.c" } #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp54_ = http_method; @@ -5136,26 +5140,26 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp79_ = upload_txn; #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp79_ != NULL) { -#line 5121 "FlickrPublishing.c" - PublishingFlickrUploadTransaction* _tmp80_ = NULL; - const gchar* _tmp81_ = 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 5130 "FlickrPublishing.c" +#line 5134 "FlickrPublishing.c" } else { - PublishingRESTSupportTransaction* _tmp82_ = NULL; - const gchar* _tmp83_ = NULL; + 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 5140 "FlickrPublishing.c" +#line 5144 "FlickrPublishing.c" } #line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature); @@ -5173,17 +5177,17 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, 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 5158 "FlickrPublishing.c" +#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_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + 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" @@ -5218,25 +5222,25 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes 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 5203 "FlickrPublishing.c" +#line 5207 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) { gchar* result = NULL; GTimeVal currtime = {0}; - GTimeVal _tmp0_ = {0}; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GTimeVal _tmp4_ = {0}; - glong _tmp5_ = 0L; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + 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" @@ -5277,50 +5281,50 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) result = _tmp11_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5262 "FlickrPublishing.c" +#line 5266 "FlickrPublishing.c" } static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 5285 "FlickrPublishing.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5289 "FlickrPublishing.c" + glong _tmp4_; +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 5293 "FlickrPublishing.c" +#line 5297 "FlickrPublishing.c" } else { - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp5_; + gchar* _tmp6_; +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 5305 "FlickrPublishing.c" +#line 5309 "FlickrPublishing.c" } } @@ -5329,133 +5333,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + 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 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 5329 "FlickrPublishing.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5333 "FlickrPublishing.c" + glong _tmp2_; +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 5335 "FlickrPublishing.c" +#line 5339 "FlickrPublishing.c" } else { -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 5339 "FlickrPublishing.c" +#line 5343 "FlickrPublishing.c" } -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 5343 "FlickrPublishing.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#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 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 5355 "FlickrPublishing.c" +#line 5359 "FlickrPublishing.c" } else { - gint _tmp6_ = 0; - gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp6_; + gint _tmp7_; +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 5365 "FlickrPublishing.c" +#line 5369 "FlickrPublishing.c" } -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 5371 "FlickrPublishing.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#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 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 5385 "FlickrPublishing.c" +#line 5389 "FlickrPublishing.c" } else { - glong _tmp12_ = 0L; - glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp12_; + glong _tmp13_; +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 5395 "FlickrPublishing.c" +#line 5399 "FlickrPublishing.c" } -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 5401 "FlickrPublishing.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 5405 "FlickrPublishing.c" + glong _tmp15_; + glong _tmp16_; +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 5410 "FlickrPublishing.c" +#line 5414 "FlickrPublishing.c" } -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 5430 "FlickrPublishing.c" +#line 5434 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) { gchar* result = NULL; - gint64 _tmp0_ = 0LL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = 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" @@ -5474,15 +5478,15 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s result = _tmp4_; #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5459 "FlickrPublishing.c" +#line 5463 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = 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" @@ -5497,15 +5501,15 @@ gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self result = _tmp2_; #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5482 "FlickrPublishing.c" +#line 5486 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = 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" @@ -5520,15 +5524,15 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession result = _tmp2_; #line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5505 "FlickrPublishing.c" +#line 5509 "FlickrPublishing.c" } gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { gchar* result = NULL; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = 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" @@ -5543,7 +5547,7 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { result = _tmp2_; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5528 "FlickrPublishing.c" +#line 5532 "FlickrPublishing.c" } @@ -5555,8 +5559,8 @@ static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * #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 5541 "FlickrPublishing.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated; +#line 5545 "FlickrPublishing.c" } @@ -5573,11 +5577,11 @@ static void publishing_flickr_session_instance_init (PublishingFlickrSession * s self->priv->consumer_key = NULL; #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->consumer_secret = NULL; -#line 5558 "FlickrPublishing.c" +#line 5562 "FlickrPublishing.c" } -static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) { +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); @@ -5593,7 +5597,7 @@ static void publishing_flickr_session_finalize (PublishingRESTSupportSession* ob _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 5578 "FlickrPublishing.c" +#line 5582 "FlickrPublishing.c" } @@ -5612,102 +5616,100 @@ GType publishing_flickr_session_get_type (void) { static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5597 "FlickrPublishing.c" +#line 5601 "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" publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 5604 "FlickrPublishing.c" +#line 5608 "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" publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5611 "FlickrPublishing.c" +#line 5615 "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" publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 5618 "FlickrPublishing.c" +#line 5622 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { PublishingFlickrPublishingOptionsPane * self = NULL; - GtkBuilder* _tmp0_ = NULL; - GtkBuilder* _tmp1_ = NULL; - GtkBuilder* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GSList* _tmp4_ = NULL; - GSList* _tmp5_ = NULL; - guint _tmp6_ = 0U; - GtkBuilder* _tmp7_ = NULL; - GObject* _tmp8_ = NULL; - GtkBox* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkComboBoxText* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkLabel* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkCheckButton* _tmp33_ = NULL; - PublishingFlickrFlickrPublisher* _tmp34_ = NULL; - SpitPublishingAuthenticator* _tmp35_ = NULL; - SpitPublishingAuthenticator* _tmp36_ = NULL; - gboolean _tmp37_ = FALSE; - gboolean _tmp38_ = FALSE; - PublishingFlickrPublishingParameters* _tmp43_ = NULL; - PublishingFlickrPublishingParameters* _tmp44_ = NULL; - PublishingFlickrFlickrPublisher* _tmp45_ = NULL; - PublishingFlickrFlickrPublisher* _tmp46_ = NULL; - SpitPublishingPublisherMediaType _tmp47_ = 0; - gint _tmp48_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_ = NULL; - gint _tmp50_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_ = NULL; + GtkBuilder* _tmp0_; + GtkBuilder* _tmp1_; + GtkBuilder* _tmp2_; + GtkBuilder* _tmp3_; + GSList* _tmp4_; + GSList* _tmp5_; + guint _tmp6_; + GtkBuilder* _tmp7_; + GObject* _tmp8_; + GtkBox* _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkLabel* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkButton* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkButton* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkComboBoxText* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkLabel* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkCheckButton* _tmp33_; + PublishingFlickrFlickrPublisher* _tmp34_; + SpitPublishingAuthenticator* _tmp35_; + SpitPublishingAuthenticator* _tmp36_; + gboolean _tmp37_; + gboolean _tmp38_; + PublishingFlickrPublishingParameters* _tmp43_; + PublishingFlickrPublishingParameters* _tmp44_; + PublishingFlickrFlickrPublisher* _tmp45_; + PublishingFlickrFlickrPublisher* _tmp46_; + SpitPublishingPublisherMediaType _tmp47_; + gint _tmp48_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_; + gint _tmp50_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_; gchar* upload_label_text = NULL; - const gchar* _tmp52_ = NULL; - PublishingFlickrPublishingParameters* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - PublishingFlickrPublishingParameters* _tmp56_ = NULL; - PublishingFlickrUserKind _tmp57_ = 0; - GtkLabel* _tmp70_ = NULL; - const gchar* _tmp71_ = NULL; + PublishingFlickrPublishingParameters* _tmp52_; + const gchar* _tmp53_; + gchar* _tmp54_; + PublishingFlickrPublishingParameters* _tmp55_; + PublishingFlickrUserKind _tmp56_; + GtkLabel* _tmp67_; + const gchar* _tmp68_; gchar* visibility_label_text = NULL; - const gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - SpitPublishingPublisherMediaType _tmp74_ = 0; - GtkLabel* _tmp80_ = NULL; - const gchar* _tmp81_ = NULL; - GtkComboBoxText* _tmp82_ = NULL; - SpitPublishingPublisherMediaType _tmp83_ = 0; - GtkCheckButton* _tmp87_ = NULL; - gboolean _tmp88_ = FALSE; - GtkButton* _tmp89_ = NULL; - GtkButton* _tmp90_ = NULL; + gchar* _tmp69_; + SpitPublishingPublisherMediaType _tmp70_; + GtkLabel* _tmp74_; + const gchar* _tmp75_; + GtkComboBoxText* _tmp76_; + SpitPublishingPublisherMediaType _tmp77_; + GtkCheckButton* _tmp81_; + gboolean _tmp82_; + GtkButton* _tmp83_; + GtkButton* _tmp84_; #line 772 "/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" @@ -5844,11 +5846,11 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_object_unref0 (_tmp36_); #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_) { -#line 5829 "FlickrPublishing.c" - GtkButton* _tmp39_ = NULL; - GtkContainer* _tmp40_ = NULL; - GtkContainer* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; +#line 5831 "FlickrPublishing.c" + GtkButton* _tmp39_; + GtkContainer* _tmp40_; + GtkContainer* _tmp41_; + GtkButton* _tmp42_; #line 790 "/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" @@ -5859,7 +5861,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp42_ = self->priv->logout_button; #line 790 "/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 5844 "FlickrPublishing.c" +#line 5846 "FlickrPublishing.c" } #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp43_ = parameters; @@ -5902,190 +5904,174 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane #line 798 "/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" - _tmp52_ = _ ("You are logged into Flickr as %s.\n\n"); + _tmp52_ = parameters; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp53_ = parameters; + _tmp53_ = _tmp52_->username; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp54_ = _tmp53_->username; + _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" - _tmp55_ = g_strdup_printf (_tmp52_, _tmp54_); -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_label_text = _tmp55_; + upload_label_text = _tmp54_; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp56_ = parameters; + _tmp55_ = parameters; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp57_ = _tmp56_->user_kind; + _tmp56_ = _tmp55_->user_kind; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp57_ == PUBLISHING_FLICKR_USER_KIND_FREE) { + if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) { #line 5902 "FlickrPublishing.c" - const gchar* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - PublishingFlickrPublishingParameters* _tmp60_ = NULL; - gint64 _tmp61_ = 0LL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp58_ = upload_label_text; + const gchar* _tmp57_; + PublishingFlickrPublishingParameters* _tmp58_; + gint64 _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp59_ = _ ("Your free Flickr account limits how much data you can upload per month" \ -".\n" \ -"This month you have %s remaining in your upload quota."); + _tmp57_ = upload_label_text; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp60_ = parameters; + _tmp58_ = parameters; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp61_ = _tmp60_->quota_free_bytes; + _tmp59_ = _tmp58_->quota_free_bytes; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp62_ = g_format_size_full ((guint64) _tmp61_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS); + _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" - _tmp63_ = _tmp62_; + _tmp61_ = _tmp60_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp64_ = g_strdup_printf (_tmp59_, _tmp63_); + _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" - _tmp65_ = _tmp64_; + _tmp63_ = _tmp62_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp66_ = g_strconcat (_tmp58_, _tmp65_, NULL); + _tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL); #line 802 "/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" - upload_label_text = _tmp66_; -#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _g_free0 (_tmp65_); + upload_label_text = _tmp64_; #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp63_); -#line 5938 "FlickrPublishing.c" +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" + _g_free0 (_tmp61_); +#line 5935 "FlickrPublishing.c" } else { - const gchar* _tmp67_ = NULL; - const gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp67_ = upload_label_text; + const gchar* _tmp65_; + gchar* _tmp66_; #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp68_ = _ ("Your Flickr Pro account entitles you to unlimited uploads."); + _tmp65_ = upload_label_text; #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp69_ = g_strconcat (_tmp67_, _tmp68_, NULL); + _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" _g_free0 (upload_label_text); #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - upload_label_text = _tmp69_; -#line 5953 "FlickrPublishing.c" + upload_label_text = _tmp66_; +#line 5947 "FlickrPublishing.c" } #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp70_ = self->priv->upload_info_label; + _tmp67_ = self->priv->upload_info_label; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp71_ = upload_label_text; + _tmp68_ = upload_label_text; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_label_set_label (_tmp70_, _tmp71_); -#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp72_ = _ ("Photos _visible to:"); + gtk_label_set_label (_tmp67_, _tmp68_); #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp73_ = g_strdup (_tmp72_); + _tmp69_ = g_strdup (_ ("Photos _visible to:")); #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - visibility_label_text = _tmp73_; + visibility_label_text = _tmp69_; #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp74_ = media_type; + _tmp70_ = media_type; #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp74_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 5971 "FlickrPublishing.c" - const gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; + if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 5963 "FlickrPublishing.c" + gchar* _tmp71_; #line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp75_ = _ ("Videos _visible to:"); -#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp76_ = g_strdup (_tmp75_); + _tmp71_ = g_strdup (_ ("Videos _visible to:")); #line 811 "/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" - visibility_label_text = _tmp76_; -#line 5982 "FlickrPublishing.c" + visibility_label_text = _tmp71_; +#line 5971 "FlickrPublishing.c" } else { - SpitPublishingPublisherMediaType _tmp77_ = 0; + SpitPublishingPublisherMediaType _tmp72_; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp77_ = media_type; + _tmp72_ = media_type; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp77_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 5989 "FlickrPublishing.c" - const gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; + if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { +#line 5978 "FlickrPublishing.c" + gchar* _tmp73_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp78_ = _ ("Photos and videos _visible to:"); -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp79_ = g_strdup (_tmp78_); + _tmp73_ = g_strdup (_ ("Photos and videos _visible to:")); #line 814 "/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" - visibility_label_text = _tmp79_; -#line 6000 "FlickrPublishing.c" + visibility_label_text = _tmp73_; +#line 5986 "FlickrPublishing.c" } } #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp80_ = self->priv->visibility_label; + _tmp74_ = self->priv->visibility_label; #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp81_ = visibility_label_text; + _tmp75_ = visibility_label_text; #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_label_set_label (_tmp80_, _tmp81_); + gtk_label_set_label (_tmp74_, _tmp75_); #line 819 "/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" - _tmp82_ = self->priv->visibility_combo; + _tmp76_ = self->priv->visibility_combo; #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0); + 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" - _tmp83_ = media_type; + _tmp77_ = media_type; #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - if (_tmp83_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 6019 "FlickrPublishing.c" - GtkComboBoxText* _tmp84_ = NULL; + if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 6005 "FlickrPublishing.c" + GtkComboBoxText* _tmp78_; #line 823 "/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" - _tmp84_ = self->priv->size_combo; + _tmp78_ = self->priv->size_combo; #line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 6027 "FlickrPublishing.c" + 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" } else { - GtkComboBoxText* _tmp85_ = NULL; - GtkLabel* _tmp86_ = NULL; + GtkComboBoxText* _tmp79_; + GtkLabel* _tmp80_; #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp85_ = self->priv->size_combo; + _tmp79_ = self->priv->size_combo; #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE); + 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" - _tmp86_ = self->priv->size_label; + _tmp80_ = self->priv->size_label; #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 6039 "FlickrPublishing.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 6025 "FlickrPublishing.c" } #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp87_ = self->priv->strip_metadata_check; + _tmp81_ = self->priv->strip_metadata_check; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp88_ = strip_metadata; + _tmp82_ = strip_metadata; #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp88_); + 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" - _tmp89_ = self->priv->logout_button; + _tmp83_ = self->priv->logout_button; #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp89_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + 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" - _tmp90_ = self->priv->publish_button; + _tmp84_ = self->priv->publish_button; #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - g_signal_connect_object (_tmp90_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + 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" _g_free0 (visibility_label_text); #line 772 "/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" return self; -#line 6061 "FlickrPublishing.c" +#line 6047 "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" return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata); -#line 6068 "FlickrPublishing.c" +#line 6054 "FlickrPublishing.c" } @@ -6093,30 +6079,30 @@ static void publishing_flickr_publishing_options_pane_on_logout_clicked (Publish #line 837 "/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" - g_signal_emit_by_name (self, "logout"); -#line 6077 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 6063 "FlickrPublishing.c" } static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) { #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_visibility_specification_ref (self) : NULL; -#line 6084 "FlickrPublishing.c" +#line 6070 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_publish_clicked (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingParameters* _tmp0_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - GtkComboBoxText* _tmp2_ = NULL; - gint _tmp3_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp5_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp6_ = NULL; - SpitPublishingPublisherMediaType _tmp7_ = 0; - GtkCheckButton* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + PublishingFlickrPublishingParameters* _tmp0_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_; + gint _tmp1__length1; + GtkComboBoxText* _tmp2_; + gint _tmp3_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; + PublishingFlickrVisibilitySpecification* _tmp5_; + PublishingFlickrVisibilitySpecification* _tmp6_; + SpitPublishingPublisherMediaType _tmp7_; + GtkCheckButton* _tmp14_; + gboolean _tmp15_; #line 841 "/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" @@ -6143,14 +6129,14 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp7_ = self->priv->media_type; #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 6126 "FlickrPublishing.c" - PublishingFlickrPublishingParameters* _tmp8_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkComboBoxText* _tmp10_ = NULL; - gint _tmp11_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL; - gint _tmp13_ = 0; +#line 6112 "FlickrPublishing.c" + PublishingFlickrPublishingParameters* _tmp8_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_; + gint _tmp9__length1; + GtkComboBoxText* _tmp10_; + gint _tmp11_; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_; + gint _tmp13_; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = self->priv->parameters; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6167,141 +6153,136 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp13_ = _tmp12_->size; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_->photo_major_axis_size = _tmp13_; -#line 6150 "FlickrPublishing.c" +#line 6136 "FlickrPublishing.c" } #line 848 "/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" _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" - g_signal_emit_by_name (self, "publish", _tmp15_); -#line 6158 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_); +#line 6144 "FlickrPublishing.c" } -static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 854 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6169 "FlickrPublishing.c" +#line 6155 "FlickrPublishing.c" } #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6175 "FlickrPublishing.c" +#line 6161 "FlickrPublishing.c" } -static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 855 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6186 "FlickrPublishing.c" +#line 6172 "FlickrPublishing.c" } #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6192 "FlickrPublishing.c" +#line 6178 "FlickrPublishing.c" } -static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 856 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6203 "FlickrPublishing.c" +#line 6189 "FlickrPublishing.c" } #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6209 "FlickrPublishing.c" +#line 6195 "FlickrPublishing.c" } -static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 857 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6220 "FlickrPublishing.c" +#line 6206 "FlickrPublishing.c" } #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6226 "FlickrPublishing.c" +#line 6212 "FlickrPublishing.c" } -static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { +static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) { #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 858 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 6237 "FlickrPublishing.c" +#line 6223 "FlickrPublishing.c" } #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6243 "FlickrPublishing.c" +#line 6229 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_publishing_options_pane_create_visibilities (PublishingFlickrPublishingOptionsPane* self, int* result_length1) { PublishingFlickrPublishingOptionsPaneVisibilityEntry** result = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _result_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp3_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp4_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - const gchar* _tmp7_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp8_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp9_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp10_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - const gchar* _tmp12_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp13_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - const gchar* _tmp17_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp18_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp19_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - const gchar* _tmp22_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp23_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp24_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL; - gint _tmp26__length1 = 0; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp1_; + gint _tmp1__length1; + PublishingFlickrVisibilitySpecification* _tmp2_; + PublishingFlickrVisibilitySpecification* _tmp3_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp5_; + gint _tmp5__length1; + PublishingFlickrVisibilitySpecification* _tmp6_; + PublishingFlickrVisibilitySpecification* _tmp7_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp8_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp9_; + gint _tmp9__length1; + PublishingFlickrVisibilitySpecification* _tmp10_; + PublishingFlickrVisibilitySpecification* _tmp11_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp12_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp13_; + gint _tmp13__length1; + PublishingFlickrVisibilitySpecification* _tmp14_; + PublishingFlickrVisibilitySpecification* _tmp15_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp16_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp17_; + gint _tmp17__length1; + PublishingFlickrVisibilitySpecification* _tmp18_; + PublishingFlickrVisibilitySpecification* _tmp19_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_; + gint _tmp21__length1; #line 851 "/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" @@ -6317,114 +6298,104 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_ #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _ ("Everyone"); -#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1); + _tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1); #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_); + _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_, _tmp5_); + _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp4_); + _publishing_flickr_visibility_specification_unref0 (_tmp3_); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = _result_; + _tmp5_ = _result_; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6__length1 = _result__length1; + _tmp5__length1 = _result__length1; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _ ("Friends & family only"); + _tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0); -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_); + _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_, _tmp10_); + _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp9_); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _result_; + _publishing_flickr_visibility_specification_unref0 (_tmp7_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11__length1 = _result__length1; + _tmp9_ = _result_; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = _ ("Family only"); + _tmp9__length1 = _result__length1; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0); + _tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_); + _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_, _tmp15_); + _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp14_); + _publishing_flickr_visibility_specification_unref0 (_tmp11_); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _result_; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp13_ = _result_; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp17_ = _ ("Friends only"); + _tmp13__length1 = _result__length1; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0); + _tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_); + _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_, _tmp20_); + _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp19_); + _publishing_flickr_visibility_specification_unref0 (_tmp15_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21_ = _result_; -#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp21__length1 = _result__length1; + _tmp17_ = _result_; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp22_ = _ ("Just me"); + _tmp17__length1 = _result__length1; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0); + _tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp24_ = _tmp23_; + _tmp19_ = _tmp18_; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_); + _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_, _tmp25_); + _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _publishing_flickr_visibility_specification_unref0 (_tmp24_); + _publishing_flickr_visibility_specification_unref0 (_tmp19_); #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26_ = _result_; + _tmp21_ = _result_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp26__length1 = _result__length1; + _tmp21__length1 = _result__length1; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *result_length1 = _tmp26__length1; -#line 6383 "FlickrPublishing.c" + *result_length1 = _tmp21__length1; +#line 6354 "FlickrPublishing.c" } #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp26_; + result = _tmp21_; #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6389 "FlickrPublishing.c" +#line 6360 "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" return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL; -#line 6396 "FlickrPublishing.c" +#line 6367 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_populate_visibility_combo (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkComboBoxText* _tmp8_ = NULL; - PublishingFlickrFlickrPublisher* _tmp9_ = NULL; - gint _tmp10_ = 0; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp0_; + gint _tmp0__length1; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp3_; + gint _tmp3__length1; + GtkComboBoxText* _tmp8_; + PublishingFlickrFlickrPublisher* _tmp9_; + gint _tmp10_; #line 863 "/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" @@ -6433,9 +6404,9 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp0__length1 = self->priv->visibilities_length1; #line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6416 "FlickrPublishing.c" - gint _tmp1_ = 0; - PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL; +#line 6387 "FlickrPublishing.c" + gint _tmp1_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_; #line 865 "/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" @@ -6446,13 +6417,13 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo self->priv->visibilities_length1 = _tmp1_; #line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 6429 "FlickrPublishing.c" +#line 6400 "FlickrPublishing.c" } #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->visibilities; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->visibilities_length1; -#line 6435 "FlickrPublishing.c" +#line 6406 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL; gint v_collection_length1 = 0; @@ -6464,18 +6435,18 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo v_collection_length1 = _tmp3__length1; #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) { -#line 6447 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; +#line 6418 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL; #line 867 "/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" v = _tmp4_; -#line 6454 "FlickrPublishing.c" +#line 6425 "FlickrPublishing.c" { - GtkComboBoxText* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkComboBoxText* _tmp5_; + PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_; + const gchar* _tmp7_; #line 868 "/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" @@ -6486,7 +6457,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v); -#line 6469 "FlickrPublishing.c" +#line 6440 "FlickrPublishing.c" } } } @@ -6498,123 +6469,118 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_); #line 870 "/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 6481 "FlickrPublishing.c" +#line 6452 "FlickrPublishing.c" } -static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 876 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6492 "FlickrPublishing.c" +#line 6463 "FlickrPublishing.c" } #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6498 "FlickrPublishing.c" +#line 6469 "FlickrPublishing.c" } -static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 877 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6509 "FlickrPublishing.c" +#line 6480 "FlickrPublishing.c" } #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6515 "FlickrPublishing.c" +#line 6486 "FlickrPublishing.c" } -static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 878 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6526 "FlickrPublishing.c" +#line 6497 "FlickrPublishing.c" } #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6532 "FlickrPublishing.c" +#line 6503 "FlickrPublishing.c" } -static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 879 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6543 "FlickrPublishing.c" +#line 6514 "FlickrPublishing.c" } #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6549 "FlickrPublishing.c" +#line 6520 "FlickrPublishing.c" } -static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { +static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) { #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 880 "/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" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 6560 "FlickrPublishing.c" +#line 6531 "FlickrPublishing.c" } #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6566 "FlickrPublishing.c" +#line 6537 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publishing_options_pane_create_sizes (PublishingFlickrPublishingOptionsPane* self, int* result_length1) { PublishingFlickrPublishingOptionsPaneSizeEntry** result = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry** _result_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL; - gint _result__length1 = 0; - gint __result__size_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp3_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp9_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp14_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL; - gint _tmp16__length1 = 0; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_; + gint _result__length1; + gint __result__size_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp1_; + gint _tmp1__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp2_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_; + gint _tmp3__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp5_; + gint _tmp5__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp7_; + gint _tmp7__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp8_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_; + gint _tmp9__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_; + gint _tmp11__length1; #line 873 "/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" @@ -6630,84 +6596,74 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1__length1 = _result__length1; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp2_ = _ ("500 × 375 pixels"); -#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500); + _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_, _tmp3_); -#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4_ = _result_; + _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_); #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp4__length1 = _result__length1; + _tmp3_ = _result_; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp5_ = _ ("1024 × 768 pixels"); + _tmp3__length1 = _result__length1; #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024); + _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_, _tmp6_); + _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7_ = _result_; -#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp7__length1 = _result__length1; + _tmp5_ = _result_; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp8_ = _ ("2048 × 1536 pixels"); + _tmp5__length1 = _result__length1; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048); + _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_, _tmp9_); -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10_ = _result_; + _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_); #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp10__length1 = _result__length1; + _tmp7_ = _result_; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp11_ = _ ("4096 × 3072 pixels"); + _tmp7__length1 = _result__length1; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096); + _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_, _tmp12_); -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13_ = _result_; + _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_); #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp13__length1 = _result__length1; + _tmp9_ = _result_; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp14_ = _ ("Original size"); + _tmp9__length1 = _result__length1; #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE); + _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_, _tmp15_); + _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_); #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16_ = _result_; + _tmp11_ = _result_; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _tmp16__length1 = _result__length1; + _tmp11__length1 = _result__length1; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (result_length1) { #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - *result_length1 = _tmp16__length1; -#line 6666 "FlickrPublishing.c" + *result_length1 = _tmp11__length1; +#line 6622 "FlickrPublishing.c" } #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - result = _tmp16_; + result = _tmp11_; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6672 "FlickrPublishing.c" +#line 6628 "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" return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL; -#line 6679 "FlickrPublishing.c" +#line 6635 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_populate_size_combo (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkComboBoxText* _tmp8_ = NULL; - PublishingFlickrFlickrPublisher* _tmp9_ = NULL; - gint _tmp10_ = 0; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp0_; + gint _tmp0__length1; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp3_; + gint _tmp3__length1; + GtkComboBoxText* _tmp8_; + PublishingFlickrFlickrPublisher* _tmp9_; + gint _tmp10_; #line 885 "/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" @@ -6716,9 +6672,9 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp0__length1 = self->priv->sizes_length1; #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 6699 "FlickrPublishing.c" - gint _tmp1_ = 0; - PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL; +#line 6655 "FlickrPublishing.c" + gint _tmp1_; + PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_; #line 887 "/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" @@ -6729,13 +6685,13 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi self->priv->sizes_length1 = _tmp1_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 6712 "FlickrPublishing.c" +#line 6668 "FlickrPublishing.c" } #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->sizes; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->sizes_length1; -#line 6718 "FlickrPublishing.c" +#line 6674 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; @@ -6747,18 +6703,18 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi e_collection_length1 = _tmp3__length1; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) { -#line 6730 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL; +#line 6686 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_; PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL; #line 889 "/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" e = _tmp4_; -#line 6737 "FlickrPublishing.c" +#line 6693 "FlickrPublishing.c" { - GtkComboBoxText* _tmp5_ = NULL; - PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkComboBoxText* _tmp5_; + PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_; + const gchar* _tmp7_; #line 890 "/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" @@ -6769,7 +6725,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_size_entry_unref0 (e); -#line 6752 "FlickrPublishing.c" +#line 6708 "FlickrPublishing.c" } } } @@ -6781,14 +6737,14 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_); #line 892 "/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 6764 "FlickrPublishing.c" +#line 6720 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_size_changed (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrFlickrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingFlickrFlickrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 895 "/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" @@ -6799,14 +6755,14 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin _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" publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 6782 "FlickrPublishing.c" +#line 6738 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_on_visibility_changed (PublishingFlickrPublishingOptionsPane* self) { - PublishingFlickrFlickrPublisher* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + PublishingFlickrFlickrPublisher* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 899 "/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" @@ -6817,13 +6773,13 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub _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" publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_); -#line 6800 "FlickrPublishing.c" +#line 6756 "FlickrPublishing.c" } void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) { - GtkCheckButton* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + GtkCheckButton* _tmp0_; + gboolean _tmp1_; #line 903 "/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" @@ -6831,8 +6787,8 @@ void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrP #line 904 "/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" - g_signal_emit_by_name (self, "publish", _tmp1_); -#line 6815 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_); +#line 6771 "FlickrPublishing.c" } @@ -6840,16 +6796,16 @@ void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPu #line 907 "/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" - g_signal_emit_by_name (self, "logout"); -#line 6824 "FlickrPublishing.c" + g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 6780 "FlickrPublishing.c" } static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; GtkWidget* result = NULL; - GtkBox* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkBox* _tmp0_; + GtkWidget* _tmp1_; #line 911 "/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" @@ -6860,7 +6816,7 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6843 "FlickrPublishing.c" +#line 6799 "FlickrPublishing.c" } @@ -6873,21 +6829,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6856 "FlickrPublishing.c" +#line 6812 "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" publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self); -#line 6863 "FlickrPublishing.c" +#line 6819 "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" publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self); -#line 6870 "FlickrPublishing.c" +#line 6826 "FlickrPublishing.c" } @@ -6899,14 +6855,14 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_installed (Sp 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" g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 6882 "FlickrPublishing.c" +#line 6838 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingFlickrPublishingOptionsPane * self; - guint _tmp0_ = 0U; - guint _tmp1_ = 0U; + guint _tmp0_; + guint _tmp1_; #line 924 "/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" @@ -6917,15 +6873,15 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( 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" 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 6900 "FlickrPublishing.c" +#line 6856 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) { PublishingFlickrPublishingOptionsPaneSizeEntry* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + gint _tmp2_; #line 737 "/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" @@ -6944,21 +6900,21 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish self->size = _tmp2_; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6927 "FlickrPublishing.c" +#line 6883 "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" return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size); -#line 6934 "FlickrPublishing.c" +#line 6890 "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" value->data[0].v_pointer = NULL; -#line 6941 "FlickrPublishing.c" +#line 6897 "FlickrPublishing.c" } @@ -6967,7 +6923,7 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_free_valu if (value->data[0].v_pointer) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer); -#line 6950 "FlickrPublishing.c" +#line 6906 "FlickrPublishing.c" } } @@ -6977,11 +6933,11 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu if (src_value->data[0].v_pointer) { #line 733 "/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 6960 "FlickrPublishing.c" +#line 6916 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 6964 "FlickrPublishing.c" +#line 6920 "FlickrPublishing.c" } } @@ -6989,66 +6945,66 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu 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" return value->data[0].v_pointer; -#line 6972 "FlickrPublishing.c" +#line 6928 "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" if (collect_values[0].v_pointer) { -#line 6979 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneSizeEntry* object; +#line 6935 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneSizeEntry * object; object = collect_values[0].v_pointer; #line 733 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6986 "FlickrPublishing.c" +#line 6942 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 6990 "FlickrPublishing.c" +#line 6946 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object); -#line 6994 "FlickrPublishing.c" +#line 6950 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 6998 "FlickrPublishing.c" +#line 6954 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7002 "FlickrPublishing.c" +#line 6958 "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; + PublishingFlickrPublishingOptionsPaneSizeEntry ** object_p; object_p = collect_values[0].v_pointer; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 733 "/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 7013 "FlickrPublishing.c" +#line 6969 "FlickrPublishing.c" } #line 733 "/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" *object_p = NULL; -#line 7019 "FlickrPublishing.c" +#line 6975 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7023 "FlickrPublishing.c" +#line 6979 "FlickrPublishing.c" } else { #line 733 "/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 7027 "FlickrPublishing.c" +#line 6983 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7031 "FlickrPublishing.c" +#line 6987 "FlickrPublishing.c" } @@ -7062,7 +7018,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_ent G_PARAM_SPEC (spec)->value_type = object_type; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7045 "FlickrPublishing.c" +#line 7001 "FlickrPublishing.c" } @@ -7071,12 +7027,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry ( 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" return value->data[0].v_pointer; -#line 7054 "FlickrPublishing.c" +#line 7010 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneSizeEntry* old; + PublishingFlickrPublishingOptionsPaneSizeEntry * old; #line 733 "/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" @@ -7091,23 +7047,23 @@ static void publishing_flickr_publishing_options_pane_value_set_size_entry (GVal value->data[0].v_pointer = v_object; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 7074 "FlickrPublishing.c" +#line 7030 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7078 "FlickrPublishing.c" +#line 7034 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7084 "FlickrPublishing.c" +#line 7040 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneSizeEntry* old; + PublishingFlickrPublishingOptionsPaneSizeEntry * old; #line 733 "/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" @@ -7120,17 +7076,17 @@ static void publishing_flickr_publishing_options_pane_value_take_size_entry (GVa 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" value->data[0].v_pointer = v_object; -#line 7103 "FlickrPublishing.c" +#line 7059 "FlickrPublishing.c" } else { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7107 "FlickrPublishing.c" +#line 7063 "FlickrPublishing.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 7113 "FlickrPublishing.c" +#line 7069 "FlickrPublishing.c" } } @@ -7140,18 +7096,18 @@ static void publishing_flickr_publishing_options_pane_size_entry_class_init (Pub 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" ((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize; -#line 7123 "FlickrPublishing.c" +#line 7079 "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" self->ref_count = 1; -#line 7130 "FlickrPublishing.c" +#line 7086 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) { +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" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, PublishingFlickrPublishingOptionsPaneSizeEntry); @@ -7159,7 +7115,7 @@ static void publishing_flickr_publishing_options_pane_size_entry_finalize (Publi g_signal_handlers_destroy (self); #line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7142 "FlickrPublishing.c" +#line 7098 "FlickrPublishing.c" } @@ -7178,18 +7134,18 @@ 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; + PublishingFlickrPublishingOptionsPaneSizeEntry * self; self = instance; #line 733 "/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" return instance; -#line 7167 "FlickrPublishing.c" +#line 7123 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneSizeEntry* self; + PublishingFlickrPublishingOptionsPaneSizeEntry * self; self = instance; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -7197,17 +7153,17 @@ static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7180 "FlickrPublishing.c" +#line 7136 "FlickrPublishing.c" } } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { PublishingFlickrPublishingOptionsPaneVisibilityEntry* self = NULL; - PublishingFlickrVisibilitySpecification* _tmp0_ = NULL; - PublishingFlickrVisibilitySpecification* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + PublishingFlickrVisibilitySpecification* _tmp0_; + PublishingFlickrVisibilitySpecification* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; #line 747 "/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" @@ -7232,21 +7188,21 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p self->title = _tmp3_; #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7215 "FlickrPublishing.c" +#line 7171 "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" return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification); -#line 7222 "FlickrPublishing.c" +#line 7178 "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" value->data[0].v_pointer = NULL; -#line 7229 "FlickrPublishing.c" +#line 7185 "FlickrPublishing.c" } @@ -7255,7 +7211,7 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_fre if (value->data[0].v_pointer) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer); -#line 7238 "FlickrPublishing.c" +#line 7194 "FlickrPublishing.c" } } @@ -7265,11 +7221,11 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop if (src_value->data[0].v_pointer) { #line 743 "/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 7248 "FlickrPublishing.c" +#line 7204 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 7252 "FlickrPublishing.c" +#line 7208 "FlickrPublishing.c" } } @@ -7277,66 +7233,66 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop 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" return value->data[0].v_pointer; -#line 7260 "FlickrPublishing.c" +#line 7216 "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" if (collect_values[0].v_pointer) { -#line 7267 "FlickrPublishing.c" - PublishingFlickrPublishingOptionsPaneVisibilityEntry* object; +#line 7223 "FlickrPublishing.c" + PublishingFlickrPublishingOptionsPaneVisibilityEntry * object; object = collect_values[0].v_pointer; #line 743 "/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" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7274 "FlickrPublishing.c" +#line 7230 "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" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 7278 "FlickrPublishing.c" +#line 7234 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object); -#line 7282 "FlickrPublishing.c" +#line 7238 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7286 "FlickrPublishing.c" +#line 7242 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7290 "FlickrPublishing.c" +#line 7246 "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; + PublishingFlickrPublishingOptionsPaneVisibilityEntry ** object_p; object_p = collect_values[0].v_pointer; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!object_p) { #line 743 "/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 7301 "FlickrPublishing.c" +#line 7257 "FlickrPublishing.c" } #line 743 "/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" *object_p = NULL; -#line 7307 "FlickrPublishing.c" +#line 7263 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 7311 "FlickrPublishing.c" +#line 7267 "FlickrPublishing.c" } else { #line 743 "/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 7315 "FlickrPublishing.c" +#line 7271 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 7319 "FlickrPublishing.c" +#line 7275 "FlickrPublishing.c" } @@ -7350,7 +7306,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibili G_PARAM_SPEC (spec)->value_type = object_type; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 7333 "FlickrPublishing.c" +#line 7289 "FlickrPublishing.c" } @@ -7359,12 +7315,12 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_e 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" return value->data[0].v_pointer; -#line 7342 "FlickrPublishing.c" +#line 7298 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; #line 743 "/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" @@ -7379,23 +7335,23 @@ static void publishing_flickr_publishing_options_pane_value_set_visibility_entry value->data[0].v_pointer = v_object; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 7362 "FlickrPublishing.c" +#line 7318 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7366 "FlickrPublishing.c" +#line 7322 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7372 "FlickrPublishing.c" +#line 7328 "FlickrPublishing.c" } } static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* old; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * old; #line 743 "/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" @@ -7408,17 +7364,17 @@ static void publishing_flickr_publishing_options_pane_value_take_visibility_entr 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" value->data[0].v_pointer = v_object; -#line 7391 "FlickrPublishing.c" +#line 7347 "FlickrPublishing.c" } else { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 7395 "FlickrPublishing.c" +#line 7351 "FlickrPublishing.c" } #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 7401 "FlickrPublishing.c" +#line 7357 "FlickrPublishing.c" } } @@ -7428,18 +7384,18 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_class_ini 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" ((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize; -#line 7411 "FlickrPublishing.c" +#line 7367 "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" self->ref_count = 1; -#line 7418 "FlickrPublishing.c" +#line 7374 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) { +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" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, PublishingFlickrPublishingOptionsPaneVisibilityEntry); @@ -7449,7 +7405,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_finalize _publishing_flickr_visibility_specification_unref0 (self->specification); #line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 7432 "FlickrPublishing.c" +#line 7388 "FlickrPublishing.c" } @@ -7468,18 +7424,18 @@ 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; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; self = instance; #line 743 "/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" return instance; -#line 7457 "FlickrPublishing.c" +#line 7413 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) { - PublishingFlickrPublishingOptionsPaneVisibilityEntry* self; + PublishingFlickrPublishingOptionsPaneVisibilityEntry * self; self = instance; #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -7487,7 +7443,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gp PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self); #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 7470 "FlickrPublishing.c" +#line 7426 "FlickrPublishing.c" } } @@ -7500,10 +7456,10 @@ static void publishing_flickr_publishing_options_pane_class_init (PublishingFlic #line 732 "/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" - 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); + 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" - 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 7486 "FlickrPublishing.c" + 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" } @@ -7511,14 +7467,14 @@ static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pan #line 732 "/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" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_preferred_geometry; + 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" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed; + 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" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; -#line 7501 "FlickrPublishing.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; +#line 7457 "FlickrPublishing.c" } @@ -7559,11 +7515,11 @@ static void publishing_flickr_publishing_options_pane_instance_init (PublishingF self->priv->parameters = NULL; #line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = NULL; -#line 7542 "FlickrPublishing.c" +#line 7498 "FlickrPublishing.c" } -static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { +static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) { PublishingFlickrPublishingOptionsPane * self; #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane); @@ -7597,7 +7553,7 @@ static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->publisher); #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj); -#line 7580 "FlickrPublishing.c" +#line 7536 "FlickrPublishing.c" } @@ -7617,12 +7573,12 @@ 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* self = NULL; - PublishingFlickrSession* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingFlickrPublishingParameters* _tmp2_ = NULL; - PublishingFlickrPublishingParameters* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + PublishingFlickrSession* _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" @@ -7649,47 +7605,47 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ self->priv->strip_metadata = _tmp4_; #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 7632 "FlickrPublishing.c" +#line 7588 "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" return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata); -#line 7639 "FlickrPublishing.c" +#line 7595 "FlickrPublishing.c" } -static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) { #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((*length) == (*size)) { #line 988 "/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" *array = g_renew (gchar*, *array, (*size) + 1); -#line 7650 "FlickrPublishing.c" +#line 7606 "FlickrPublishing.c" } #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 7656 "FlickrPublishing.c" +#line 7612 "FlickrPublishing.c" } static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable) { - SpitPublishingPublishable* _tmp0_ = NULL; - SpitPublishingPublisherMediaType _tmp1_ = 0; + SpitPublishingPublishable* _tmp0_; + SpitPublishingPublisherMediaType _tmp1_; GExiv2Metadata* publishable_metadata = NULL; - GExiv2Metadata* _tmp2_ = NULL; - GExiv2Metadata* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - GExiv2Metadata* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - GExiv2Metadata* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - GExiv2Metadata* _tmp32_ = NULL; - gboolean _tmp33_ = FALSE; + GExiv2Metadata* _tmp2_; + GExiv2Metadata* _tmp14_; + gboolean _tmp15_; + GExiv2Metadata* _tmp16_; + gboolean _tmp17_; + GExiv2Metadata* _tmp24_; + gboolean _tmp25_; + GExiv2Metadata* _tmp32_; + gboolean _tmp33_; GError * _inner_error_ = NULL; #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self)); @@ -7703,20 +7659,20 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7686 "FlickrPublishing.c" +#line 7642 "FlickrPublishing.c" } #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gexiv2_metadata_new (); #line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishable_metadata = _tmp2_; -#line 7692 "FlickrPublishing.c" +#line 7648 "FlickrPublishing.c" { - GExiv2Metadata* _tmp3_ = NULL; - SpitPublishingPublishable* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GExiv2Metadata* _tmp3_; + SpitPublishingPublishable* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = publishable_metadata; #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7737,7 +7693,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp6_); #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7720 "FlickrPublishing.c" +#line 7676 "FlickrPublishing.c" goto __catch18_g_error; } } @@ -7745,11 +7701,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU __catch18_g_error: { GError* err = NULL; - SpitPublishingPublishable* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; + SpitPublishingPublishable* _tmp9_; + GFile* _tmp10_; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7773,7 +7729,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp11_); #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 7755 "FlickrPublishing.c" +#line 7711 "FlickrPublishing.c" } __finally18: #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7786,7 +7742,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU g_clear_error (&_inner_error_); #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7768 "FlickrPublishing.c" +#line 7724 "FlickrPublishing.c" } #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishable_metadata; @@ -7798,7 +7754,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (publishable_metadata); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 7780 "FlickrPublishing.c" +#line 7736 "FlickrPublishing.c" } #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishable_metadata; @@ -7806,13 +7762,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption"); #line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp17_) { -#line 7788 "FlickrPublishing.c" - GExiv2Metadata* _tmp18_ = NULL; - GExiv2Metadata* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; +#line 7744 "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" _tmp18_ = publishable_metadata; #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7831,7 +7787,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp23_); #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 7813 "FlickrPublishing.c" +#line 7769 "FlickrPublishing.c" } #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = publishable_metadata; @@ -7839,13 +7795,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline"); #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp25_) { -#line 7821 "FlickrPublishing.c" - GExiv2Metadata* _tmp26_ = NULL; - GExiv2Metadata* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; +#line 7777 "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" _tmp26_ = publishable_metadata; #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7864,7 +7820,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp31_); #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp29_); -#line 7846 "FlickrPublishing.c" +#line 7802 "FlickrPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = publishable_metadata; @@ -7872,46 +7828,46 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords"); #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp33_) { -#line 7854 "FlickrPublishing.c" +#line 7810 "FlickrPublishing.c" GeeSet* keyword_set = NULL; - GeeHashSet* _tmp34_ = NULL; + GeeHashSet* _tmp34_; gchar** iptc_keywords = NULL; - GExiv2Metadata* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gchar** _tmp37_ = NULL; - gint iptc_keywords_length1 = 0; - gint _iptc_keywords_size_ = 0; - gchar** _tmp38_ = NULL; - gint _tmp38__length1 = 0; + GExiv2Metadata* _tmp35_; + gchar** _tmp36_; + gchar** _tmp37_; + gint iptc_keywords_length1; + gint _iptc_keywords_size_; + gchar** _tmp38_; + gint _tmp38__length1; gchar** xmp_keywords = NULL; - GExiv2Metadata* _tmp43_ = NULL; - gchar** _tmp44_ = NULL; - gchar** _tmp45_ = NULL; - gint xmp_keywords_length1 = 0; - gint _xmp_keywords_size_ = 0; - gchar** _tmp46_ = NULL; - gint _tmp46__length1 = 0; + GExiv2Metadata* _tmp43_; + gchar** _tmp44_; + gchar** _tmp45_; + gint xmp_keywords_length1; + gint _xmp_keywords_size_; + gchar** _tmp46_; + gint _tmp46__length1; gchar** all_keywords = NULL; - GeeSet* _tmp51_ = NULL; - gint _tmp52_ = 0; - gpointer* _tmp53_ = NULL; - gint all_keywords_length1 = 0; - gint _all_keywords_size_ = 0; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; + GeeSet* _tmp51_; + gint _tmp52_; + gpointer* _tmp53_; + gint all_keywords_length1; + gint _all_keywords_size_; + gchar** _tmp54_; + gint _tmp54__length1; gchar** no_keywords = NULL; - gchar** _tmp55_ = NULL; - gint no_keywords_length1 = 0; - gint _no_keywords_size_ = 0; - gchar** _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gchar* _tmp57_ = NULL; - GExiv2Metadata* _tmp58_ = NULL; - gchar** _tmp59_ = NULL; - gint _tmp59__length1 = 0; - GExiv2Metadata* _tmp60_ = NULL; - gchar** _tmp61_ = NULL; - gint _tmp61__length1 = 0; + gchar** _tmp55_; + gint no_keywords_length1; + gint _no_keywords_size_; + gchar** _tmp56_; + gint _tmp56__length1; + gchar* _tmp57_; + GExiv2Metadata* _tmp58_; + gchar** _tmp59_; + gint _tmp59__length1; + GExiv2Metadata* _tmp60_; + gchar** _tmp61_; + gint _tmp61__length1; #line 972 "/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" @@ -7932,14 +7888,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp38__length1 = iptc_keywords_length1; #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_ != NULL) { -#line 7914 "FlickrPublishing.c" - gchar** _tmp39_ = NULL; - gint _tmp39__length1 = 0; +#line 7870 "FlickrPublishing.c" + gchar** _tmp39_; + gint _tmp39__length1; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = iptc_keywords; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39__length1 = iptc_keywords_length1; -#line 7921 "FlickrPublishing.c" +#line 7877 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -7951,17 +7907,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp39__length1; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) { -#line 7933 "FlickrPublishing.c" - gchar* _tmp40_ = NULL; +#line 7889 "FlickrPublishing.c" + gchar* _tmp40_; gchar* keyword = NULL; #line 975 "/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" keyword = _tmp40_; -#line 7940 "FlickrPublishing.c" +#line 7896 "FlickrPublishing.c" { - GeeSet* _tmp41_ = NULL; - const gchar* _tmp42_ = NULL; + GeeSet* _tmp41_; + const gchar* _tmp42_; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = keyword_set; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7970,7 +7926,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU 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" _g_free0 (keyword); -#line 7952 "FlickrPublishing.c" +#line 7908 "FlickrPublishing.c" } } } @@ -7991,14 +7947,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp46__length1 = xmp_keywords_length1; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 7973 "FlickrPublishing.c" - gchar** _tmp47_ = NULL; - gint _tmp47__length1 = 0; +#line 7929 "FlickrPublishing.c" + gchar** _tmp47_; + gint _tmp47__length1; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = xmp_keywords; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47__length1 = xmp_keywords_length1; -#line 7980 "FlickrPublishing.c" +#line 7936 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -8010,17 +7966,17 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp47__length1; #line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) { -#line 7992 "FlickrPublishing.c" - gchar* _tmp48_ = NULL; +#line 7948 "FlickrPublishing.c" + gchar* _tmp48_; gchar* keyword = NULL; #line 980 "/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" keyword = _tmp48_; -#line 7999 "FlickrPublishing.c" +#line 7955 "FlickrPublishing.c" { - GeeSet* _tmp49_ = NULL; - const gchar* _tmp50_ = NULL; + GeeSet* _tmp49_; + const gchar* _tmp50_; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = keyword_set; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8029,7 +7985,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU 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" _g_free0 (keyword); -#line 8011 "FlickrPublishing.c" +#line 7967 "FlickrPublishing.c" } } } @@ -8084,14 +8040,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp61__length1 = no_keywords_length1; #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_); -#line 8066 "FlickrPublishing.c" +#line 8022 "FlickrPublishing.c" { - GExiv2Metadata* _tmp62_ = NULL; - SpitPublishingPublishable* _tmp63_ = NULL; - GFile* _tmp64_ = NULL; - GFile* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; + GExiv2Metadata* _tmp62_; + SpitPublishingPublishable* _tmp63_; + GFile* _tmp64_; + GFile* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp62_ = publishable_metadata; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8112,7 +8068,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp65_); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8094 "FlickrPublishing.c" +#line 8050 "FlickrPublishing.c" goto __catch19_g_error; } } @@ -8120,11 +8076,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU __catch19_g_error: { GError* err = NULL; - SpitPublishingPublishable* _tmp68_ = NULL; - GFile* _tmp69_ = NULL; - GFile* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; + SpitPublishingPublishable* _tmp68_; + GFile* _tmp69_; + GFile* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" err = _inner_error_; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8148,7 +8104,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp70_); #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 8129 "FlickrPublishing.c" +#line 8085 "FlickrPublishing.c" } __finally19: #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8171,7 +8127,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU g_clear_error (&_inner_error_); #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 8152 "FlickrPublishing.c" +#line 8108 "FlickrPublishing.c" } #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); @@ -8183,26 +8139,26 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU 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" _g_object_unref0 (keyword_set); -#line 8164 "FlickrPublishing.c" +#line 8120 "FlickrPublishing.c" } #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (publishable_metadata); -#line 8168 "FlickrPublishing.c" +#line 8124 "FlickrPublishing.c" } static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { PublishingFlickrUploader * self; PublishingRESTSupportTransaction* result = NULL; - SpitPublishingPublishable* _tmp0_ = NULL; - SpitPublishingPublishable* _tmp1_ = NULL; - PublishingRESTSupportSession* _tmp2_ = NULL; - PublishingFlickrSession* _tmp3_ = NULL; - PublishingFlickrPublishingParameters* _tmp4_ = NULL; - SpitPublishingPublishable* _tmp5_ = NULL; - SpitPublishingPublishable* _tmp6_ = NULL; - PublishingFlickrUploadTransaction* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; + SpitPublishingPublishable* _tmp0_; + SpitPublishingPublishable* _tmp1_; + PublishingRESTSupportSession* _tmp2_; + PublishingFlickrSession* _tmp3_; + PublishingFlickrPublishingParameters* _tmp4_; + SpitPublishingPublishable* _tmp5_; + SpitPublishingPublishable* _tmp6_; + PublishingFlickrUploadTransaction* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; #line 1009 "/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" @@ -8237,7 +8193,7 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_ result = _tmp8_; #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8218 "FlickrPublishing.c" +#line 8174 "FlickrPublishing.c" } @@ -8249,19 +8205,19 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass #line 930 "/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" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; -#line 8231 "FlickrPublishing.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction; +#line 8187 "FlickrPublishing.c" } static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) { #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self); -#line 8238 "FlickrPublishing.c" +#line 8194 "FlickrPublishing.c" } -static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingFlickrUploader * self; #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader); @@ -8269,7 +8225,7 @@ static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj); -#line 8250 "FlickrPublishing.c" +#line 8206 "FlickrPublishing.c" } |