diff options
Diffstat (limited to 'plugins/shotwell-publishing-extras/GalleryConnector.c')
-rw-r--r-- | plugins/shotwell-publishing-extras/GalleryConnector.c | 5316 |
1 files changed, 2662 insertions, 2654 deletions
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index 29ade8e..17f2ef2 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.34.7, the Vala compiler +/* GalleryConnector.c generated by valac 0.36.6, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -242,6 +242,12 @@ typedef struct _PublishingGallery3UploaderClass PublishingGallery3UploaderClass; #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL))) typedef struct _PublishingGallery3PublishingOptionsPanePrivate PublishingGallery3PublishingOptionsPanePrivate; #define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL))) +enum { + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL, + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL, + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL +}; +static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate; typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters; typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate; @@ -255,7 +261,19 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid; typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL +}; +static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL +}; +static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {0}; typedef struct _PublishingGallery3SessionPrivate PublishingGallery3SessionPrivate; typedef struct _PublishingGallery3UploaderPrivate PublishingGallery3UploaderPrivate; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -587,15 +605,15 @@ struct _PublishingGallery3UploaderPrivate { static gpointer shotwell_publishing_gallery3_parent_class = NULL; -static SpitModuleIface* shotwell_publishing_gallery3_spit_module_parent_iface = NULL; +static SpitModuleIface * shotwell_publishing_gallery3_spit_module_parent_iface = NULL; static gpointer gallery3_service_parent_class = NULL; static GdkPixbuf** gallery3_service_icon_pixbuf_set; static gint gallery3_service_icon_pixbuf_set_length1; static GdkPixbuf** gallery3_service_icon_pixbuf_set = NULL; static gint gallery3_service_icon_pixbuf_set_length1 = 0; static gint _gallery3_service_icon_pixbuf_set_size_ = 0; -static SpitPluggableIface* gallery3_service_spit_pluggable_parent_iface = NULL; -static SpitPublishingServiceIface* gallery3_service_spit_publishing_service_parent_iface = NULL; +static SpitPluggableIface * gallery3_service_spit_pluggable_parent_iface = NULL; +static SpitPublishingServiceIface * gallery3_service_spit_publishing_service_parent_iface = NULL; static gpointer publishing_gallery3_album_parent_class = NULL; static gpointer publishing_gallery3_base_gallery_transaction_parent_class = NULL; static gpointer publishing_gallery3_key_fetch_transaction_parent_class = NULL; @@ -608,12 +626,12 @@ static gpointer publishing_gallery3_gallery_set_tag_relationship_transaction_par static gpointer publishing_gallery3_gallery_album_create_transaction_parent_class = NULL; static gpointer publishing_gallery3_gallery_upload_transaction_parent_class = NULL; static gpointer publishing_gallery3_gallery_publisher_parent_class = NULL; -static SpitPublishingPublisherIface* publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL; +static SpitPublishingPublisherIface * publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = NULL; static gpointer publishing_gallery3_publishing_options_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_gallery3_publishing_parameters_parent_class = NULL; static gpointer publishing_gallery3_credentials_pane_parent_class = NULL; -static SpitPublishingDialogPaneIface* publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL; +static SpitPublishingDialogPaneIface * publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = NULL; static gpointer publishing_gallery3_credentials_grid_parent_class = NULL; static gpointer publishing_gallery3_session_parent_class = NULL; static gpointer publishing_gallery3_uploader_parent_class = NULL; @@ -651,12 +669,12 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object Gallery3Service* gallery3_service_new (GFile* resource_directory); Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory); GType gallery3_service_get_type (void) G_GNUC_CONST; -static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value); +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value); static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base); static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base); static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base); static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1); -static void shotwell_publishing_gallery3_finalize (GObject* obj); +static void shotwell_publishing_gallery3_finalize (GObject * obj); enum { GALLERY3_SERVICE_DUMMY_PROPERTY }; @@ -672,7 +690,7 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (S PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); GType publishing_gallery3_gallery_publisher_get_type (void) G_GNUC_CONST; static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base); -static void gallery3_service_finalize (GObject* obj); +static void gallery3_service_finalize (GObject * obj); #define PUBLISHING_GALLERY3_SERVICE_NAME "Gallery3" #define PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into your Gallery.\n" \ "\n" \ @@ -709,7 +727,7 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self); const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self); gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self); -static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj); +static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj); GType publishing_gallery3_base_gallery_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_BASE_GALLERY_TRANSACTION_DUMMY_PROPERTY @@ -718,7 +736,7 @@ GType publishing_gallery3_session_get_type (void) G_GNUC_CONST; PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method); PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method); JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error); -static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_key_fetch_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransactionPrivate)) enum { @@ -727,7 +745,7 @@ enum { PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password); PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password); gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self); -static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_request_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_REQUEST_TRANSACTION_DUMMY_PROPERTY @@ -743,7 +761,7 @@ enum { PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session); PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session); gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1); -static void _vala_array_add2 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value); GType publishing_gallery3_get_albums_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransactionPrivate)) enum { @@ -755,13 +773,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1); static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value); guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self); -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value); static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value); PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error); -static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value); +static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value); static gchar** _vala_array_dup2 (gchar** self, int length); gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self); -static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_GET_TAG_TRANSACTION_DUMMY_PROPERTY @@ -778,7 +796,7 @@ enum { PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url); PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url); gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self); -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) G_GNUC_CONST; enum { PUBLISHING_GALLERY3_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION_DUMMY_PROPERTY @@ -804,7 +822,7 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self); gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self); PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self); -static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_gallery_upload_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransactionPrivate)) enum { @@ -821,7 +839,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error); gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self); static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error); -static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction* obj); +static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj); GType publishing_gallery3_publishing_options_pane_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisherPrivate)) enum { @@ -908,13 +926,13 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self); const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self); -static void _vala_array_add5 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value); +static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value); void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value); const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self); guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self); SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self); gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self); -static void publishing_gallery3_gallery_publisher_finalize (GObject* obj); +static void publishing_gallery3_gallery_publisher_finalize (GObject * obj); #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPanePrivate)) enum { PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY @@ -950,7 +968,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base); static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj); +static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj); #define PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParametersPrivate)) enum { PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_DUMMY_PROPERTY @@ -961,7 +979,7 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value); const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self); static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value); -static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters* obj); +static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj); GType publishing_gallery3_credentials_grid_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPanePrivate)) enum { @@ -980,11 +998,11 @@ static void _publishing_gallery3_credentials_pane_notify_login_publishing_galler void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self); static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base); static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void publishing_gallery3_credentials_pane_finalize (GObject* obj); +static void publishing_gallery3_credentials_pane_finalize (GObject * obj); #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGridPrivate)) enum { PUBLISHING_GALLERY3_CREDENTIALS_GRID_DUMMY_PROPERTY, - PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET + PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY }; #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE _ ("Enter the URL for your Gallery3 site and the username and password (or" \ " API key) for your Gallery3 account.") @@ -1000,7 +1018,7 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self); static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void publishing_gallery3_credentials_grid_finalize (GObject* obj); +static void publishing_gallery3_credentials_grid_finalize (GObject * obj); static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); #define PUBLISHING_GALLERY3_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3SessionPrivate)) @@ -1011,42 +1029,42 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value); static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value); static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value); -static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* obj); +static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj); #define PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3UploaderPrivate)) enum { PUBLISHING_GALLERY3_UPLOADER_DUMMY_PROPERTY }; static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable); -static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader* obj); +static void publishing_gallery3_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 void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) { +static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (SpitPluggable*, *array, (*size) + 1); -#line 1002 "GalleryConnector.c" +#line 1020 "GalleryConnector.c" } #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 1008 "GalleryConnector.c" +#line 1026 "GalleryConnector.c" } ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) { ShotwellPublishingGallery3 * self = NULL; GFile* resource_directory = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - SpitPluggable** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - Gallery3Service* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + SpitPluggable** _tmp2_; + gint _tmp2__length1; + Gallery3Service* _tmp3_; #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (G_IS_FILE (module_file), NULL); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1069,30 +1087,27 @@ ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object _g_object_unref0 (resource_directory); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1042 "GalleryConnector.c" +#line 1060 "GalleryConnector.c" } ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file) { #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return shotwell_publishing_gallery3_construct (TYPE_SHOTWELL_PUBLISHING_GALLERY3, module_file); -#line 1049 "GalleryConnector.c" +#line 1067 "GalleryConnector.c" } static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) { ShotwellPublishingGallery3 * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = _ ("Gallery3 publishing module"); -#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp0_; + result = _ ("Gallery3 publishing module"); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1065 "GalleryConnector.c" +#line 1080 "GalleryConnector.c" } @@ -1105,7 +1120,7 @@ static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* b result = G3_VERSION; #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1078 "GalleryConnector.c" +#line 1093 "GalleryConnector.c" } @@ -1118,17 +1133,17 @@ static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base) result = "org.yorba.shotwell.sharing.gallery3"; #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1091 "GalleryConnector.c" +#line 1106 "GalleryConnector.c" } static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) { ShotwellPublishingGallery3 * self; SpitPluggable** result = NULL; - SpitPluggable** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - SpitPluggable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + SpitPluggable** _tmp0_; + gint _tmp0__length1; + SpitPluggable** _tmp1_; + gint _tmp1__length1; #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1143,13 +1158,13 @@ static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitMod if (result_length1) { #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp1__length1; -#line 1116 "GalleryConnector.c" +#line 1131 "GalleryConnector.c" } #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1122 "GalleryConnector.c" +#line 1137 "GalleryConnector.c" } @@ -1160,7 +1175,7 @@ static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3C g_type_class_add_private (klass, sizeof (ShotwellPublishingGallery3Private)); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_gallery3_finalize; -#line 1133 "GalleryConnector.c" +#line 1148 "GalleryConnector.c" } @@ -1168,19 +1183,19 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" shotwell_publishing_gallery3_spit_module_parent_iface = g_type_interface_peek_parent (iface); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_module_name; + iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_module_name; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_version; + iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_version; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_publishing_gallery3_real_get_id; + iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_gallery3_real_get_id; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_publishing_gallery3_real_get_pluggables; -#line 1148 "GalleryConnector.c" + iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_gallery3_real_get_pluggables; +#line 1163 "GalleryConnector.c" } static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) { - SpitPluggable** _tmp0_ = NULL; + SpitPluggable** _tmp0_; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self); #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1191,11 +1206,11 @@ static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGaller self->priv->pluggables_length1 = 0; #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_pluggables_size_ = self->priv->pluggables_length1; -#line 1164 "GalleryConnector.c" +#line 1179 "GalleryConnector.c" } -static void shotwell_publishing_gallery3_finalize (GObject* obj) { +static void shotwell_publishing_gallery3_finalize (GObject * obj) { ShotwellPublishingGallery3 * self; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3); @@ -1203,7 +1218,7 @@ static void shotwell_publishing_gallery3_finalize (GObject* obj) { self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (shotwell_publishing_gallery3_parent_class)->finalize (obj); -#line 1176 "GalleryConnector.c" +#line 1191 "GalleryConnector.c" } @@ -1223,8 +1238,8 @@ GType shotwell_publishing_gallery3_get_type (void) { Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) { Gallery3Service * self = NULL; - GdkPixbuf** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + GdkPixbuf** _tmp0_; + gint _tmp0__length1; #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (G_IS_FILE (resource_directory), NULL); #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1235,9 +1250,9 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_ _tmp0__length1 = gallery3_service_icon_pixbuf_set_length1; #line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp0_ == NULL) { -#line 1208 "GalleryConnector.c" - gint _tmp1_ = 0; - GdkPixbuf** _tmp2_ = NULL; +#line 1223 "GalleryConnector.c" + gint _tmp1_; + GdkPixbuf** _tmp2_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" GALLERY3_SERVICE_ICON_FILENAME, &_tmp1_); #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1248,27 +1263,27 @@ Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_ gallery3_service_icon_pixbuf_set_length1 = _tmp1_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _gallery3_service_icon_pixbuf_set_size_ = gallery3_service_icon_pixbuf_set_length1; -#line 1221 "GalleryConnector.c" +#line 1236 "GalleryConnector.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1225 "GalleryConnector.c" +#line 1240 "GalleryConnector.c" } Gallery3Service* gallery3_service_new (GFile* resource_directory) { #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return gallery3_service_construct (TYPE_GALLERY3_SERVICE, resource_directory); -#line 1232 "GalleryConnector.c" +#line 1247 "GalleryConnector.c" } static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { Gallery3Service * self; gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1281,7 +1296,7 @@ static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, result = _tmp2_; #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1254 "GalleryConnector.c" +#line 1269 "GalleryConnector.c" } @@ -1294,7 +1309,7 @@ static const gchar* gallery3_service_real_get_id (SpitPluggable* base) { result = "publishing-gallery3"; #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1267 "GalleryConnector.c" +#line 1282 "GalleryConnector.c" } @@ -1307,14 +1322,14 @@ static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* bas result = "Gallery3"; #line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1280 "GalleryConnector.c" +#line 1295 "GalleryConnector.c" } static gpointer _g_object_ref0 (gpointer self) { #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? g_object_ref (self) : NULL; -#line 1287 "GalleryConnector.c" +#line 1302 "GalleryConnector.c" } @@ -1325,32 +1340,32 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 1298 "GalleryConnector.c" - GdkPixbuf* _tmp0_ = NULL; +#line 1313 "GalleryConnector.c" + GdkPixbuf* _tmp0_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 1304 "GalleryConnector.c" +#line 1319 "GalleryConnector.c" } #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1308 "GalleryConnector.c" +#line 1323 "GalleryConnector.c" } static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { Gallery3Service * self; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GdkPixbuf** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GdkPixbuf** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + GdkPixbuf** _tmp6_; + gint _tmp6__length1; + GdkPixbuf** _tmp7_; + gint _tmp7__length1; #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1407,7 +1422,7 @@ static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableIn (*info).icons = _tmp7_; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*info).icons_length1 = _tmp7__length1; -#line 1380 "GalleryConnector.c" +#line 1395 "GalleryConnector.c" } @@ -1415,15 +1430,15 @@ static void gallery3_service_real_activation (SpitPluggable* base, gboolean enab Gallery3Service * self; #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); -#line 1388 "GalleryConnector.c" +#line 1403 "GalleryConnector.c" } static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { Gallery3Service * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - PublishingGallery3GalleryPublisher* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + PublishingGallery3GalleryPublisher* _tmp1_; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1436,7 +1451,7 @@ static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPubl result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1409 "GalleryConnector.c" +#line 1424 "GalleryConnector.c" } @@ -1449,7 +1464,7 @@ static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_medi result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1422 "GalleryConnector.c" +#line 1437 "GalleryConnector.c" } @@ -1458,7 +1473,7 @@ static void gallery3_service_class_init (Gallery3ServiceClass * klass) { gallery3_service_parent_class = g_type_class_peek_parent (klass); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = gallery3_service_finalize; -#line 1431 "GalleryConnector.c" +#line 1446 "GalleryConnector.c" } @@ -1466,16 +1481,16 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gallery3_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) gallery3_service_real_get_pluggable_interface; + iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) gallery3_service_real_get_pluggable_interface; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_id = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_id; + iface->get_id = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_id; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) gallery3_service_real_get_pluggable_name; + iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) gallery3_service_real_get_pluggable_name; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) gallery3_service_real_get_info; + iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) gallery3_service_real_get_info; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->activation = (void (*)(SpitPluggable*, gboolean)) gallery3_service_real_activation; -#line 1448 "GalleryConnector.c" + iface->activation = (void (*) (SpitPluggable *, gboolean)) gallery3_service_real_activation; +#line 1463 "GalleryConnector.c" } @@ -1483,10 +1498,10 @@ static void gallery3_service_spit_publishing_service_interface_init (SpitPublish #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gallery3_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher; + iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) gallery3_service_real_create_publisher; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) gallery3_service_real_get_supported_media; -#line 1459 "GalleryConnector.c" + iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) gallery3_service_real_get_supported_media; +#line 1474 "GalleryConnector.c" } @@ -1494,13 +1509,13 @@ static void gallery3_service_instance_init (Gallery3Service * self) { } -static void gallery3_service_finalize (GObject* obj) { +static void gallery3_service_finalize (GObject * obj) { Gallery3Service * self; #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GALLERY3_SERVICE, Gallery3Service); #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (gallery3_service_parent_class)->finalize (obj); -#line 1473 "GalleryConnector.c" +#line 1488 "GalleryConnector.c" } @@ -1523,17 +1538,17 @@ GType gallery3_service_get_type (void) { PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) { PublishingGallery3Album* self = NULL; JsonObject* entity = NULL; - JsonObject* _tmp0_ = NULL; - JsonObject* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - JsonObject* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + JsonObject* _tmp0_; + JsonObject* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + JsonObject* _tmp5_; + const gchar* _tmp6_; + gboolean _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (collection != NULL, NULL); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1578,20 +1593,20 @@ PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, _g_free0 (_tmp10_); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1551 "GalleryConnector.c" +#line 1566 "GalleryConnector.c" } PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection) { #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_album_construct (PUBLISHING_GALLERY3_TYPE_ALBUM, collection); -#line 1558 "GalleryConnector.c" +#line 1573 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1600,13 +1615,13 @@ const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) result = _tmp0_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1573 "GalleryConnector.c" +#line 1588 "GalleryConnector.c" } static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1617,13 +1632,13 @@ static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, c _g_free0 (self->priv->_name); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_name = _tmp1_; -#line 1590 "GalleryConnector.c" +#line 1605 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1632,13 +1647,13 @@ const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) result = _tmp0_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1605 "GalleryConnector.c" +#line 1620 "GalleryConnector.c" } static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1649,13 +1664,13 @@ static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, _g_free0 (self->priv->_title); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_title = _tmp1_; -#line 1622 "GalleryConnector.c" +#line 1637 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1664,13 +1679,13 @@ const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* sel result = _tmp0_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1637 "GalleryConnector.c" +#line 1652 "GalleryConnector.c" } static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1681,13 +1696,13 @@ static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self _g_free0 (self->priv->_summary); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_summary = _tmp1_; -#line 1654 "GalleryConnector.c" +#line 1669 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1696,13 +1711,13 @@ const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* result = _tmp0_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1669 "GalleryConnector.c" +#line 1684 "GalleryConnector.c" } static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1713,13 +1728,13 @@ static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* s _g_free0 (self->priv->_parentname); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_parentname = _tmp1_; -#line 1686 "GalleryConnector.c" +#line 1701 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1728,13 +1743,13 @@ const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) { result = _tmp0_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1701 "GalleryConnector.c" +#line 1716 "GalleryConnector.c" } static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1745,13 +1760,13 @@ static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, co _g_free0 (self->priv->_url); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_url = _tmp1_; -#line 1718 "GalleryConnector.c" +#line 1733 "GalleryConnector.c" } const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), NULL); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1760,13 +1775,13 @@ const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) result = _tmp0_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1733 "GalleryConnector.c" +#line 1748 "GalleryConnector.c" } static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1777,13 +1792,13 @@ static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, c _g_free0 (self->priv->_path); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_path = _tmp1_; -#line 1750 "GalleryConnector.c" +#line 1765 "GalleryConnector.c" } gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self), FALSE); #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1792,26 +1807,26 @@ gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) result = _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1765 "GalleryConnector.c" +#line 1780 "GalleryConnector.c" } static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_ALBUM (self)); #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_editable = _tmp0_; -#line 1777 "GalleryConnector.c" +#line 1792 "GalleryConnector.c" } static void publishing_gallery3_value_album_init (GValue* value) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1784 "GalleryConnector.c" +#line 1799 "GalleryConnector.c" } @@ -1820,7 +1835,7 @@ static void publishing_gallery3_value_album_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (value->data[0].v_pointer); -#line 1793 "GalleryConnector.c" +#line 1808 "GalleryConnector.c" } } @@ -1830,11 +1845,11 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_value, if (src_value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = publishing_gallery3_album_ref (src_value->data[0].v_pointer); -#line 1803 "GalleryConnector.c" +#line 1818 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 1807 "GalleryConnector.c" +#line 1822 "GalleryConnector.c" } } @@ -1842,66 +1857,66 @@ static void publishing_gallery3_value_album_copy_value (const GValue* src_value, static gpointer publishing_gallery3_value_album_peek_pointer (const GValue* value) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 1815 "GalleryConnector.c" +#line 1830 "GalleryConnector.c" } static gchar* publishing_gallery3_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (collect_values[0].v_pointer) { -#line 1822 "GalleryConnector.c" - PublishingGallery3Album* object; +#line 1837 "GalleryConnector.c" + PublishingGallery3Album * object; object = collect_values[0].v_pointer; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (object->parent_instance.g_class == NULL) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1829 "GalleryConnector.c" +#line 1844 "GalleryConnector.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 1833 "GalleryConnector.c" +#line 1848 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = publishing_gallery3_album_ref (object); -#line 1837 "GalleryConnector.c" +#line 1852 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1841 "GalleryConnector.c" +#line 1856 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1845 "GalleryConnector.c" +#line 1860 "GalleryConnector.c" } static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingGallery3Album** object_p; + PublishingGallery3Album ** object_p; object_p = collect_values[0].v_pointer; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!object_p) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1856 "GalleryConnector.c" +#line 1871 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!value->data[0].v_pointer) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = NULL; -#line 1862 "GalleryConnector.c" +#line 1877 "GalleryConnector.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = value->data[0].v_pointer; -#line 1866 "GalleryConnector.c" +#line 1881 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = publishing_gallery3_album_ref (value->data[0].v_pointer); -#line 1870 "GalleryConnector.c" +#line 1885 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1874 "GalleryConnector.c" +#line 1889 "GalleryConnector.c" } @@ -1915,7 +1930,7 @@ GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar G_PARAM_SPEC (spec)->value_type = object_type; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return G_PARAM_SPEC (spec); -#line 1888 "GalleryConnector.c" +#line 1903 "GalleryConnector.c" } @@ -1924,12 +1939,12 @@ gpointer publishing_gallery3_value_get_album (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 1897 "GalleryConnector.c" +#line 1912 "GalleryConnector.c" } void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) { - PublishingGallery3Album* old; + PublishingGallery3Album * old; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM)); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1944,23 +1959,23 @@ void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_ref (value->data[0].v_pointer); -#line 1917 "GalleryConnector.c" +#line 1932 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1921 "GalleryConnector.c" +#line 1936 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (old); -#line 1927 "GalleryConnector.c" +#line 1942 "GalleryConnector.c" } } void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) { - PublishingGallery3Album* old; + PublishingGallery3Album * old; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_ALBUM)); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1973,17 +1988,17 @@ void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = v_object; -#line 1946 "GalleryConnector.c" +#line 1961 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1950 "GalleryConnector.c" +#line 1965 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_unref (old); -#line 1956 "GalleryConnector.c" +#line 1971 "GalleryConnector.c" } } @@ -1995,17 +2010,17 @@ static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * ((PublishingGallery3AlbumClass *) klass)->finalize = publishing_gallery3_album_finalize; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3AlbumPrivate)); -#line 1968 "GalleryConnector.c" +#line 1983 "GalleryConnector.c" } static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE (self); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2036,11 +2051,11 @@ static void publishing_gallery3_album_instance_init (PublishingGallery3Album * s self->priv->_editable = FALSE; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->ref_count = 1; -#line 2009 "GalleryConnector.c" +#line 2024 "GalleryConnector.c" } -static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj) { +static void publishing_gallery3_album_finalize (PublishingGallery3Album * obj) { PublishingGallery3Album * self; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3Album); @@ -2058,7 +2073,7 @@ static void publishing_gallery3_album_finalize (PublishingGallery3Album* obj) { _g_free0 (self->priv->_url); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_path); -#line 2031 "GalleryConnector.c" +#line 2046 "GalleryConnector.c" } @@ -2077,18 +2092,18 @@ GType publishing_gallery3_album_get_type (void) { gpointer publishing_gallery3_album_ref (gpointer instance) { - PublishingGallery3Album* self; + PublishingGallery3Album * self; self = instance; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_atomic_int_inc (&self->ref_count); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return instance; -#line 2056 "GalleryConnector.c" +#line 2071 "GalleryConnector.c" } void publishing_gallery3_album_unref (gpointer instance) { - PublishingGallery3Album* self; + PublishingGallery3Album * self; self = instance; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2096,42 +2111,42 @@ void publishing_gallery3_album_unref (gpointer instance) { PUBLISHING_GALLERY3_ALBUM_GET_CLASS (self)->finalize (self); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2069 "GalleryConnector.c" +#line 2084 "GalleryConnector.c" } } static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; - glong _tmp0_ = 0L; - gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp0_; + gchar _tmp1_; +#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2088 "GalleryConnector.c" +#line 2103 "GalleryConnector.c" } PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) { PublishingGallery3BaseGalleryTransaction* self = NULL; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingRESTSupportHttpMethod _tmp12_ = 0; - JsonParser* _tmp13_ = NULL; + const gchar* _tmp1_; + PublishingGallery3Session* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingRESTSupportHttpMethod _tmp12_; + JsonParser* _tmp13_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2142,32 +2157,32 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans _tmp1_ = item_path; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp1_, "") != 0) { -#line 2115 "GalleryConnector.c" - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; +#line 2130 "GalleryConnector.c" + const gchar* _tmp2_; + gchar _tmp3_; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = item_path; #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = string_get (_tmp2_, (glong) 0); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _tmp3_ != '/'; -#line 2124 "GalleryConnector.c" +#line 2139 "GalleryConnector.c" } else { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = FALSE; -#line 2128 "GalleryConnector.c" +#line 2143 "GalleryConnector.c" } #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp0_) { -#line 2132 "GalleryConnector.c" - const gchar* _tmp4_ = NULL; +#line 2147 "GalleryConnector.c" + const gchar* _tmp4_; #line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:164: Bad item path, this is a bug!"); #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = item_path; #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:165: %s", _tmp4_); -#line 2140 "GalleryConnector.c" +#line 2155 "GalleryConnector.c" } #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = session; @@ -2199,14 +2214,14 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans self->parser = _tmp13_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2172 "GalleryConnector.c" +#line 2187 "GalleryConnector.c" } PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_transaction_new (PublishingGallery3Session* session, const gchar* endpoint_url, const gchar* item_path, PublishingRESTSupportHttpMethod method) { #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_base_gallery_transaction_construct (PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, session, endpoint_url, item_path, method); -#line 2179 "GalleryConnector.c" +#line 2194 "GalleryConnector.c" } @@ -2214,12 +2229,12 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing JsonNode* result = NULL; gchar* json_object = NULL; JsonNode* root_node = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - JsonParser* _tmp15_ = NULL; - JsonNode* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; + const gchar* _tmp2_; + JsonParser* _tmp15_; + JsonNode* _tmp16_; + gboolean _tmp17_; GError * _inner_error_ = NULL; #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_BASE_GALLERY_TRANSACTION (self), NULL); @@ -2235,11 +2250,11 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing if (NULL == _tmp2_) { #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = TRUE; -#line 2208 "GalleryConnector.c" +#line 2223 "GalleryConnector.c" } else { - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = json_object; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2248,15 +2263,15 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _tmp5_ = _tmp4_; #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = 0 == _tmp5_; -#line 2221 "GalleryConnector.c" +#line 2236 "GalleryConnector.c" } #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp1_) { -#line 2225 "GalleryConnector.c" - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; +#line 2240 "GalleryConnector.c" + gchar* _tmp6_; + gchar* _tmp7_; + GError* _tmp8_; + GError* _tmp9_; #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2277,7 +2292,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2250 "GalleryConnector.c" +#line 2265 "GalleryConnector.c" } else { #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2287,12 +2302,12 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2260 "GalleryConnector.c" +#line 2275 "GalleryConnector.c" } } { - JsonParser* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; + JsonParser* _tmp10_; + const gchar* _tmp11_; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = self->parser; #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2301,7 +2316,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing json_parser_load_from_data (_tmp10_, _tmp11_, (gssize) -1, &_inner_error_); #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2274 "GalleryConnector.c" +#line 2289 "GalleryConnector.c" goto __catch0_g_error; } } @@ -2309,9 +2324,9 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing __catch0_g_error: { GError* e = NULL; - GError* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GError* _tmp14_ = NULL; + GError* _tmp12_; + const gchar* _tmp13_; + GError* _tmp14_; #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2330,7 +2345,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _inner_error_ = _tmp14_; #line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 2303 "GalleryConnector.c" +#line 2318 "GalleryConnector.c" goto __finally0; } __finally0: @@ -2344,7 +2359,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2317 "GalleryConnector.c" +#line 2332 "GalleryConnector.c" } else { #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2354,7 +2369,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2327 "GalleryConnector.c" +#line 2342 "GalleryConnector.c" } } #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2367,8 +2382,8 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _tmp17_ = json_node_is_null (root_node); #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_) { -#line 2340 "GalleryConnector.c" - GError* _tmp18_ = NULL; +#line 2355 "GalleryConnector.c" + GError* _tmp18_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Root node is null, doesn't appear to be JSON data"); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2381,7 +2396,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2354 "GalleryConnector.c" +#line 2369 "GalleryConnector.c" } else { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2391,7 +2406,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2364 "GalleryConnector.c" +#line 2379 "GalleryConnector.c" } } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2400,7 +2415,7 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing _g_free0 (json_object); #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2373 "GalleryConnector.c" +#line 2388 "GalleryConnector.c" } @@ -2409,7 +2424,7 @@ static void publishing_gallery3_base_gallery_transaction_class_init (PublishingG publishing_gallery3_base_gallery_transaction_parent_class = g_type_class_peek_parent (klass); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_base_gallery_transaction_finalize; -#line 2382 "GalleryConnector.c" +#line 2397 "GalleryConnector.c" } @@ -2417,7 +2432,7 @@ static void publishing_gallery3_base_gallery_transaction_instance_init (Publishi } -static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3BaseGalleryTransaction * self; #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction); @@ -2425,7 +2440,7 @@ static void publishing_gallery3_base_gallery_transaction_finalize (PublishingRES _g_object_unref0 (self->parser); #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_base_gallery_transaction_parent_class)->finalize (obj); -#line 2398 "GalleryConnector.c" +#line 2413 "GalleryConnector.c" } @@ -2443,10 +2458,10 @@ GType publishing_gallery3_base_gallery_transaction_get_type (void) { PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) { PublishingGallery3KeyFetchTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2471,156 +2486,156 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2444 "GalleryConnector.c" +#line 2459 "GalleryConnector.c" } PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) { #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_key_fetch_transaction_construct (PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, session, url, username, password); -#line 2451 "GalleryConnector.c" +#line 2466 "GalleryConnector.c" } static gchar* string_slice (const gchar* self, glong start, glong end) { gchar* result = NULL; glong string_length = 0L; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - glong _tmp2_ = 0L; - glong _tmp5_ = 0L; + gint _tmp0_; + gint _tmp1_; + glong _tmp2_; + glong _tmp5_; gboolean _tmp8_ = FALSE; - glong _tmp9_ = 0L; + glong _tmp9_; gboolean _tmp12_ = FALSE; - glong _tmp13_ = 0L; - glong _tmp16_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp13_; + glong _tmp16_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + gchar* _tmp21_; +#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 2484 "GalleryConnector.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2499 "GalleryConnector.c" + glong _tmp3_; + glong _tmp4_; +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 2493 "GalleryConnector.c" +#line 2508 "GalleryConnector.c" } -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 2499 "GalleryConnector.c" - glong _tmp6_ = 0L; - glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2514 "GalleryConnector.c" + glong _tmp6_; + glong _tmp7_; +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 2508 "GalleryConnector.c" +#line 2523 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 2514 "GalleryConnector.c" - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2529 "GalleryConnector.c" + glong _tmp10_; + glong _tmp11_; +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 2523 "GalleryConnector.c" +#line 2538 "GalleryConnector.c" } else { -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 2527 "GalleryConnector.c" +#line 2542 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 2535 "GalleryConnector.c" - glong _tmp14_ = 0L; - glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2550 "GalleryConnector.c" + glong _tmp14_; + glong _tmp15_; +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 2544 "GalleryConnector.c" +#line 2559 "GalleryConnector.c" } else { -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 2548 "GalleryConnector.c" +#line 2563 "GalleryConnector.c" } -#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2570 "GalleryConnector.c" +#line 2585 "GalleryConnector.c" } gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp3_; gboolean _tmp4_ = FALSE; gboolean _tmp5_ = FALSE; - const gchar* _tmp6_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + const gchar* _tmp6_; + const gchar* _tmp14_; + gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_KEY_FETCH_TRANSACTION (self), NULL); #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->key; #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp0_, "") != 0) { -#line 2591 "GalleryConnector.c" - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; +#line 2606 "GalleryConnector.c" + const gchar* _tmp1_; + gchar* _tmp2_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = self->priv->key; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2629,7 +2644,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp2_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2602 "GalleryConnector.c" +#line 2617 "GalleryConnector.c" } #line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); @@ -2643,24 +2658,24 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF if (NULL == _tmp6_) { #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = TRUE; -#line 2616 "GalleryConnector.c" +#line 2631 "GalleryConnector.c" } else { - const gchar* _tmp7_ = NULL; + const gchar* _tmp7_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = self->priv->key; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = g_strcmp0 ("", _tmp7_) == 0; -#line 2623 "GalleryConnector.c" +#line 2638 "GalleryConnector.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp5_) { #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = TRUE; -#line 2629 "GalleryConnector.c" +#line 2644 "GalleryConnector.c" } else { - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->key; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2669,14 +2684,14 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF _tmp10_ = _tmp9_; #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = 0 == _tmp10_; -#line 2642 "GalleryConnector.c" +#line 2657 "GalleryConnector.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp4_) { -#line 2646 "GalleryConnector.c" - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 2661 "GalleryConnector.c" + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2691,7 +2706,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp13_; #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2664 "GalleryConnector.c" +#line 2679 "GalleryConnector.c" } #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->key; @@ -2709,7 +2724,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF result = _tmp17_; #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 2682 "GalleryConnector.c" +#line 2697 "GalleryConnector.c" } @@ -2720,23 +2735,23 @@ static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGall ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_key_fetch_transaction_finalize; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3KeyFetchTransactionPrivate)); -#line 2693 "GalleryConnector.c" +#line 2708 "GalleryConnector.c" } static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (""); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->key = _tmp0_; -#line 2705 "GalleryConnector.c" +#line 2720 "GalleryConnector.c" } -static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3KeyFetchTransaction * self; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION, PublishingGallery3KeyFetchTransaction); @@ -2744,7 +2759,7 @@ static void publishing_gallery3_key_fetch_transaction_finalize (PublishingRESTSu _g_free0 (self->priv->key); #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_key_fetch_transaction_parent_class)->finalize (obj); -#line 2717 "GalleryConnector.c" +#line 2732 "GalleryConnector.c" } @@ -2762,8 +2777,8 @@ GType publishing_gallery3_key_fetch_transaction_get_type (void) { PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) { PublishingGallery3GalleryRequestTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2776,17 +2791,17 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request if (!_tmp1_) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:254: Not authenticated"); -#line 2749 "GalleryConnector.c" +#line 2764 "GalleryConnector.c" } else { - PublishingGallery3Session* _tmp2_ = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingRESTSupportHttpMethod _tmp7_ = 0; - PublishingGallery3Session* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + PublishingGallery3Session* _tmp2_; + PublishingGallery3Session* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + PublishingRESTSupportHttpMethod _tmp7_; + PublishingGallery3Session* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = session; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2811,25 +2826,25 @@ PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp10_); #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Method", "GET"); -#line 2784 "GalleryConnector.c" +#line 2799 "GalleryConnector.c" } #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2788 "GalleryConnector.c" +#line 2803 "GalleryConnector.c" } PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) { #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_request_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_REQUEST_TRANSACTION, session, item, method); -#line 2795 "GalleryConnector.c" +#line 2810 "GalleryConnector.c" } static void publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass) { #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_request_transaction_parent_class = g_type_class_peek_parent (klass); -#line 2802 "GalleryConnector.c" +#line 2817 "GalleryConnector.c" } @@ -2851,7 +2866,7 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) { PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) { PublishingGallery3GetAlbumURLsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; + PublishingGallery3Session* _tmp0_; #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2864,31 +2879,31 @@ PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_t publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all"); #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2837 "GalleryConnector.c" +#line 2852 "GalleryConnector.c" } PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session) { #line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_get_album_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION, session); -#line 2844 "GalleryConnector.c" +#line 2859 "GalleryConnector.c" } -static void _vala_array_add2 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add2 (gchar** * array, int* length, int* size, gchar* value) { #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2855 "GalleryConnector.c" +#line 2870 "GalleryConnector.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 2861 "GalleryConnector.c" +#line 2876 "GalleryConnector.c" } @@ -2896,20 +2911,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi gchar** result = NULL; JsonNode* root_node = NULL; JsonArray* all_members = NULL; - JsonObject* _tmp2_ = NULL; - JsonArray* _tmp3_ = NULL; + JsonObject* _tmp2_; + JsonArray* _tmp3_; gchar** member_urls = NULL; - gint member_urls_length1 = 0; - gint _member_urls_size_ = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; + gint member_urls_length1; + gint _member_urls_size_; + gchar** _tmp14_; + gint _tmp14__length1; GError * _inner_error_ = NULL; #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUM_UR_LS_TRANSACTION (self), NULL); -#line 2879 "GalleryConnector.c" +#line 2894 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2918,7 +2933,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2891 "GalleryConnector.c" +#line 2906 "GalleryConnector.c" goto __catch1_spit_publishing_publishing_error; } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2927,11 +2942,11 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2900 "GalleryConnector.c" +#line 2915 "GalleryConnector.c" } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 2904 "GalleryConnector.c" +#line 2919 "GalleryConnector.c" } goto __finally1; __catch1_spit_publishing_publishing_error: @@ -2945,7 +2960,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_error ("GalleryConnector.vala:285: Could not get root node"); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 2918 "GalleryConnector.c" +#line 2933 "GalleryConnector.c" } __finally1: #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2956,7 +2971,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 2929 "GalleryConnector.c" +#line 2944 "GalleryConnector.c" } #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -2970,37 +2985,37 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi member_urls_length1 = 0; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _member_urls_size_ = member_urls_length1; -#line 2943 "GalleryConnector.c" +#line 2958 "GalleryConnector.c" { guint i = 0U; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 2948 "GalleryConnector.c" +#line 2963 "GalleryConnector.c" { gboolean _tmp4_ = FALSE; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = TRUE; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 2955 "GalleryConnector.c" - guint _tmp6_ = 0U; - JsonArray* _tmp7_ = NULL; - guint _tmp8_ = 0U; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - JsonArray* _tmp10_ = NULL; - guint _tmp11_ = 0U; - const gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; +#line 2970 "GalleryConnector.c" + guint _tmp6_; + JsonArray* _tmp7_; + guint _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + JsonArray* _tmp10_; + guint _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp4_) { -#line 2967 "GalleryConnector.c" - guint _tmp5_ = 0U; +#line 2982 "GalleryConnector.c" + guint _tmp5_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = i; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp5_ + 1; -#line 2973 "GalleryConnector.c" +#line 2988 "GalleryConnector.c" } #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = FALSE; @@ -3014,7 +3029,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (!(_tmp6_ <= (_tmp8_ - 1))) { #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 2987 "GalleryConnector.c" +#line 3002 "GalleryConnector.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = member_urls; @@ -3030,7 +3045,7 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi _tmp13_ = g_strdup (_tmp12_); #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp13_); -#line 3003 "GalleryConnector.c" +#line 3018 "GalleryConnector.c" } } } @@ -3042,20 +3057,20 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi if (result_length1) { #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp14__length1; -#line 3015 "GalleryConnector.c" +#line 3030 "GalleryConnector.c" } #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp14_; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 3021 "GalleryConnector.c" +#line 3036 "GalleryConnector.c" } static void publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass) { #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_album_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass); -#line 3028 "GalleryConnector.c" +#line 3043 "GalleryConnector.c" } @@ -3075,458 +3090,458 @@ GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) { } -static void _vala_array_add3 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add3 (gchar** * array, int* length, int* size, gchar* value) { #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 3055 "GalleryConnector.c" +#line 3070 "GalleryConnector.c" } #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 3061 "GalleryConnector.c" +#line 3076 "GalleryConnector.c" } static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp3_; + gint _tmp3__length1; +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" separator = ""; -#line 3078 "GalleryConnector.c" +#line 3093 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 3088 "GalleryConnector.c" +#line 3103 "GalleryConnector.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp4_; + gint _tmp4__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 3098 "GalleryConnector.c" +#line 3113 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 3104 "GalleryConnector.c" +#line 3119 "GalleryConnector.c" } else { gboolean _tmp5_ = FALSE; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp6_; + gint _tmp6__length1; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 3115 "GalleryConnector.c" - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3130 "GalleryConnector.c" + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 3127 "GalleryConnector.c" +#line 3142 "GalleryConnector.c" } else { -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 3131 "GalleryConnector.c" +#line 3146 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 3135 "GalleryConnector.c" +#line 3150 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 3139 "GalleryConnector.c" +#line 3154 "GalleryConnector.c" gint i = 0; gsize len = 0UL; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gsize _tmp35_ = 0UL; - const gchar* _tmp36_ = NULL; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + gint _tmp31_; + gint _tmp33_; + gint _tmp34_; + gsize _tmp35_; + const gchar* _tmp36_; + gint _tmp37_; + gint _tmp38_; + gint _tmp39_; const gchar* res = NULL; - gsize _tmp40_ = 0UL; - void* _tmp41_ = NULL; + gsize _tmp40_; + void* _tmp41_; void* ptr = NULL; - const gchar* _tmp42_ = NULL; - gchar** _tmp43_ = NULL; - gint _tmp43__length1 = 0; - const gchar* _tmp44_ = NULL; - void* _tmp45_ = NULL; - const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp42_; + gchar** _tmp43_; + gint _tmp43__length1; + const gchar* _tmp44_; + void* _tmp45_; + const gchar* _tmp62_; +#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 3162 "GalleryConnector.c" +#line 3177 "GalleryConnector.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3171 "GalleryConnector.c" +#line 3186 "GalleryConnector.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; gint _tmp21_ = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint _tmp23_ = 0; - const gchar* _tmp24_ = NULL; - gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp22_; + gint _tmp22__length1; + gint _tmp23_; + const gchar* _tmp24_; + gsize _tmp30_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 3184 "GalleryConnector.c" - gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3199 "GalleryConnector.c" + gint _tmp10_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 3190 "GalleryConnector.c" +#line 3205 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 3200 "GalleryConnector.c" - gint _tmp14_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3215 "GalleryConnector.c" + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 3212 "GalleryConnector.c" +#line 3227 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 3216 "GalleryConnector.c" +#line 3231 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 3222 "GalleryConnector.c" +#line 3237 "GalleryConnector.c" } else { gboolean _tmp16_ = FALSE; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp17_; + gint _tmp17__length1; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 3233 "GalleryConnector.c" - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gint _tmp19_ = 0; - const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3248 "GalleryConnector.c" + gchar** _tmp18_; + gint _tmp18__length1; + gint _tmp19_; + const gchar* _tmp20_; +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 3248 "GalleryConnector.c" +#line 3263 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 3252 "GalleryConnector.c" +#line 3267 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 3256 "GalleryConnector.c" +#line 3271 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3262 "GalleryConnector.c" +#line 3277 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 3274 "GalleryConnector.c" - gchar** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; - const gchar* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3289 "GalleryConnector.c" + gchar** _tmp25_; + gint _tmp25__length1; + gint _tmp26_; + const gchar* _tmp27_; + gint _tmp28_; + gint _tmp29_; +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 3295 "GalleryConnector.c" +#line 3310 "GalleryConnector.c" } else { -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 3299 "GalleryConnector.c" +#line 3314 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 3305 "GalleryConnector.c" +#line 3320 "GalleryConnector.c" } } -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 3312 "GalleryConnector.c" - gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3327 "GalleryConnector.c" + gchar* _tmp32_; +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3320 "GalleryConnector.c" +#line 3335 "GalleryConnector.c" } -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 3358 "GalleryConnector.c" +#line 3373 "GalleryConnector.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" while (TRUE) { -#line 3367 "GalleryConnector.c" - gint _tmp48_ = 0; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - void* _tmp50_ = NULL; - const gchar* _tmp51_ = NULL; - void* _tmp52_ = NULL; +#line 3382 "GalleryConnector.c" + gint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + void* _tmp50_; + const gchar* _tmp51_; + void* _tmp52_; const gchar* _tmp53_ = NULL; - gchar** _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gint _tmp55_ = 0; - const gchar* _tmp56_ = NULL; - void* _tmp60_ = NULL; - void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar** _tmp54_; + gint _tmp54__length1; + gint _tmp55_; + const gchar* _tmp56_; + void* _tmp60_; + void* _tmp61_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 3383 "GalleryConnector.c" - gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3398 "GalleryConnector.c" + gint _tmp47_; +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 3389 "GalleryConnector.c" +#line 3404 "GalleryConnector.c" } -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" break; -#line 3403 "GalleryConnector.c" +#line 3418 "GalleryConnector.c" } -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 3423 "GalleryConnector.c" - gchar** _tmp57_ = NULL; - gint _tmp57__length1 = 0; - gint _tmp58_ = 0; - const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 3438 "GalleryConnector.c" + gchar** _tmp57_; + gint _tmp57__length1; + gint _tmp58_; + const gchar* _tmp59_; +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 3438 "GalleryConnector.c" +#line 3453 "GalleryConnector.c" } else { -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 3442 "GalleryConnector.c" +#line 3457 "GalleryConnector.c" } -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 3450 "GalleryConnector.c" +#line 3465 "GalleryConnector.c" } } -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3461 "GalleryConnector.c" +#line 3476 "GalleryConnector.c" } else { - gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp63_; +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3470 "GalleryConnector.c" +#line 3485 "GalleryConnector.c" } } PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { PublishingGallery3GetAlbumsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PublishingGallery3Session* _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; gchar* url_list = NULL; - gchar* _tmp2_ = NULL; + gchar* _tmp2_; gchar** my_album_urls = NULL; - gint my_album_urls_length1 = 0; - gint _my_album_urls_size_ = 0; + gint my_album_urls_length1; + gint _my_album_urls_size_; gchar* endpoint_url = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + PublishingGallery3Session* _tmp3_; + gchar* _tmp4_; gint _tmp5_ = 0; - const gchar* _tmp6_ = NULL; + const gchar* _tmp6_; gint url_length = 0; - gint _tmp10_ = 0; - guint _tmp11_ = 0U; - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - const gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - const gchar* _tmp53_ = NULL; + gint _tmp10_; + guint _tmp11_; + gchar** _tmp12_; + gint _tmp12__length1; + gchar** _tmp13_; + gint _tmp13__length1; + const gchar* _tmp51_; + gchar* _tmp52_; + const gchar* _tmp53_; #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3561,10 +3576,10 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp6_ = endpoint_url; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (NULL != _tmp6_) { -#line 3534 "GalleryConnector.c" - const gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 3549 "GalleryConnector.c" + const gchar* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = endpoint_url; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3573,11 +3588,11 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp9_ = _tmp8_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = _tmp9_; -#line 3546 "GalleryConnector.c" +#line 3561 "GalleryConnector.c" } else { #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = 0; -#line 3550 "GalleryConnector.c" +#line 3565 "GalleryConnector.c" } #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" url_length = _tmp5_; @@ -3595,61 +3610,61 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp13__length1 = _tmp12__length1; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) { -#line 3568 "GalleryConnector.c" - guint _tmp14_ = 0U; - const gchar* _tmp43_ = NULL; - gchar** _tmp44_ = NULL; - gint _tmp44__length1 = 0; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - guint _tmp48_ = 0U; - gchar** _tmp49_ = NULL; - gint _tmp49__length1 = 0; - gchar** _tmp50_ = NULL; - gint _tmp50__length1 = 0; +#line 3583 "GalleryConnector.c" + guint _tmp14_; + const gchar* _tmp43_; + gchar** _tmp44_; + gint _tmp44__length1; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + guint _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + gchar** _tmp50_; + gint _tmp50__length1; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = start; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp14_); -#line 3585 "GalleryConnector.c" +#line 3600 "GalleryConnector.c" { gboolean _tmp15_ = FALSE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = TRUE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 3592 "GalleryConnector.c" - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - gchar** _tmp29_ = NULL; - gint _tmp29__length1 = 0; - guint _tmp30_ = 0U; - const gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gint _tmp35_ = 0; - gchar** _tmp36_ = NULL; - gint _tmp36__length1 = 0; - gchar** _tmp37_ = NULL; - gint _tmp37__length1 = 0; - guint _tmp38_ = 0U; - const gchar* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - guint _tmp42_ = 0U; +#line 3607 "GalleryConnector.c" + gchar** _tmp27_; + gint _tmp27__length1; + gchar** _tmp28_; + gint _tmp28__length1; + gchar** _tmp29_; + gint _tmp29__length1; + guint _tmp30_; + const gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gint _tmp35_; + gchar** _tmp36_; + gint _tmp36__length1; + gchar** _tmp37_; + gint _tmp37__length1; + guint _tmp38_; + const gchar* _tmp39_; + gint _tmp40_; + gint _tmp41_; + guint _tmp42_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp15_) { -#line 3616 "GalleryConnector.c" +#line 3631 "GalleryConnector.c" gboolean _tmp16_ = FALSE; - guint _tmp17_ = 0U; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; + guint _tmp17_; + gchar** _tmp18_; + gint _tmp18__length1; + gchar** _tmp19_; + gint _tmp19__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = self->priv->_urls_sent; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3660,16 +3675,16 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp19__length1 = _tmp18__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) { -#line 3633 "GalleryConnector.c" - gint _tmp20_ = 0; - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - guint _tmp23_ = 0U; - const gchar* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; +#line 3648 "GalleryConnector.c" + gint _tmp20_; + gchar** _tmp21_; + gint _tmp21__length1; + gchar** _tmp22_; + gint _tmp22__length1; + guint _tmp23_; + const gchar* _tmp24_; + gint _tmp25_; + gint _tmp26_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = url_length; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3688,17 +3703,17 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp26_ = _tmp25_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255; -#line 3661 "GalleryConnector.c" +#line 3676 "GalleryConnector.c" } else { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = FALSE; -#line 3665 "GalleryConnector.c" +#line 3680 "GalleryConnector.c" } #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp16_) { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3671 "GalleryConnector.c" +#line 3686 "GalleryConnector.c" } } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3749,7 +3764,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp42_ = self->priv->_urls_sent; #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp42_ + 1); -#line 3722 "GalleryConnector.c" +#line 3737 "GalleryConnector.c" } } #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3780,7 +3795,7 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _tmp50__length1 = _tmp49__length1; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp48_ <= ((guint) (_tmp50__length1 - 1))); -#line 3753 "GalleryConnector.c" +#line 3768 "GalleryConnector.c" } #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp51_ = url_list; @@ -3802,65 +3817,65 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti _g_free0 (url_list); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 3775 "GalleryConnector.c" +#line 3790 "GalleryConnector.c" } PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_get_albums_transaction_construct (PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, session, _album_urls, _album_urls_length1, start); -#line 3782 "GalleryConnector.c" +#line 3797 "GalleryConnector.c" } static gpointer _publishing_gallery3_album_ref0 (gpointer self) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_gallery3_album_ref (self) : NULL; -#line 3789 "GalleryConnector.c" +#line 3804 "GalleryConnector.c" } -static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value) { +static void _vala_array_add4 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (PublishingGallery3Album*, *array, (*size) + 1); -#line 3800 "GalleryConnector.c" +#line 3815 "GalleryConnector.c" } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 3806 "GalleryConnector.c" +#line 3821 "GalleryConnector.c" } static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 3818 "GalleryConnector.c" +#line 3833 "GalleryConnector.c" } PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) { PublishingGallery3Album** result = NULL; PublishingGallery3Album** albums = NULL; - gint albums_length1 = 0; - gint _albums_size_ = 0; + gint albums_length1; + gint _albums_size_; PublishingGallery3Album* tmp_album = NULL; JsonNode* root_node = NULL; - JsonNode* _tmp0_ = NULL; + JsonNode* _tmp0_; JsonArray* members = NULL; - JsonArray* _tmp1_ = NULL; - PublishingGallery3Album** _tmp23_ = NULL; - gint _tmp23__length1 = 0; + JsonArray* _tmp1_; + PublishingGallery3Album** _tmp23_; + gint _tmp23__length1; GError * _inner_error_ = NULL; #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL); @@ -3886,7 +3901,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 3859 "GalleryConnector.c" +#line 3874 "GalleryConnector.c" } else { #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_album_unref0 (tmp_album); @@ -3898,45 +3913,45 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums g_clear_error (&_inner_error_); #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 3871 "GalleryConnector.c" +#line 3886 "GalleryConnector.c" } } #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = json_node_get_array (root_node); #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" members = _tmp1_; -#line 3878 "GalleryConnector.c" +#line 3893 "GalleryConnector.c" { guint i = 0U; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 3883 "GalleryConnector.c" +#line 3898 "GalleryConnector.c" { gboolean _tmp2_ = FALSE; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 3890 "GalleryConnector.c" - guint _tmp4_ = 0U; - JsonArray* _tmp5_ = NULL; - guint _tmp6_ = 0U; - JsonArray* _tmp7_ = NULL; - guint _tmp8_ = 0U; - JsonObject* _tmp9_ = NULL; - PublishingGallery3Album* _tmp10_ = NULL; - PublishingGallery3Album* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; +#line 3905 "GalleryConnector.c" + guint _tmp4_; + JsonArray* _tmp5_; + guint _tmp6_; + JsonArray* _tmp7_; + guint _tmp8_; + JsonObject* _tmp9_; + PublishingGallery3Album* _tmp10_; + PublishingGallery3Album* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 3903 "GalleryConnector.c" - guint _tmp3_ = 0U; +#line 3918 "GalleryConnector.c" + guint _tmp3_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = i; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp3_ + 1; -#line 3909 "GalleryConnector.c" +#line 3924 "GalleryConnector.c" } #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -3950,7 +3965,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums if (!(_tmp4_ <= (_tmp6_ - 1))) { #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3923 "GalleryConnector.c" +#line 3938 "GalleryConnector.c" } #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = members; @@ -3972,11 +3987,11 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _tmp13_ = _tmp12_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp13_) { -#line 3945 "GalleryConnector.c" - PublishingGallery3Album** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - PublishingGallery3Album* _tmp15_ = NULL; - PublishingGallery3Album* _tmp16_ = NULL; +#line 3960 "GalleryConnector.c" + PublishingGallery3Album** _tmp14_; + gint _tmp14__length1; + PublishingGallery3Album* _tmp15_; + PublishingGallery3Album* _tmp16_; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = albums; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3987,14 +4002,14 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_); -#line 3960 "GalleryConnector.c" +#line 3975 "GalleryConnector.c" } else { - PublishingGallery3Album* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + PublishingGallery3Album* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = tmp_album; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4011,7 +4026,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums g_warning ("GalleryConnector.vala:373: %s", _tmp22_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp22_); -#line 3984 "GalleryConnector.c" +#line 3999 "GalleryConnector.c" } } } @@ -4024,7 +4039,7 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums if (result_length1) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp23__length1; -#line 3997 "GalleryConnector.c" +#line 4012 "GalleryConnector.c" } #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp23_; @@ -4032,16 +4047,16 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums _publishing_gallery3_album_unref0 (tmp_album); #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4005 "GalleryConnector.c" +#line 4020 "GalleryConnector.c" } gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) { gchar** result; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), NULL); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4056,13 +4071,13 @@ gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGal if (result_length1) { #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *result_length1 = _tmp1__length1; -#line 4029 "GalleryConnector.c" +#line 4044 "GalleryConnector.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4035 "GalleryConnector.c" +#line 4050 "GalleryConnector.c" } @@ -4073,25 +4088,25 @@ static gchar** _vala_array_dup2 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 4046 "GalleryConnector.c" - gchar* _tmp0_ = NULL; +#line 4061 "GalleryConnector.c" + gchar* _tmp0_; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (self[i]); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 4052 "GalleryConnector.c" +#line 4067 "GalleryConnector.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4056 "GalleryConnector.c" +#line 4071 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4110,13 +4125,13 @@ static void publishing_gallery3_get_albums_transaction_set_album_urls (Publishin self->priv->_album_urls_length1 = _tmp1__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->__album_urls_size_ = self->priv->_album_urls_length1; -#line 4083 "GalleryConnector.c" +#line 4098 "GalleryConnector.c" } guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) { guint result; - guint _tmp0_ = 0U; + guint _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), 0U); #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4125,25 +4140,25 @@ guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGaller result = _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4098 "GalleryConnector.c" +#line 4113 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) { - guint _tmp0_ = 0U; + guint _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_urls_sent = _tmp0_; -#line 4110 "GalleryConnector.c" +#line 4125 "GalleryConnector.c" } gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self), FALSE); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4152,19 +4167,19 @@ gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGal result = _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4125 "GalleryConnector.c" +#line 4140 "GalleryConnector.c" } static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GET_ALBUMS_TRANSACTION (self)); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_more_urls = _tmp0_; -#line 4137 "GalleryConnector.c" +#line 4152 "GalleryConnector.c" } @@ -4175,7 +4190,7 @@ static void publishing_gallery3_get_albums_transaction_class_init (PublishingGal ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_get_albums_transaction_finalize; #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GetAlbumsTransactionPrivate)); -#line 4148 "GalleryConnector.c" +#line 4163 "GalleryConnector.c" } @@ -4192,11 +4207,11 @@ static void publishing_gallery3_get_albums_transaction_instance_init (Publishing self->priv->_urls_sent = (guint) 0; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_more_urls = FALSE; -#line 4165 "GalleryConnector.c" +#line 4180 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GetAlbumsTransaction * self; #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION, PublishingGallery3GetAlbumsTransaction); @@ -4204,7 +4219,7 @@ static void publishing_gallery3_get_albums_transaction_finalize (PublishingRESTS self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL); #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_get_albums_transaction_parent_class)->finalize (obj); -#line 4177 "GalleryConnector.c" +#line 4192 "GalleryConnector.c" } @@ -4223,14 +4238,14 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) { static void _vala_JsonNode_free (JsonNode* self) { #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_boxed_free (json_node_get_type (), self); -#line 4196 "GalleryConnector.c" +#line 4211 "GalleryConnector.c" } PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) { PublishingGallery3GalleryGetTagTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4243,26 +4258,26 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_ if (!_tmp1_) { #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:389: Not authenticated"); -#line 4216 "GalleryConnector.c" +#line 4231 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; gsize entity_length = 0UL; gchar* entity_value = NULL; gsize _tmp13_ = 0UL; - gchar* _tmp14_ = NULL; + gchar* _tmp14_; #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4321,18 +4336,18 @@ PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_ __vala_JsonNode_free0 (root_node); #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4294 "GalleryConnector.c" +#line 4309 "GalleryConnector.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4298 "GalleryConnector.c" +#line 4313 "GalleryConnector.c" } PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name) { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_get_tag_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_TAG_TRANSACTION, session, tag_name); -#line 4305 "GalleryConnector.c" +#line 4320 "GalleryConnector.c" } @@ -4340,16 +4355,16 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller gchar* result = NULL; JsonNode* root_node = NULL; gchar* url = NULL; - JsonObject* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + JsonObject* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; GError * _inner_error_ = NULL; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_TAG_TRANSACTION (self), NULL); -#line 4319 "GalleryConnector.c" +#line 4334 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4358,7 +4373,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4331 "GalleryConnector.c" +#line 4346 "GalleryConnector.c" goto __catch2_spit_publishing_publishing_error; } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4369,11 +4384,11 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_clear_error (&_inner_error_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4342 "GalleryConnector.c" +#line 4357 "GalleryConnector.c" } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4346 "GalleryConnector.c" +#line 4361 "GalleryConnector.c" } goto __finally2; __catch2_spit_publishing_publishing_error: @@ -4387,7 +4402,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_error ("GalleryConnector.vala:425: Could not get root node"); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4360 "GalleryConnector.c" +#line 4375 "GalleryConnector.c" } __finally2: #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4400,7 +4415,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller g_clear_error (&_inner_error_); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4373 "GalleryConnector.c" +#line 4388 "GalleryConnector.c" } #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -4416,14 +4431,14 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller result = url; #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4389 "GalleryConnector.c" +#line 4404 "GalleryConnector.c" } static void publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass) { #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_get_tag_transaction_parent_class = g_type_class_peek_parent (klass); -#line 4396 "GalleryConnector.c" +#line 4411 "GalleryConnector.c" } @@ -4445,8 +4460,8 @@ GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) { PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_url) { PublishingGallery3GalleryGetItemTagsURLsTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + PublishingGallery3Session* _tmp0_; + const gchar* _tmp1_; #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4459,14 +4474,14 @@ PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4432 "GalleryConnector.c" +#line 4447 "GalleryConnector.c" } PublishingGallery3GalleryGetItemTagsURLsTransaction* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_new (PublishingGallery3Session* session, const gchar* item_url) { #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, session, item_url); -#line 4439 "GalleryConnector.c" +#line 4454 "GalleryConnector.c" } @@ -4475,9 +4490,9 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags JsonNode* root_node = NULL; JsonObject* relationships = NULL; JsonObject* tags = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp13_; + gchar* _tmp14_; GError * _inner_error_ = NULL; #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION (self), NULL); @@ -4485,20 +4500,20 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags _tmp0_ = self->priv->item_tags_path; #line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 ("", _tmp0_) == 0) { -#line 4458 "GalleryConnector.c" - JsonNode* _tmp3_ = NULL; - JsonObject* _tmp4_ = NULL; - JsonObject* _tmp5_ = NULL; - JsonObject* _tmp6_ = NULL; - JsonObject* _tmp7_ = NULL; - JsonObject* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; +#line 4473 "GalleryConnector.c" + JsonNode* _tmp3_; + JsonObject* _tmp4_; + JsonObject* _tmp5_; + JsonObject* _tmp6_; + JsonObject* _tmp7_; + JsonObject* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; { JsonNode* _tmp1_ = NULL; - JsonNode* _tmp2_ = NULL; + JsonNode* _tmp2_; #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4507,7 +4522,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags if (G_UNLIKELY (_inner_error_ != NULL)) { #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4480 "GalleryConnector.c" +#line 4495 "GalleryConnector.c" goto __catch3_spit_publishing_publishing_error; } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4516,11 +4531,11 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_clear_error (&_inner_error_); #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4489 "GalleryConnector.c" +#line 4504 "GalleryConnector.c" } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp1_; -#line 4493 "GalleryConnector.c" +#line 4508 "GalleryConnector.c" } goto __finally3; __catch3_spit_publishing_publishing_error: @@ -4534,7 +4549,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_error ("GalleryConnector.vala:461: Could not get root node"); #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4507 "GalleryConnector.c" +#line 4522 "GalleryConnector.c" } __finally3: #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4545,7 +4560,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags g_clear_error (&_inner_error_); #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4518 "GalleryConnector.c" +#line 4533 "GalleryConnector.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = root_node; @@ -4579,7 +4594,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags _g_free0 (self->priv->item_tags_path); #line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->item_tags_path = _tmp12_; -#line 4552 "GalleryConnector.c" +#line 4567 "GalleryConnector.c" } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = self->priv->item_tags_path; @@ -4589,7 +4604,7 @@ gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags result = _tmp14_; #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4562 "GalleryConnector.c" +#line 4577 "GalleryConnector.c" } @@ -4600,23 +4615,23 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_in ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate)); -#line 4573 "GalleryConnector.c" +#line 4588 "GalleryConnector.c" } static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE (self); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup (""); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->item_tags_path = _tmp0_; -#line 4585 "GalleryConnector.c" +#line 4600 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryGetItemTagsURLsTransaction * self; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransaction); @@ -4624,7 +4639,7 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_finalize _g_free0 (self->priv->item_tags_path); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class)->finalize (obj); -#line 4597 "GalleryConnector.c" +#line 4612 "GalleryConnector.c" } @@ -4642,8 +4657,8 @@ GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) { PublishingGallery3GallerySetTagRelationshipTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4660,28 +4675,28 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall if (!_tmp1_) { #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:489: Not authenticated"); -#line 4633 "GalleryConnector.c" +#line 4648 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3Session* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3Session* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; gsize entity_length = 0UL; gchar* entity_value = NULL; gsize _tmp15_ = 0UL; - gchar* _tmp16_ = NULL; + gchar* _tmp16_; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4746,25 +4761,25 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall __vala_JsonNode_free0 (root_node); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4719 "GalleryConnector.c" +#line 4734 "GalleryConnector.c" } #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4723 "GalleryConnector.c" +#line 4738 "GalleryConnector.c" } PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url) { #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_set_tag_relationship_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION, session, item_tags_path, tag_url, item_url); -#line 4730 "GalleryConnector.c" +#line 4745 "GalleryConnector.c" } static void publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass) { #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_set_tag_relationship_transaction_parent_class = g_type_class_peek_parent (klass); -#line 4737 "GalleryConnector.c" +#line 4752 "GalleryConnector.c" } @@ -4786,8 +4801,8 @@ GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (voi PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3GalleryAlbumCreateTransaction* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + PublishingGallery3Session* _tmp0_; + gboolean _tmp1_; #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4800,34 +4815,34 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb if (!_tmp1_) { #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:533: Not authenticated"); -#line 4773 "GalleryConnector.c" +#line 4788 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_ = NULL; + JsonGenerator* _tmp2_; JsonNode* root_node = NULL; - JsonNode* _tmp3_ = NULL; + JsonNode* _tmp3_; JsonObject* obj = NULL; - JsonObject* _tmp4_ = NULL; - PublishingGallery3Session* _tmp5_ = NULL; - PublishingGallery3Session* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PublishingGallery3Session* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - PublishingGallery3PublishingParameters* _tmp16_ = NULL; - PublishingGallery3PublishingParameters* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - PublishingGallery3PublishingParameters* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; + JsonObject* _tmp4_; + PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingGallery3Session* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + PublishingGallery3PublishingParameters* _tmp16_; + PublishingGallery3PublishingParameters* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + PublishingGallery3PublishingParameters* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; gchar* entity_value = NULL; - gchar* _tmp23_ = NULL; + gchar* _tmp23_; #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_generator_new (); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4914,18 +4929,18 @@ PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_alb __vala_JsonNode_free0 (root_node); #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (entity); -#line 4887 "GalleryConnector.c" +#line 4902 "GalleryConnector.c" } #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4891 "GalleryConnector.c" +#line 4906 "GalleryConnector.c" } PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) { #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_album_create_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, session, parameters); -#line 4898 "GalleryConnector.c" +#line 4913 "GalleryConnector.c" } @@ -4933,18 +4948,18 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( gchar* result = NULL; JsonNode* root_node = NULL; gchar* new_path = NULL; - JsonObject* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + JsonObject* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; GError * _inner_error_ = NULL; #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL); -#line 4914 "GalleryConnector.c" +#line 4929 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; - JsonNode* _tmp1_ = NULL; + JsonNode* _tmp1_; #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = publishing_gallery3_base_gallery_transaction_get_root_node (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_GALLERY3_TYPE_BASE_GALLERY_TRANSACTION, PublishingGallery3BaseGalleryTransaction), &_inner_error_); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4953,7 +4968,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 4926 "GalleryConnector.c" +#line 4941 "GalleryConnector.c" goto __catch4_spit_publishing_publishing_error; } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4964,11 +4979,11 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_clear_error (&_inner_error_); #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4937 "GalleryConnector.c" +#line 4952 "GalleryConnector.c" } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4941 "GalleryConnector.c" +#line 4956 "GalleryConnector.c" } goto __finally4; __catch4_spit_publishing_publishing_error: @@ -4982,7 +4997,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_error ("GalleryConnector.vala:572: Could not get root node"); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 4955 "GalleryConnector.c" +#line 4970 "GalleryConnector.c" } __finally4: #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4995,7 +5010,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( g_clear_error (&_inner_error_); #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 4968 "GalleryConnector.c" +#line 4983 "GalleryConnector.c" } #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -5019,13 +5034,13 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( result = new_path; #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4992 "GalleryConnector.c" +#line 5007 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) { PublishingGallery3PublishingParameters* result; - PublishingGallery3PublishingParameters* _tmp0_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self), NULL); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5034,20 +5049,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create result = _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5007 "GalleryConnector.c" +#line 5022 "GalleryConnector.c" } static gpointer _publishing_gallery3_publishing_parameters_ref0 (gpointer self) { #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_gallery3_publishing_parameters_ref (self) : NULL; -#line 5014 "GalleryConnector.c" +#line 5029 "GalleryConnector.c" } static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - PublishingGallery3PublishingParameters* _tmp1_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; + PublishingGallery3PublishingParameters* _tmp1_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_ALBUM_CREATE_TRANSACTION (self)); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5058,7 +5073,7 @@ static void publishing_gallery3_gallery_album_create_transaction_set_parameters _publishing_gallery3_publishing_parameters_unref0 (self->priv->_parameters); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_parameters = _tmp1_; -#line 5031 "GalleryConnector.c" +#line 5046 "GalleryConnector.c" } @@ -5069,18 +5084,18 @@ static void publishing_gallery3_gallery_album_create_transaction_class_init (Pub ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_gallery3_gallery_album_create_transaction_finalize; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryAlbumCreateTransactionPrivate)); -#line 5042 "GalleryConnector.c" +#line 5057 "GalleryConnector.c" } static void publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self) { #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE (self); -#line 5049 "GalleryConnector.c" +#line 5064 "GalleryConnector.c" } -static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_album_create_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryAlbumCreateTransaction * self; #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransaction); @@ -5090,7 +5105,7 @@ static void publishing_gallery3_gallery_album_create_transaction_finalize (Publi _g_free0 (self->priv->session_url); #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_album_create_transaction_parent_class)->finalize (obj); -#line 5063 "GalleryConnector.c" +#line 5078 "GalleryConnector.c" } @@ -5109,83 +5124,83 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) { static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5082 "GalleryConnector.c" +#line 5097 "GalleryConnector.c" } static void _g_free0_ (gpointer var) { #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" var = (g_free (var), NULL); -#line 5089 "GalleryConnector.c" +#line 5104 "GalleryConnector.c" } PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { PublishingGallery3GalleryUploadTransaction* self = NULL; - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; - PublishingGallery3Session* _tmp7_ = NULL; - SpitPublishingPublishable* _tmp8_ = NULL; - PublishingGallery3Session* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - PublishingGallery3PublishingParameters* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - PublishingGallery3PublishingParameters* _tmp19_ = NULL; - PublishingGallery3PublishingParameters* _tmp20_ = NULL; - PublishingGallery3Session* _tmp21_ = NULL; - PublishingGallery3Session* _tmp22_ = NULL; - PublishingGallery3Session* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; + PublishingGallery3PublishingParameters* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar _tmp3_; + PublishingGallery3Session* _tmp7_; + SpitPublishingPublishable* _tmp8_; + PublishingGallery3Session* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + PublishingGallery3PublishingParameters* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + PublishingGallery3PublishingParameters* _tmp19_; + PublishingGallery3PublishingParameters* _tmp20_; + PublishingGallery3Session* _tmp21_; + PublishingGallery3Session* _tmp22_; + PublishingGallery3Session* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; GHashTable* disposition_table = NULL; - GHashFunc _tmp26_ = NULL; - GEqualFunc _tmp27_ = NULL; - GHashTable* _tmp28_ = NULL; + GHashFunc _tmp26_; + GEqualFunc _tmp27_; + GHashTable* _tmp28_; gchar* title = NULL; - SpitPublishingPublishable* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; + SpitPublishingPublishable* _tmp29_; + gchar* _tmp30_; gchar* filename = NULL; - SpitPublishingPublishable* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; + SpitPublishingPublishable* _tmp31_; + gchar* _tmp32_; gboolean _tmp33_ = FALSE; - const gchar* _tmp34_ = NULL; - GHashTable* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - GHashTable* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - GHashTable* _tmp46_ = NULL; - JsonGenerator* _tmp47_ = NULL; + const gchar* _tmp34_; + GHashTable* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + GHashTable* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GHashTable* _tmp46_; + JsonGenerator* _tmp47_; gchar* desc = NULL; - SpitPublishingPublishable* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; + SpitPublishingPublishable* _tmp48_; + gchar* _tmp49_; const gchar* _tmp50_ = NULL; - SpitPublishingPublishable* _tmp51_ = NULL; - SpitPublishingPublisherMediaType _tmp52_ = 0; + SpitPublishingPublishable* _tmp51_; + SpitPublishingPublisherMediaType _tmp52_; gchar* type = NULL; - gchar* _tmp53_ = NULL; + gchar* _tmp53_; JsonNode* root_node = NULL; - JsonNode* _tmp54_ = NULL; + JsonNode* _tmp54_; JsonObject* obj = NULL; - JsonObject* _tmp55_ = NULL; - const gchar* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - const gchar* _tmp58_ = NULL; - JsonGenerator* _tmp59_ = NULL; - JsonGenerator* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; + JsonObject* _tmp55_; + const gchar* _tmp56_; + const gchar* _tmp57_; + const gchar* _tmp58_; + JsonGenerator* _tmp59_; + JsonGenerator* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5202,10 +5217,10 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _tmp3_ = string_get (_tmp2_, (glong) 0); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp3_ != '/') { -#line 5175 "GalleryConnector.c" - PublishingGallery3PublishingParameters* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 5190 "GalleryConnector.c" + PublishingGallery3PublishingParameters* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:601: Bad upload item path, this is a bug!"); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5216,7 +5231,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _tmp6_ = _tmp5_; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:602: %s", _tmp6_); -#line 5189 "GalleryConnector.c" +#line 5204 "GalleryConnector.c" } #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = session; @@ -5300,20 +5315,20 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t if (_tmp34_ == NULL) { #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = TRUE; -#line 5273 "GalleryConnector.c" +#line 5288 "GalleryConnector.c" } else { - const gchar* _tmp35_ = NULL; + const gchar* _tmp35_; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp35_ = title; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = g_strcmp0 (_tmp35_, "") == 0; -#line 5280 "GalleryConnector.c" +#line 5295 "GalleryConnector.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp33_) { -#line 5284 "GalleryConnector.c" - const gchar* _tmp36_ = NULL; - gchar* _tmp37_ = NULL; +#line 5299 "GalleryConnector.c" + const gchar* _tmp36_; + gchar* _tmp37_; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp36_ = filename; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5322,7 +5337,7 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _g_free0 (title); #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" title = _tmp37_; -#line 5295 "GalleryConnector.c" +#line 5310 "GalleryConnector.c" } #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = disposition_table; @@ -5368,11 +5383,11 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp50_ = "movie"; -#line 5341 "GalleryConnector.c" +#line 5356 "GalleryConnector.c" } else { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp50_ = "photo"; -#line 5345 "GalleryConnector.c" +#line 5360 "GalleryConnector.c" } #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp53_ = g_strdup (_tmp50_); @@ -5432,14 +5447,14 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t _g_hash_table_unref0 (disposition_table); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 5405 "GalleryConnector.c" +#line 5420 "GalleryConnector.c" } PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_upload_transaction_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 5412 "GalleryConnector.c" +#line 5427 "GalleryConnector.c" } @@ -5449,19 +5464,19 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P gchar* new_url = NULL; JsonNode* root_node = NULL; JsonParser* parser = NULL; - JsonParser* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + JsonParser* _tmp0_; + gchar* _tmp1_; gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - const gchar* _tmp10_ = NULL; - JsonParser* _tmp14_ = NULL; - JsonNode* _tmp15_ = NULL; - JsonNode* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - JsonNode* _tmp19_ = NULL; - JsonObject* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + const gchar* _tmp3_; + const gchar* _tmp10_; + JsonParser* _tmp14_; + JsonNode* _tmp15_; + JsonNode* _tmp16_; + gboolean _tmp17_; + JsonNode* _tmp19_; + JsonObject* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; GError * _inner_error_ = NULL; #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5481,11 +5496,11 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P if (NULL == _tmp3_) { #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; -#line 5454 "GalleryConnector.c" +#line 5469 "GalleryConnector.c" } else { - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = json_object; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5494,14 +5509,14 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _tmp6_ = _tmp5_; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = 0 == _tmp6_; -#line 5467 "GalleryConnector.c" +#line 5482 "GalleryConnector.c" } #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp2_) { -#line 5471 "GalleryConnector.c" - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; +#line 5486 "GalleryConnector.c" + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5522,16 +5537,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5495 "GalleryConnector.c" +#line 5510 "GalleryConnector.c" } #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = json_object; #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:664: json_object: %s", _tmp10_); -#line 5501 "GalleryConnector.c" +#line 5516 "GalleryConnector.c" { - JsonParser* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + JsonParser* _tmp11_; + const gchar* _tmp12_; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = parser; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5540,7 +5555,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P json_parser_load_from_data (_tmp11_, _tmp12_, (gssize) -1, &_inner_error_); #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5513 "GalleryConnector.c" +#line 5528 "GalleryConnector.c" goto __catch5_g_error; } } @@ -5548,7 +5563,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P __catch5_g_error: { GError* e = NULL; - const gchar* _tmp13_ = NULL; + const gchar* _tmp13_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5563,7 +5578,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P g_error ("GalleryConnector.vala:674: %s", _tmp13_); #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); -#line 5536 "GalleryConnector.c" +#line 5551 "GalleryConnector.c" } __finally5: #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5580,7 +5595,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P g_clear_error (&_inner_error_); #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5553 "GalleryConnector.c" +#line 5568 "GalleryConnector.c" } #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = parser; @@ -5594,8 +5609,8 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _tmp17_ = json_node_is_null (_tmp16_); #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp17_) { -#line 5567 "GalleryConnector.c" - gchar* _tmp18_ = NULL; +#line 5582 "GalleryConnector.c" + gchar* _tmp18_; #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:679: Root node is null, doesn't appear to be JSO" \ "N data"); @@ -5611,7 +5626,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5583 "GalleryConnector.c" +#line 5598 "GalleryConnector.c" } #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = root_node; @@ -5633,21 +5648,21 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P _g_free0 (json_object); #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5605 "GalleryConnector.c" +#line 5620 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error) { PublishingGallery3GallerySetTagRelationshipTransaction* tag_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_ = NULL; - PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_; + PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; GError * _inner_error_ = NULL; #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self)); @@ -5683,7 +5698,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh _publishing_rest_support_transaction_unref0 (tag_txn); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5655 "GalleryConnector.c" +#line 5670 "GalleryConnector.c" } else { #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); @@ -5693,7 +5708,7 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh g_clear_error (&_inner_error_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5665 "GalleryConnector.c" +#line 5680 "GalleryConnector.c" } } #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5706,20 +5721,20 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh _g_free0 (_tmp8_); #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); -#line 5678 "GalleryConnector.c" +#line 5693 "GalleryConnector.c" } static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) { gchar* result = NULL; PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_ = NULL; - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp3_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp4_; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp9_; + gchar* _tmp10_; GError * _inner_error_ = NULL; #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5737,9 +5752,9 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_session_unref0 (_tmp1_); #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag_urls_txn = _tmp4_; -#line 5709 "GalleryConnector.c" +#line 5724 "GalleryConnector.c" { - PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_ = NULL; + PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = tag_urls_txn; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5748,7 +5763,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p if (G_UNLIKELY (_inner_error_ != NULL)) { #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5720 "GalleryConnector.c" +#line 5735 "GalleryConnector.c" goto __catch6_spit_publishing_publishing_error; } #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5759,16 +5774,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p g_clear_error (&_inner_error_); #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5731 "GalleryConnector.c" +#line 5746 "GalleryConnector.c" } } goto __finally6; __catch6_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5789,7 +5804,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_transaction_unref0 (tag_urls_txn); #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5761 "GalleryConnector.c" +#line 5776 "GalleryConnector.c" } __finally6: #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5802,7 +5817,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p g_clear_error (&_inner_error_); #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5774 "GalleryConnector.c" +#line 5789 "GalleryConnector.c" } #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = tag_urls_txn; @@ -5814,20 +5829,20 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_p _publishing_rest_support_transaction_unref0 (tag_urls_txn); #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5786 "GalleryConnector.c" +#line 5801 "GalleryConnector.c" } static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) { gchar* result = NULL; PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL; - PublishingRESTSupportSession* _tmp0_ = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp3_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp4_ = NULL; - PublishingGallery3GalleryGetTagTransaction* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + PublishingRESTSupportSession* _tmp0_; + PublishingGallery3Session* _tmp1_; + const gchar* _tmp2_; + PublishingGallery3GalleryGetTagTransaction* _tmp3_; + PublishingGallery3GalleryGetTagTransaction* _tmp4_; + PublishingGallery3GalleryGetTagTransaction* _tmp9_; + gchar* _tmp10_; GError * _inner_error_ = NULL; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self), NULL); @@ -5847,9 +5862,9 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_session_unref0 (_tmp1_); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag_txn = _tmp4_; -#line 5819 "GalleryConnector.c" +#line 5834 "GalleryConnector.c" { - PublishingGallery3GalleryGetTagTransaction* _tmp5_ = NULL; + PublishingGallery3GalleryGetTagTransaction* _tmp5_; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = tag_txn; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5858,7 +5873,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis if (G_UNLIKELY (_inner_error_ != NULL)) { #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5830 "GalleryConnector.c" +#line 5845 "GalleryConnector.c" goto __catch7_spit_publishing_publishing_error; } #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5869,16 +5884,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis g_clear_error (&_inner_error_); #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5841 "GalleryConnector.c" +#line 5856 "GalleryConnector.c" } } goto __finally7; __catch7_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + GError* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5899,7 +5914,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_transaction_unref0 (tag_txn); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5871 "GalleryConnector.c" +#line 5886 "GalleryConnector.c" } __finally7: #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5912,7 +5927,7 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis g_clear_error (&_inner_error_); #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 5884 "GalleryConnector.c" +#line 5899 "GalleryConnector.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = tag_txn; @@ -5924,21 +5939,21 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis _publishing_rest_support_transaction_unref0 (tag_txn); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5896 "GalleryConnector.c" +#line 5911 "GalleryConnector.c" } static gpointer _g_error_copy0 (gpointer self) { #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? g_error_copy (self) : NULL; -#line 5903 "GalleryConnector.c" +#line 5918 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + PublishingGallery3PublishingParameters* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; GError * _inner_error_ = NULL; #line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_UPLOAD_TRANSACTION (self)); @@ -5952,25 +5967,25 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _tmp2_ = _tmp1_; #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 5924 "GalleryConnector.c" +#line 5939 "GalleryConnector.c" gchar** keywords = NULL; gint keywords_length1 = 0; gint _keywords_size_ = 0; - SpitPublishingPublishable* _tmp3_ = NULL; - gint _tmp4_ = 0; - gchar** _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + SpitPublishingPublishable* _tmp3_; + gint _tmp4_; + gchar** _tmp5_; + gchar** _tmp6_; + gint _tmp6__length1; + gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; gboolean _tmp13_ = FALSE; - const gchar* _tmp14_ = NULL; - gchar** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + const gchar* _tmp14_; + gchar** _tmp17_; + gint _tmp17__length1; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:746: EVENT: evaluating tags"); #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5997,7 +6012,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 5969 "GalleryConnector.c" +#line 5984 "GalleryConnector.c" } #line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = publishing_gallery3_gallery_upload_transaction_get_new_item_url (self); @@ -6033,19 +6048,19 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( if (g_strcmp0 ("", _tmp14_) == 0) { #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = TRUE; -#line 6005 "GalleryConnector.c" +#line 6020 "GalleryConnector.c" } else { - const gchar* _tmp15_ = NULL; + const gchar* _tmp15_; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = self->priv->item_tags_path; #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = g_strcmp0 ("", _tmp15_) == 0; -#line 6012 "GalleryConnector.c" +#line 6027 "GalleryConnector.c" } #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp13_) { -#line 6016 "GalleryConnector.c" - GError* _tmp16_ = NULL; +#line 6031 "GalleryConnector.c" + GError* _tmp16_; #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED, "Could not obtain URL of uploaded item or its " "\"item_tags\" relationship URL"); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6058,7 +6073,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6030 "GalleryConnector.c" +#line 6045 "GalleryConnector.c" } else { #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); @@ -6068,14 +6083,14 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6040 "GalleryConnector.c" +#line 6055 "GalleryConnector.c" } } #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = keywords; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17__length1 = keywords_length1; -#line 6047 "GalleryConnector.c" +#line 6062 "GalleryConnector.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -6087,22 +6102,22 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( tag_collection_length1 = _tmp17__length1; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (tag_it = 0; tag_it < _tmp17__length1; tag_it = tag_it + 1) { -#line 6059 "GalleryConnector.c" - gchar* _tmp18_ = NULL; +#line 6074 "GalleryConnector.c" + gchar* _tmp18_; gchar* tag = NULL; #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = g_strdup (tag_collection[tag_it]); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" tag = _tmp18_; -#line 6066 "GalleryConnector.c" +#line 6081 "GalleryConnector.c" { - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; + const gchar* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; gchar* new_tag_url = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + const gchar* _tmp23_; + gchar* _tmp24_; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = tag; #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6121,9 +6136,9 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _tmp24_ = publishing_gallery3_gallery_upload_transaction_get_tag_url (self, _tmp23_); #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" new_tag_url = _tmp24_; -#line 6093 "GalleryConnector.c" +#line 6108 "GalleryConnector.c" { - const gchar* _tmp25_ = NULL; + const gchar* _tmp25_; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp25_ = new_tag_url; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6132,7 +6147,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( if (G_UNLIKELY (_inner_error_ != NULL)) { #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 6104 "GalleryConnector.c" +#line 6119 "GalleryConnector.c" goto __catch8_spit_publishing_publishing_error; } #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6147,17 +6162,17 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6119 "GalleryConnector.c" +#line 6134 "GalleryConnector.c" } } goto __finally8; __catch8_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; - GError* _tmp28_ = NULL; - GError* _tmp29_ = NULL; + GError* _tmp26_; + const gchar* _tmp27_; + GError* _tmp28_; + GError* _tmp29_; #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6176,7 +6191,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( _inner_error_ = _tmp29_; #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 6148 "GalleryConnector.c" +#line 6163 "GalleryConnector.c" goto __finally8; } __finally8: @@ -6194,7 +6209,7 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6166 "GalleryConnector.c" +#line 6181 "GalleryConnector.c" } else { #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_tag_url); @@ -6208,20 +6223,20 @@ static void publishing_gallery3_gallery_upload_transaction_on_upload_completed ( g_clear_error (&_inner_error_); #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6180 "GalleryConnector.c" +#line 6195 "GalleryConnector.c" } } #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_tag_url); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (tag); -#line 6187 "GalleryConnector.c" +#line 6202 "GalleryConnector.c" } } } #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); -#line 6193 "GalleryConnector.c" +#line 6208 "GalleryConnector.c" } } @@ -6241,7 +6256,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_propagate_error (error, _inner_error_); #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6213 "GalleryConnector.c" +#line 6228 "GalleryConnector.c" } else { #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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); @@ -6249,7 +6264,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_clear_error (&_inner_error_); #line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6221 "GalleryConnector.c" +#line 6236 "GalleryConnector.c" } } #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6262,7 +6277,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_propagate_error (error, _inner_error_); #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6234 "GalleryConnector.c" +#line 6249 "GalleryConnector.c" } else { #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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); @@ -6270,7 +6285,7 @@ static void publishing_gallery3_gallery_upload_transaction_real_execute (Publish g_clear_error (&_inner_error_); #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6242 "GalleryConnector.c" +#line 6257 "GalleryConnector.c" } } } @@ -6284,19 +6299,19 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryUploadTransactionPrivate)); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute; -#line 6257 "GalleryConnector.c" + ((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_gallery3_gallery_upload_transaction_real_execute; +#line 6272 "GalleryConnector.c" } static void publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self) { #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 6264 "GalleryConnector.c" +#line 6279 "GalleryConnector.c" } -static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { +static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) { PublishingGallery3GalleryUploadTransaction * self; #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_UPLOAD_TRANSACTION, PublishingGallery3GalleryUploadTransaction); @@ -6314,7 +6329,7 @@ static void publishing_gallery3_gallery_upload_transaction_finalize (PublishingR _g_free0 (self->priv->item_tags_path); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_gallery3_gallery_upload_transaction_parent_class)->finalize (obj); -#line 6286 "GalleryConnector.c" +#line 6301 "GalleryConnector.c" } @@ -6332,9 +6347,9 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) { PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { PublishingGallery3GalleryPublisher * self = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - PublishingGallery3Session* _tmp2_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + PublishingGallery3Session* _tmp2_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6357,21 +6372,21 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr self->priv->session = _tmp2_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 6329 "GalleryConnector.c" +#line 6344 "GalleryConnector.c" } PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_gallery_publisher_construct (PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, service, host); -#line 6336 "GalleryConnector.c" +#line 6351 "GalleryConnector.c" } static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6380,15 +6395,15 @@ static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPubli result = _tmp0_; #line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6352 "GalleryConnector.c" +#line 6367 "GalleryConnector.c" } static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; SpitPublishingService* result = NULL; - SpitPublishingService* _tmp0_ = NULL; - SpitPublishingService* _tmp1_ = NULL; + SpitPublishingService* _tmp0_; + SpitPublishingService* _tmp1_; #line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6399,17 +6414,17 @@ static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_ser result = _tmp1_; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6371 "GalleryConnector.c" +#line 6386 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) { PublishingGallery3GalleryPublisher * self; - gboolean _tmp0_ = FALSE; - SpitPublishingPluginHost* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gboolean _tmp0_; + SpitPublishingPluginHost* _tmp1_; + gchar* _tmp2_; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6418,7 +6433,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (_tmp0_) { #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6390 "GalleryConnector.c" +#line 6405 "GalleryConnector.c" } #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = self->priv->host; @@ -6426,7 +6441,7 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (_tmp1_ == NULL) { #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:834: %s", "GalleryPublisher: start( ): can't start; this " "publisher is not restartable."); -#line 6398 "GalleryConnector.c" +#line 6413 "GalleryConnector.c" } #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction."); @@ -6444,28 +6459,28 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (NULL == _tmp4_) { #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = TRUE; -#line 6416 "GalleryConnector.c" +#line 6431 "GalleryConnector.c" } else { - const gchar* _tmp5_ = NULL; + const gchar* _tmp5_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->key; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = g_strcmp0 ("", _tmp5_) == 0; -#line 6423 "GalleryConnector.c" +#line 6438 "GalleryConnector.c" } #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp3_) { #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6429 "GalleryConnector.c" +#line 6444 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp6_; gchar* username = NULL; - gchar* _tmp7_ = NULL; + gchar* _tmp7_; gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; - const gchar* _tmp10_ = NULL; + const gchar* _tmp10_; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6480,41 +6495,41 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl if (NULL == _tmp10_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = TRUE; -#line 6452 "GalleryConnector.c" +#line 6467 "GalleryConnector.c" } else { - const gchar* _tmp11_ = NULL; + const gchar* _tmp11_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = self->priv->key; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = NULL == _tmp11_; -#line 6459 "GalleryConnector.c" +#line 6474 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp9_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = TRUE; -#line 6465 "GalleryConnector.c" +#line 6480 "GalleryConnector.c" } else { - const gchar* _tmp12_ = NULL; + const gchar* _tmp12_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = url; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = NULL == _tmp12_; -#line 6472 "GalleryConnector.c" +#line 6487 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp8_) { #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6478 "GalleryConnector.c" +#line 6493 "GalleryConnector.c" } else { - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - SpitPublishingPluginHost* _tmp15_ = NULL; - PublishingGallery3Session* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; + const gchar* _tmp13_; + const gchar* _tmp14_; + SpitPublishingPluginHost* _tmp15_; + PublishingGallery3Session* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = username; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6537,13 +6552,13 @@ static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPubl publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_album_urls (self); -#line 6509 "GalleryConnector.c" +#line 6524 "GalleryConnector.c" } #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (username); #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 6515 "GalleryConnector.c" +#line 6530 "GalleryConnector.c" } } @@ -6556,14 +6571,14 @@ static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPubli g_debug ("GalleryConnector.vala:867: GalleryPublisher: stop( ) invoked."); #line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->running = FALSE; -#line 6528 "GalleryConnector.c" +#line 6543 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6574,13 +6589,13 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall result = _tmp1_; #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6546 "GalleryConnector.c" +#line 6561 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6591,14 +6606,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler _tmp1_ = key; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", _tmp1_); -#line 6563 "GalleryConnector.c" +#line 6578 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6609,13 +6624,13 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3 result = _tmp1_; #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6581 "GalleryConnector.c" +#line 6596 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6626,14 +6641,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga _tmp1_ = url; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_); -#line 6598 "GalleryConnector.c" +#line 6613 "GalleryConnector.c" } gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) { gchar* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; #line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6644,13 +6659,13 @@ gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGal result = _tmp1_; #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6616 "GalleryConnector.c" +#line 6631 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) { - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6661,7 +6676,7 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle _tmp1_ = username; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_); -#line 6633 "GalleryConnector.c" +#line 6648 "GalleryConnector.c" } @@ -6673,22 +6688,22 @@ static gboolean* _bool_dup (gboolean* self) { memcpy (dup, self, sizeof (gboolean)); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return dup; -#line 6645 "GalleryConnector.c" +#line 6660 "GalleryConnector.c" } static gpointer __bool_dup0 (gpointer self) { #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? _bool_dup (self) : NULL; -#line 6652 "GalleryConnector.c" +#line 6667 "GalleryConnector.c" } gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) { gboolean* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; + gboolean* _tmp2_; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6701,13 +6716,13 @@ gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (P result = _tmp2_; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6673 "GalleryConnector.c" +#line 6688 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + SpitPublishingPluginHost* _tmp0_; + gboolean _tmp1_; #line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6716,7 +6731,7 @@ void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (Publis _tmp1_ = strip_metadata; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", _tmp1_); -#line 6688 "GalleryConnector.c" +#line 6703 "GalleryConnector.c" } @@ -6728,22 +6743,22 @@ static gint* _int_dup (gint* self) { memcpy (dup, self, sizeof (gint)); #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return dup; -#line 6700 "GalleryConnector.c" +#line 6715 "GalleryConnector.c" } static gpointer __int_dup0 (gpointer self) { #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? _int_dup (self) : NULL; -#line 6707 "GalleryConnector.c" +#line 6722 "GalleryConnector.c" } gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) { gint* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; + gint* _tmp2_; #line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6756,13 +6771,13 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (Publishin result = _tmp2_; #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6728 "GalleryConnector.c" +#line 6743 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6771,15 +6786,15 @@ void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (Publishing _tmp1_ = constraint; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", _tmp1_); -#line 6743 "GalleryConnector.c" +#line 6758 "GalleryConnector.c" } gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) { gint* result = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; + gint* _tmp2_; #line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self), NULL); #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6792,13 +6807,13 @@ gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGaller result = _tmp2_; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 6764 "GalleryConnector.c" +#line 6779 "GalleryConnector.c" } void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) { - SpitPublishingPluginHost* _tmp0_ = NULL; - gint _tmp1_ = 0; + SpitPublishingPluginHost* _tmp0_; + gint _tmp1_; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6807,19 +6822,19 @@ void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery _tmp1_ = pixels; #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", _tmp1_); -#line 6779 "GalleryConnector.c" +#line 6794 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) { #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_service_welcome_login ((PublishingGallery3GalleryPublisher*) self); -#line 6786 "GalleryConnector.c" +#line 6801 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6828,41 +6843,41 @@ static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane ( _tmp0_ = self->priv->host; #line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_GALLERY3_SERVICE_WELCOME_MESSAGE, _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback, self); -#line 6800 "GalleryConnector.c" +#line 6815 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self) { #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_credentials_go_back ((PublishingGallery3GalleryPublisher*) self); -#line 6807 "GalleryConnector.c" +#line 6822 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login (PublishingGallery3CredentialsPane* _sender, const gchar* url, const gchar* uname, const gchar* password, const gchar* key, gpointer self) { #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_credentials_login ((PublishingGallery3GalleryPublisher*) self, url, uname, password); -#line 6814 "GalleryConnector.c" +#line 6829 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) { - PublishingGallery3CredentialsPaneMode _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PublishingGallery3Session* _tmp3_ = NULL; + PublishingGallery3CredentialsPaneMode _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PublishingGallery3Session* _tmp3_; PublishingGallery3CredentialsPane* creds_pane = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - PublishingGallery3CredentialsPane* _tmp12_ = NULL; - PublishingGallery3CredentialsPane* _tmp13_ = NULL; - SpitPublishingPluginHost* _tmp14_ = NULL; + SpitPublishingPluginHost* _tmp4_; + PublishingGallery3CredentialsPaneMode _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingGallery3CredentialsPane* _tmp12_; + PublishingGallery3CredentialsPane* _tmp13_; + SpitPublishingPluginHost* _tmp14_; #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6918,34 +6933,34 @@ static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (Publ spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (creds_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (creds_pane); -#line 6889 "GalleryConnector.c" +#line 6904 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_key_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 6896 "GalleryConnector.c" +#line 6911 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_key_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 6903 "GalleryConnector.c" +#line 6918 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - SpitPublishingPluginHost* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + SpitPublishingPluginHost* _tmp2_; PublishingGallery3KeyFetchTransaction* fetch_trans = NULL; - PublishingGallery3Session* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingGallery3KeyFetchTransaction* _tmp7_ = NULL; + PublishingGallery3Session* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + PublishingGallery3KeyFetchTransaction* _tmp7_; GError * _inner_error_ = NULL; #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -6981,7 +6996,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 6952 "GalleryConnector.c" +#line 6967 "GalleryConnector.c" { #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -6989,7 +7004,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa if (G_UNLIKELY (_inner_error_ != NULL)) { #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 6960 "GalleryConnector.c" +#line 6975 "GalleryConnector.c" goto __catch9_spit_publishing_publishing_error; } #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7000,14 +7015,14 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_clear_error (&_inner_error_); #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6971 "GalleryConnector.c" +#line 6986 "GalleryConnector.c" } } goto __finally9; __catch9_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp8_ = NULL; + GError* _tmp8_; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7020,7 +7035,7 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 6991 "GalleryConnector.c" +#line 7006 "GalleryConnector.c" } __finally9: #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7033,33 +7048,33 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa g_clear_error (&_inner_error_); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7004 "GalleryConnector.c" +#line 7019 "GalleryConnector.c" } #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (fetch_trans); -#line 7008 "GalleryConnector.c" +#line 7023 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_urls_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7015 "GalleryConnector.c" +#line 7030 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7022 "GalleryConnector.c" +#line 7037 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; + SpitPublishingPluginHost* _tmp0_; PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp1_ = NULL; - PublishingGallery3GetAlbumURLsTransaction* _tmp2_ = NULL; + PublishingGallery3Session* _tmp1_; + PublishingGallery3GetAlbumURLsTransaction* _tmp2_; GError * _inner_error_ = NULL; #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7077,7 +7092,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7048 "GalleryConnector.c" +#line 7063 "GalleryConnector.c" { #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7085,7 +7100,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin if (G_UNLIKELY (_inner_error_ != NULL)) { #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7056 "GalleryConnector.c" +#line 7071 "GalleryConnector.c" goto __catch10_spit_publishing_publishing_error; } #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7096,14 +7111,14 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_clear_error (&_inner_error_); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7067 "GalleryConnector.c" +#line 7082 "GalleryConnector.c" } } goto __finally10; __catch10_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_ = NULL; + GError* _tmp3_; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7116,7 +7131,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7087 "GalleryConnector.c" +#line 7102 "GalleryConnector.c" } __finally10: #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7129,35 +7144,35 @@ static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (Publishin g_clear_error (&_inner_error_); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7100 "GalleryConnector.c" +#line 7115 "GalleryConnector.c" } #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7104 "GalleryConnector.c" +#line 7119 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_fetch_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7111 "GalleryConnector.c" +#line 7126 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_fetch_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7118 "GalleryConnector.c" +#line 7133 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start) { PublishingGallery3GetAlbumsTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - guint _tmp2_ = 0U; - PublishingGallery3GetAlbumsTransaction* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; + guint _tmp2_; + PublishingGallery3GetAlbumsTransaction* _tmp3_; GError * _inner_error_ = NULL; #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7177,7 +7192,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0); #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7148 "GalleryConnector.c" +#line 7163 "GalleryConnector.c" { #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7185,7 +7200,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal if (G_UNLIKELY (_inner_error_ != NULL)) { #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7156 "GalleryConnector.c" +#line 7171 "GalleryConnector.c" goto __catch11_spit_publishing_publishing_error; } #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7196,14 +7211,14 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_clear_error (&_inner_error_); #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7167 "GalleryConnector.c" +#line 7182 "GalleryConnector.c" } } goto __finally11; __catch11_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp4_ = NULL; + GError* _tmp4_; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7214,7 +7229,7 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7185 "GalleryConnector.c" +#line 7200 "GalleryConnector.c" } __finally11: #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7227,48 +7242,48 @@ static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGal g_clear_error (&_inner_error_); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7198 "GalleryConnector.c" +#line 7213 "GalleryConnector.c" } #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7202 "GalleryConnector.c" +#line 7217 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self) { #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish ((PublishingGallery3GalleryPublisher*) self, parameters); -#line 7209 "GalleryConnector.c" +#line 7224 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self) { #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout ((PublishingGallery3GalleryPublisher*) self); -#line 7216 "GalleryConnector.c" +#line 7231 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) { GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - PublishingGallery3Album** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - GtkBuilder* _tmp14_ = NULL; - gboolean* _tmp15_ = NULL; - gboolean* _tmp16_ = NULL; - gint* _tmp17_ = NULL; - gint* _tmp18_ = NULL; - gint* _tmp19_ = NULL; - gint* _tmp20_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp21_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp22_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp23_ = NULL; - SpitPublishingPluginHost* _tmp24_ = NULL; - PublishingGallery3PublishingOptionsPane* _tmp25_ = NULL; + GtkBuilder* _tmp0_; + SpitPublishingPluginHost* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingGallery3Album** _tmp12_; + gint _tmp12__length1; + GtkBuilder* _tmp13_; + gboolean* _tmp14_; + gboolean* _tmp15_; + gint* _tmp16_; + gint* _tmp17_; + gint* _tmp18_; + gint* _tmp19_; + PublishingGallery3PublishingOptionsPane* _tmp20_; + PublishingGallery3PublishingOptionsPane* _tmp21_; + PublishingGallery3PublishingOptionsPane* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + PublishingGallery3PublishingOptionsPane* _tmp24_; GError * _inner_error_ = NULL; #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7282,16 +7297,16 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan _tmp0_ = gtk_builder_new (); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" builder = _tmp0_; -#line 7253 "GalleryConnector.c" +#line 7268 "GalleryConnector.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = builder; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_publishing_options_pane.ui", &_inner_error_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7262 "GalleryConnector.c" +#line 7277 "GalleryConnector.c" goto __catch12_g_error; } } @@ -7299,14 +7314,13 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan __catch12_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7320,29 +7334,27 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = self->priv->host; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \ -"continue."); -#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME); + _tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \ +"continue."), PUBLISHING_GALLERY3_SERVICE_NAME); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_); + _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_error_free0 (_tmp9_); + _g_error_free0 (_tmp8_); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7312 "GalleryConnector.c" +#line 7324 "GalleryConnector.c" } __finally12: #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7355,83 +7367,83 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan g_clear_error (&_inner_error_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7325 "GalleryConnector.c" +#line 7337 "GalleryConnector.c" } #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = self->priv->host; + _tmp9_ = self->priv->host; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = url; + _tmp10_ = url; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = username; + _tmp11_ = username; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = self->priv->albums; + _tmp12_ = self->priv->albums; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13__length1 = self->priv->albums_length1; + _tmp12__length1 = self->priv->albums_length1; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = builder; + _tmp13_ = builder; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); + _tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); + _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); + _tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = publishing_gallery3_publishing_options_pane_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_, *_tmp16_, *_tmp18_, *_tmp20_); + _tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->publishing_options_pane); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->publishing_options_pane = _tmp21_; + self->priv->publishing_options_pane = _tmp20_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp19_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp15_); #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = self->priv->publishing_options_pane; + _tmp21_ = self->priv->publishing_options_pane; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp22_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp21_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0); #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = self->priv->publishing_options_pane; + _tmp22_ = self->priv->publishing_options_pane; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp23_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp22_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0); #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = self->priv->host; + _tmp23_ = self->priv->host; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = self->priv->publishing_options_pane; + _tmp24_ = self->priv->publishing_options_pane; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_install_dialog_pane (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); + spit_publishing_plugin_host_install_dialog_pane (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); -#line 7379 "GalleryConnector.c" +#line 7391 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_create_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7386 "GalleryConnector.c" +#line 7398 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_album_create_complete ((PublishingGallery3GalleryPublisher*) self, _sender); -#line 7393 "GalleryConnector.c" +#line 7405 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - PublishingGallery3PublishingParameters* _tmp1_ = NULL; - PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_ = NULL; + PublishingGallery3Session* _tmp0_; + PublishingGallery3PublishingParameters* _tmp1_; + PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_; GError * _inner_error_ = NULL; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -7451,7 +7463,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self, 0); #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self, 0); -#line 7421 "GalleryConnector.c" +#line 7433 "GalleryConnector.c" { #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -7459,7 +7471,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 7429 "GalleryConnector.c" +#line 7441 "GalleryConnector.c" goto __catch13_spit_publishing_publishing_error; } #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7470,14 +7482,14 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_clear_error (&_inner_error_); #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7440 "GalleryConnector.c" +#line 7452 "GalleryConnector.c" } } goto __finally13; __catch13_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_ = NULL; + GError* _tmp3_; #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7488,7 +7500,7 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7458 "GalleryConnector.c" +#line 7470 "GalleryConnector.c" } __finally13: #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7501,71 +7513,71 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal g_clear_error (&_inner_error_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7471 "GalleryConnector.c" +#line 7483 "GalleryConnector.c" } #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7475 "GalleryConnector.c" +#line 7487 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publish_complete ((PublishingGallery3GalleryPublisher*) self, _sender, num_photos_published); -#line 7482 "GalleryConnector.c" +#line 7494 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_publish_error ((PublishingGallery3GalleryPublisher*) self, _sender, err); -#line 7489 "GalleryConnector.c" +#line 7501 "GalleryConnector.c" } static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_on_upload_status_updated ((PublishingGallery3GalleryPublisher*) self, file_number, fraction_complete); -#line 7496 "GalleryConnector.c" +#line 7508 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { - PublishingGallery3PublishingParameters* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + PublishingGallery3PublishingParameters* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; gint _tmp3_ = 0; - PublishingGallery3PublishingParameters* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - PublishingGallery3PublishingParameters* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - SpitPublishingPluginHost* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; - PublishingGallery3PublishingParameters* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - PublishingGallery3PublishingParameters* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; - void* _tmp18_ = NULL; - GDestroyNotify _tmp19_ = NULL; - SpitPublishingProgressCallback _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; + PublishingGallery3PublishingParameters* _tmp4_; + gint _tmp5_; + gint _tmp6_; + PublishingGallery3PublishingParameters* _tmp7_; + gint _tmp8_; + gint _tmp9_; + SpitPublishingPluginHost* _tmp10_; + SpitPublishingPluginHost* _tmp11_; + PublishingGallery3PublishingParameters* _tmp12_; + gint _tmp13_; + gint _tmp14_; + PublishingGallery3PublishingParameters* _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + void* _tmp18_; + GDestroyNotify _tmp19_; + SpitPublishingProgressCallback _tmp20_; + gboolean _tmp21_; PublishingGallery3Uploader* uploader = NULL; - PublishingGallery3Session* _tmp22_ = NULL; - SpitPublishingPluginHost* _tmp23_ = NULL; - gint _tmp24_ = 0; - SpitPublishingPublishable** _tmp25_ = NULL; - SpitPublishingPublishable** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - PublishingGallery3PublishingParameters* _tmp27_ = NULL; - PublishingGallery3Uploader* _tmp28_ = NULL; - PublishingGallery3Uploader* _tmp29_ = NULL; - PublishingGallery3Uploader* _tmp30_ = NULL; - PublishingGallery3Uploader* _tmp31_ = NULL; - PublishingGallery3Uploader* _tmp32_ = NULL; + PublishingGallery3Session* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + gint _tmp24_; + SpitPublishingPublishable** _tmp25_; + SpitPublishingPublishable** _tmp26_; + gint _tmp26__length1; + PublishingGallery3PublishingParameters* _tmp27_; + PublishingGallery3Uploader* _tmp28_; + PublishingGallery3Uploader* _tmp29_; + PublishingGallery3Uploader* _tmp30_; + PublishingGallery3Uploader* _tmp31_; + PublishingGallery3Uploader* _tmp32_; #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7590,11 +7602,11 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 if (_tmp6_ <= 0) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = 0; -#line 7560 "GalleryConnector.c" +#line 7572 "GalleryConnector.c" } else { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = 1; -#line 7564 "GalleryConnector.c" +#line 7576 "GalleryConnector.c" } #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_); @@ -7646,7 +7658,7 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 if (!_tmp21_) { #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7616 "GalleryConnector.c" +#line 7628 "GalleryConnector.c" } #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp22_ = self->priv->session; @@ -7682,13 +7694,13 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback, self); #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 7652 "GalleryConnector.c" +#line 7664 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7701,12 +7713,12 @@ static void publishing_gallery3_gallery_publisher_do_show_success_pane (Publishi _tmp1_ = self->priv->host; #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 7671 "GalleryConnector.c" +#line 7683 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7715,25 +7727,25 @@ static void publishing_gallery3_gallery_publisher_on_service_welcome_login (Publ if (!_tmp0_) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7685 "GalleryConnector.c" +#line 7697 "GalleryConnector.c" } #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1101: EVENT: user clicked 'Login' in welcome pan" \ "e."); #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO); -#line 7691 "GalleryConnector.c" +#line 7703 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) { - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7748,7 +7760,7 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi if (!_tmp0_) { #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7717 "GalleryConnector.c" +#line 7729 "GalleryConnector.c" } #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = username; @@ -7771,12 +7783,12 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi _tmp6_ = password; #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_network_login (self, _tmp4_, _tmp5_, _tmp6_); -#line 7739 "GalleryConnector.c" +#line 7751 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7785,29 +7797,29 @@ static void publishing_gallery3_gallery_publisher_on_credentials_go_back (Publis if (!_tmp0_) { #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7753 "GalleryConnector.c" +#line 7765 "GalleryConnector.c" } #line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1123: EVENT: user is attempting to go back."); #line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 7759 "GalleryConnector.c" +#line 7771 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7830,7 +7842,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (!_tmp4_) { #line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7798 "GalleryConnector.c" +#line 7810 "GalleryConnector.c" } #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -7840,7 +7852,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp6_) { #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7808 "GalleryConnector.c" +#line 7820 "GalleryConnector.c" } #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -7860,10 +7872,10 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp11_ == ((guint) 403)) { #line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 7828 "GalleryConnector.c" +#line 7840 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7872,33 +7884,33 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_error (Publishing if (_tmp13_ == ((guint) 400)) { #line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 7840 "GalleryConnector.c" +#line 7852 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 7850 "GalleryConnector.c" +#line 7862 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7921,7 +7933,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (!_tmp4_) { #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7889 "GalleryConnector.c" +#line 7901 "GalleryConnector.c" } #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -7931,7 +7943,7 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (_tmp6_) { #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7899 "GalleryConnector.c" +#line 7911 "GalleryConnector.c" } #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = txn; @@ -7947,17 +7959,17 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish if (_tmp9_ == NULL) { #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1178: key doesn\'t exist"); -#line 7915 "GalleryConnector.c" +#line 7927 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp10_ = NULL; + gchar* _tmp10_; gchar* username = NULL; - gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - PublishingGallery3Session* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + gchar* _tmp11_; + const gchar* _tmp12_; + PublishingGallery3Session* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7988,24 +8000,24 @@ static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (Publish _g_free0 (username); #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 7956 "GalleryConnector.c" +#line 7968 "GalleryConnector.c" } } static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8028,7 +8040,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (!_tmp4_) { #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7996 "GalleryConnector.c" +#line 8008 "GalleryConnector.c" } #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8038,7 +8050,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (!_tmp6_) { #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8006 "GalleryConnector.c" +#line 8018 "GalleryConnector.c" } #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8058,10 +8070,10 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (_tmp11_ == ((guint) 403)) { #line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8026 "GalleryConnector.c" +#line 8038 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8070,38 +8082,38 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (Pub if (_tmp13_ == ((guint) 400)) { #line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8038 "GalleryConnector.c" +#line 8050 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8048 "GalleryConnector.c" +#line 8060 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; gchar** album_urls = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gint _tmp8_ = 0; - gchar** _tmp9_ = NULL; - gint album_urls_length1 = 0; - gint _album_urls_size_ = 0; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + PublishingRESTSupportTransaction* _tmp7_; + gint _tmp8_; + gchar** _tmp9_; + gint album_urls_length1; + gint _album_urls_size_; + gchar** _tmp10_; + gint _tmp10__length1; #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8124,7 +8136,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( if (!_tmp4_) { #line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8092 "GalleryConnector.c" +#line 8104 "GalleryConnector.c" } #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8134,7 +8146,7 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( if (!_tmp6_) { #line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8102 "GalleryConnector.c" +#line 8114 "GalleryConnector.c" } #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs."); @@ -8154,19 +8166,19 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( _tmp10__length1 = album_urls_length1; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (NULL == _tmp10_) { -#line 8122 "GalleryConnector.c" +#line 8134 "GalleryConnector.c" gchar* url = NULL; - PublishingGallery3Session* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; + PublishingGallery3Session* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; gchar* username = NULL; - PublishingGallery3Session* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + PublishingGallery3Session* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = self->priv->session; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8197,37 +8209,37 @@ static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete ( _g_free0 (username); #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8165 "GalleryConnector.c" +#line 8177 "GalleryConnector.c" } else { - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; + gchar** _tmp21_; + gint _tmp21__length1; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp21_ = album_urls; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp21__length1 = album_urls_length1; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp21_, _tmp21__length1, (guint) 0); -#line 8175 "GalleryConnector.c" +#line 8187 "GalleryConnector.c" } #line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" album_urls = (_vala_array_free (album_urls, album_urls_length1, (GDestroyNotify) g_free), NULL); -#line 8179 "GalleryConnector.c" +#line 8191 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8250,7 +8262,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (!_tmp4_) { #line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8218 "GalleryConnector.c" +#line 8230 "GalleryConnector.c" } #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8260,7 +8272,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (!_tmp6_) { #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8228 "GalleryConnector.c" +#line 8240 "GalleryConnector.c" } #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8280,10 +8292,10 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (_tmp11_ == ((guint) 403)) { #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8248 "GalleryConnector.c" +#line 8260 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8292,53 +8304,53 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_error (Publishi if (_tmp13_ == ((guint) 400)) { #line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8260 "GalleryConnector.c" +#line 8272 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8270 "GalleryConnector.c" +#line 8282 "GalleryConnector.c" } } } -static void _vala_array_add5 (PublishingGallery3Album*** array, int* length, int* size, PublishingGallery3Album* value) { +static void _vala_array_add5 (PublishingGallery3Album** * array, int* length, int* size, PublishingGallery3Album* value) { #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if ((*length) == (*size)) { #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *array = g_renew (PublishingGallery3Album*, *array, (*size) + 1); -#line 8283 "GalleryConnector.c" +#line 8295 "GalleryConnector.c" } #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[(*length)++] = value; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (*array)[*length] = NULL; -#line 8289 "GalleryConnector.c" +#line 8301 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; PublishingGallery3Album** new_albums = NULL; - gint new_albums_length1 = 0; - gint _new_albums_size_ = 0; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; + gint new_albums_length1; + gint _new_albums_size_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp23_; + gboolean _tmp24_; + gboolean _tmp25_; GError * _inner_error_ = NULL; #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -8370,7 +8382,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8338 "GalleryConnector.c" +#line 8350 "GalleryConnector.c" } #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8382,21 +8394,21 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8350 "GalleryConnector.c" +#line 8362 "GalleryConnector.c" } #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1309: EVENT: user is attempting to populate the " \ "album list."); -#line 8354 "GalleryConnector.c" +#line 8366 "GalleryConnector.c" { PublishingGallery3Album** _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; - gint _tmp9_ = 0; - PublishingGallery3Album** _tmp10_ = NULL; - gint _tmp7__length1 = 0; - gint __tmp7__size_ = 0; - PublishingGallery3Album** _tmp11_ = NULL; - gint _tmp11__length1 = 0; + PublishingRESTSupportTransaction* _tmp8_; + gint _tmp9_; + PublishingGallery3Album** _tmp10_; + gint _tmp7__length1; + gint __tmp7__size_; + PublishingGallery3Album** _tmp11_; + gint _tmp11__length1; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = txn; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8411,7 +8423,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 8378 "GalleryConnector.c" +#line 8390 "GalleryConnector.c" goto __catch14_spit_publishing_publishing_error; } #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8422,7 +8434,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi g_clear_error (&_inner_error_); #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8389 "GalleryConnector.c" +#line 8401 "GalleryConnector.c" } #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = _tmp7_; @@ -8442,14 +8454,14 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _new_albums_size_ = new_albums_length1; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = (_vala_array_free (_tmp7_, _tmp7__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); -#line 8409 "GalleryConnector.c" +#line 8421 "GalleryConnector.c" } goto __finally14; __catch14_spit_publishing_publishing_error: { GError* err = NULL; - PublishingRESTSupportTransaction* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + PublishingRESTSupportTransaction* _tmp12_; + GError* _tmp13_; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" err = _inner_error_; #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8462,7 +8474,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 8429 "GalleryConnector.c" +#line 8441 "GalleryConnector.c" } __finally14: #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8475,39 +8487,39 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi g_clear_error (&_inner_error_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8442 "GalleryConnector.c" +#line 8454 "GalleryConnector.c" } { gint i = 0; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 8448 "GalleryConnector.c" +#line 8460 "GalleryConnector.c" { gboolean _tmp14_ = FALSE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = TRUE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 8455 "GalleryConnector.c" - gint _tmp16_ = 0; - PublishingGallery3Album** _tmp17_ = NULL; - gint _tmp17__length1 = 0; - PublishingGallery3Album** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - PublishingGallery3Album** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gint _tmp20_ = 0; - PublishingGallery3Album* _tmp21_ = NULL; - PublishingGallery3Album* _tmp22_ = NULL; +#line 8467 "GalleryConnector.c" + gint _tmp16_; + PublishingGallery3Album** _tmp17_; + gint _tmp17__length1; + PublishingGallery3Album** _tmp18_; + gint _tmp18__length1; + PublishingGallery3Album** _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + PublishingGallery3Album* _tmp21_; + PublishingGallery3Album* _tmp22_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp14_) { -#line 8468 "GalleryConnector.c" - gint _tmp15_ = 0; +#line 8480 "GalleryConnector.c" + gint _tmp15_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = i; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp15_ + 1; -#line 8474 "GalleryConnector.c" +#line 8486 "GalleryConnector.c" } #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = FALSE; @@ -8521,7 +8533,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi if (!(_tmp16_ <= (_tmp17__length1 - 1))) { #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 8488 "GalleryConnector.c" +#line 8500 "GalleryConnector.c" } #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp18_ = self->priv->albums; @@ -8539,7 +8551,7 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_); #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp22_); -#line 8506 "GalleryConnector.c" +#line 8518 "GalleryConnector.c" } } } @@ -8551,15 +8563,15 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp25_ = _tmp24_; #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp25_) { -#line 8518 "GalleryConnector.c" - PublishingRESTSupportTransaction* _tmp26_ = NULL; - gchar** _tmp27_ = NULL; - gint _tmp27__length1 = 0; - gchar** _tmp28_ = NULL; - gint _tmp28__length1 = 0; - PublishingRESTSupportTransaction* _tmp29_ = NULL; - guint _tmp30_ = 0U; - guint _tmp31_ = 0U; +#line 8530 "GalleryConnector.c" + PublishingRESTSupportTransaction* _tmp26_; + gchar** _tmp27_; + gint _tmp27__length1; + gchar** _tmp28_; + gint _tmp28__length1; + PublishingRESTSupportTransaction* _tmp29_; + guint _tmp30_; + guint _tmp31_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp26_ = txn; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8576,20 +8588,20 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _tmp31_ = _tmp30_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp28_, _tmp28__length1, _tmp31_); -#line 8543 "GalleryConnector.c" +#line 8555 "GalleryConnector.c" } else { gchar* url = NULL; - PublishingGallery3Session* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; + PublishingGallery3Session* _tmp32_; + const gchar* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; gchar* username = NULL; - PublishingGallery3Session* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; + PublishingGallery3Session* _tmp36_; + const gchar* _tmp37_; + const gchar* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + const gchar* _tmp41_; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp32_ = self->priv->session; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8620,27 +8632,27 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi _g_free0 (username); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8587 "GalleryConnector.c" +#line 8599 "GalleryConnector.c" } #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" new_albums = (_vala_array_free (new_albums, new_albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); -#line 8591 "GalleryConnector.c" +#line 8603 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PublishingRESTSupportTransaction* _tmp10_ = NULL; - guint _tmp11_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + PublishingRESTSupportTransaction* _tmp10_; + guint _tmp11_; #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8663,7 +8675,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (!_tmp4_) { #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8630 "GalleryConnector.c" +#line 8642 "GalleryConnector.c" } #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8673,7 +8685,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (!_tmp6_) { #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8640 "GalleryConnector.c" +#line 8652 "GalleryConnector.c" } #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = bad_txn; @@ -8693,10 +8705,10 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (_tmp11_ == ((guint) 403)) { #line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY); -#line 8660 "GalleryConnector.c" +#line 8672 "GalleryConnector.c" } else { - PublishingRESTSupportTransaction* _tmp12_ = NULL; - guint _tmp13_ = 0U; + PublishingRESTSupportTransaction* _tmp12_; + guint _tmp13_; #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = bad_txn; #line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8705,43 +8717,43 @@ static void publishing_gallery3_gallery_publisher_on_album_create_error (Publish if (_tmp13_ == ((guint) 400)) { #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_credentials_pane (self, PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL); -#line 8672 "GalleryConnector.c" +#line 8684 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + SpitPublishingPluginHost* _tmp14_; + GError* _tmp15_; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->host; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = err; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8682 "GalleryConnector.c" +#line 8694 "GalleryConnector.c" } } } static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportTransaction* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; + PublishingRESTSupportTransaction* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; PublishingGallery3PublishingParameters* new_params = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - PublishingGallery3PublishingParameters* _tmp8_ = NULL; - PublishingGallery3PublishingParameters* _tmp9_ = NULL; - PublishingGallery3PublishingParameters* _tmp10_ = NULL; - PublishingGallery3PublishingParameters* _tmp11_ = NULL; - PublishingRESTSupportTransaction* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - PublishingGallery3PublishingParameters* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - PublishingGallery3PublishingParameters* _tmp18_ = NULL; + PublishingRESTSupportTransaction* _tmp7_; + PublishingGallery3PublishingParameters* _tmp8_; + PublishingGallery3PublishingParameters* _tmp9_; + PublishingGallery3PublishingParameters* _tmp10_; + PublishingGallery3PublishingParameters* _tmp11_; + PublishingRESTSupportTransaction* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + PublishingGallery3PublishingParameters* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + PublishingGallery3PublishingParameters* _tmp18_; #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8764,7 +8776,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ if (!_tmp4_) { #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8731 "GalleryConnector.c" +#line 8743 "GalleryConnector.c" } #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -8774,7 +8786,7 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ if (!_tmp6_) { #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8741 "GalleryConnector.c" +#line 8753 "GalleryConnector.c" } #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = txn; @@ -8813,42 +8825,42 @@ static void publishing_gallery3_gallery_publisher_on_album_create_complete (Publ publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_); #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (new_params); -#line 8779 "GalleryConnector.c" +#line 8791 "GalleryConnector.c" } static gpointer _publishing_rest_support_batch_uploader_ref0 (gpointer self) { #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_batch_uploader_ref (self) : NULL; -#line 8786 "GalleryConnector.c" +#line 8798 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PublishingGallery3Uploader* uploader = NULL; - PublishingRESTSupportBatchUploader* _tmp1_ = NULL; - PublishingGallery3Uploader* _tmp2_ = NULL; + PublishingRESTSupportBatchUploader* _tmp1_; + PublishingGallery3Uploader* _tmp2_; GError* g3_err = NULL; - GError* _tmp3_ = NULL; - GError* _tmp4_ = NULL; - GError* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - PublishingGallery3Uploader* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3Uploader* _tmp10_ = NULL; - guint _tmp11_ = 0U; - guint _tmp12_ = 0U; - PublishingGallery3Uploader* _tmp13_ = NULL; - guint _tmp14_ = 0U; - PublishingGallery3Uploader* _tmp15_ = NULL; - guint _tmp16_ = 0U; - PublishingGallery3Uploader* _tmp17_ = NULL; - guint _tmp18_ = 0U; - guint _tmp19_ = 0U; - SpitPublishingPluginHost* _tmp36_ = NULL; - GError* _tmp37_ = NULL; + GError* _tmp3_; + GError* _tmp4_; + GError* _tmp5_; + const gchar* _tmp6_; + PublishingGallery3Uploader* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3Uploader* _tmp10_; + guint _tmp11_; + guint _tmp12_; + PublishingGallery3Uploader* _tmp13_; + guint _tmp14_; + PublishingGallery3Uploader* _tmp15_; + guint _tmp16_; + PublishingGallery3Uploader* _tmp17_; + guint _tmp18_; + guint _tmp19_; + SpitPublishingPluginHost* _tmp36_; + GError* _tmp37_; #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8859,7 +8871,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa if (!_tmp0_) { #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8825 "GalleryConnector.c" +#line 8837 "GalleryConnector.c" } #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = _uploader; @@ -8911,19 +8923,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _tmp19_ = _tmp18_; #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp19_ == ((guint) 400)) { -#line 8877 "GalleryConnector.c" - GError* _tmp20_ = NULL; - GError* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - PublishingGallery3Uploader* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - PublishingGallery3Uploader* _tmp29_ = NULL; - SpitPublishingPublisherMediaType _tmp30_ = 0; - SpitPublishingPublisherMediaType _tmp31_ = 0; +#line 8889 "GalleryConnector.c" + GError* _tmp20_; + GError* _tmp21_; + const gchar* _tmp22_; + PublishingGallery3Uploader* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + PublishingGallery3Uploader* _tmp29_; + SpitPublishingPublisherMediaType _tmp30_; + SpitPublishingPublisherMediaType _tmp31_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = g3_err; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8956,11 +8968,11 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _tmp31_ = _tmp30_; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 8922 "GalleryConnector.c" - GError* _tmp32_ = NULL; - GError* _tmp33_ = NULL; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; +#line 8934 "GalleryConnector.c" + GError* _tmp32_; + GError* _tmp33_; + const gchar* _tmp34_; + gchar* _tmp35_; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp32_ = g3_err; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8973,7 +8985,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _g_free0 (_tmp33_->message); #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_->message = _tmp35_; -#line 8939 "GalleryConnector.c" +#line 8951 "GalleryConnector.c" } } #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8986,19 +8998,19 @@ static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGa _g_error_free0 (g3_err); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_batch_uploader_unref0 (uploader); -#line 8952 "GalleryConnector.c" +#line 8964 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* 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 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9007,7 +9019,7 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ if (!_tmp0_) { #line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8973 "GalleryConnector.c" +#line 8985 "GalleryConnector.c" } #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = completed_fraction; @@ -9030,19 +9042,19 @@ static void publishing_gallery3_gallery_publisher_on_upload_status_updated (Publ _tmp5_ = completed_fraction; #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 8995 "GalleryConnector.c" +#line 9007 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingRESTSupportBatchUploader* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - gint _tmp7_ = 0; + PublishingRESTSupportBatchUploader* _tmp0_; + guint _tmp1_; + PublishingRESTSupportBatchUploader* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; + gboolean _tmp6_; + gint _tmp7_; #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9065,7 +9077,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin if (!_tmp4_) { #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9030 "GalleryConnector.c" +#line 9042 "GalleryConnector.c" } #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = self->priv->session; @@ -9075,7 +9087,7 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin if (!_tmp6_) { #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9040 "GalleryConnector.c" +#line 9052 "GalleryConnector.c" } #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = num_published; @@ -9084,17 +9096,17 @@ static void publishing_gallery3_gallery_publisher_on_publish_complete (Publishin "shed", _tmp7_); #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_success_pane (self); -#line 9048 "GalleryConnector.c" +#line 9060 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) { - PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3Session* _tmp5_ = NULL; + PublishingGallery3PublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingGallery3PublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3Session* _tmp5_; #line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9115,7 +9127,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log if (!_tmp4_) { #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9079 "GalleryConnector.c" +#line 9091 "GalleryConnector.c" } #line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1470: EVENT: user is attempting to log out."); @@ -9125,18 +9137,18 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log publishing_gallery3_session_deauthenticate (_tmp5_); #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 9089 "GalleryConnector.c" +#line 9101 "GalleryConnector.c" } static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { - PublishingGallery3PublishingOptionsPane* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3PublishingOptionsPane* _tmp2_ = NULL; - guint _tmp3_ = 0U; - gboolean _tmp4_ = FALSE; - PublishingGallery3PublishingParameters* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + PublishingGallery3PublishingOptionsPane* _tmp0_; + guint _tmp1_; + PublishingGallery3PublishingOptionsPane* _tmp2_; + guint _tmp3_; + gboolean _tmp4_; + PublishingGallery3PublishingParameters* _tmp5_; + gboolean _tmp6_; #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9159,7 +9171,7 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub if (!_tmp4_) { #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9123 "GalleryConnector.c" +#line 9135 "GalleryConnector.c" } #line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1485: EVENT: user is attempting to publish somet" \ @@ -9170,11 +9182,11 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub _tmp6_ = publishing_gallery3_publishing_parameters_is_to_new_album (_tmp5_); #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp6_) { -#line 9133 "GalleryConnector.c" - PublishingGallery3PublishingParameters* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - PublishingGallery3PublishingParameters* _tmp10_ = NULL; +#line 9145 "GalleryConnector.c" + PublishingGallery3PublishingParameters* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + PublishingGallery3PublishingParameters* _tmp10_; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = parameters; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9187,14 +9199,14 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub _tmp10_ = parameters; #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_); -#line 9150 "GalleryConnector.c" +#line 9162 "GalleryConnector.c" } else { - PublishingGallery3PublishingParameters* _tmp11_ = NULL; + PublishingGallery3PublishingParameters* _tmp11_; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = parameters; #line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_publish (self, _tmp11_); -#line 9157 "GalleryConnector.c" +#line 9169 "GalleryConnector.c" } } @@ -9206,7 +9218,7 @@ static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3 g_type_class_add_private (klass, sizeof (PublishingGallery3GalleryPublisherPrivate)); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_gallery_publisher_finalize; -#line 9169 "GalleryConnector.c" +#line 9181 "GalleryConnector.c" } @@ -9214,14 +9226,14 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_is_running; + iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_is_running; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_get_service; + iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_get_service; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->start = (void (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_start; + iface->start = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_start; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_gallery3_gallery_publisher_real_stop; -#line 9184 "GalleryConnector.c" + iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_gallery3_gallery_publisher_real_stop; +#line 9196 "GalleryConnector.c" } @@ -9232,6 +9244,10 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle self->priv->host = NULL; #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->progress_reporter = NULL; +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + self->priv->progress_reporter_target = self; +#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + self->priv->progress_reporter_target_destroy_notify = NULL; #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->service = NULL; #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9248,11 +9264,11 @@ static void publishing_gallery3_gallery_publisher_instance_init (PublishingGalle self->priv->key = NULL; #line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->publishing_options_pane = NULL; -#line 9211 "GalleryConnector.c" +#line 9227 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_finalize (GObject* obj) { +static void publishing_gallery3_gallery_publisher_finalize (GObject * obj) { PublishingGallery3GalleryPublisher * self; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); @@ -9274,7 +9290,7 @@ static void publishing_gallery3_gallery_publisher_finalize (GObject* obj) { _g_object_unref0 (self->priv->publishing_options_pane); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_gallery_publisher_parent_class)->finalize (obj); -#line 9237 "GalleryConnector.c" +#line 9253 "GalleryConnector.c" } @@ -9299,137 +9315,136 @@ static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** sel result = g_new0 (PublishingGallery3Album*, length + 1); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" for (i = 0; i < length; i++) { -#line 9262 "GalleryConnector.c" - PublishingGallery3Album* _tmp0_ = NULL; +#line 9278 "GalleryConnector.c" + PublishingGallery3Album* _tmp0_; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _publishing_gallery3_album_ref0 (self[i]); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result[i] = _tmp0_; -#line 9268 "GalleryConnector.c" +#line 9284 "GalleryConnector.c" } #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 9272 "GalleryConnector.c" +#line 9288 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9279 "GalleryConnector.c" +#line 9295 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9286 "GalleryConnector.c" +#line 9302 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_new_album_entry_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9293 "GalleryConnector.c" +#line 9309 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9300 "GalleryConnector.c" +#line 9316 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_pixels_changed ((PublishingGallery3PublishingOptionsPane*) self); -#line 9307 "GalleryConnector.c" +#line 9323 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_logout_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9314 "GalleryConnector.c" +#line 9330 "GalleryConnector.c" } static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_on_publish_clicked ((PublishingGallery3PublishingOptionsPane*) self); -#line 9321 "GalleryConnector.c" +#line 9337 "GalleryConnector.c" } PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) { PublishingGallery3PublishingOptionsPane * self = NULL; - PublishingGallery3Album** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PublishingGallery3Album** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - SpitPublishingPluginHost* _tmp2_ = NULL; - GtkBuilder* _tmp3_ = NULL; - GtkBuilder* _tmp4_ = NULL; - GtkBuilder* _tmp5_ = NULL; - GtkBuilder* _tmp6_ = NULL; - GSList* _tmp7_ = NULL; - GSList* _tmp8_ = NULL; - guint _tmp9_ = 0U; - GtkBuilder* _tmp10_ = NULL; - GObject* _tmp11_ = NULL; - GtkGrid* _tmp12_ = NULL; - GtkBuilder* _tmp13_ = NULL; - GObject* _tmp14_ = NULL; - GtkLabel* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkRadioButton* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkComboBoxText* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkComboBoxText* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkRadioButton* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkEntry* _tmp33_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkCheckButton* _tmp36_ = NULL; - GtkBuilder* _tmp37_ = NULL; - GObject* _tmp38_ = NULL; - GtkButton* _tmp39_ = NULL; - GtkBuilder* _tmp40_ = NULL; - GObject* _tmp41_ = NULL; - GtkButton* _tmp42_ = NULL; - GtkLabel* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; - const gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - GtkCheckButton* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; - GtkComboBoxText* _tmp51_ = NULL; - gint _tmp52_ = 0; - GtkEntry* _tmp53_ = NULL; - gint _tmp54_ = 0; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - GtkRadioButton* _tmp57_ = NULL; - GtkRadioButton* _tmp58_ = NULL; - GtkEntry* _tmp59_ = NULL; - GtkComboBoxText* _tmp60_ = NULL; - GtkEntry* _tmp61_ = NULL; - GtkButton* _tmp62_ = NULL; - GtkButton* _tmp63_ = NULL; + PublishingGallery3Album** _tmp0_; + gint _tmp0__length1; + PublishingGallery3Album** _tmp1_; + gint _tmp1__length1; + SpitPublishingPluginHost* _tmp2_; + GtkBuilder* _tmp3_; + GtkBuilder* _tmp4_; + GtkBuilder* _tmp5_; + GtkBuilder* _tmp6_; + GSList* _tmp7_; + GSList* _tmp8_; + guint _tmp9_; + GtkBuilder* _tmp10_; + GObject* _tmp11_; + GtkGrid* _tmp12_; + GtkBuilder* _tmp13_; + GObject* _tmp14_; + GtkLabel* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkRadioButton* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkComboBoxText* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkComboBoxText* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkEntry* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkRadioButton* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkEntry* _tmp33_; + GtkBuilder* _tmp34_; + GObject* _tmp35_; + GtkCheckButton* _tmp36_; + GtkBuilder* _tmp37_; + GObject* _tmp38_; + GtkButton* _tmp39_; + GtkBuilder* _tmp40_; + GObject* _tmp41_; + GtkButton* _tmp42_; + GtkLabel* _tmp43_; + const gchar* _tmp44_; + const gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + GtkCheckButton* _tmp48_; + gboolean _tmp49_; + GtkComboBoxText* _tmp50_; + gint _tmp51_; + GtkEntry* _tmp52_; + gint _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + GtkRadioButton* _tmp56_; + GtkRadioButton* _tmp57_; + GtkEntry* _tmp58_; + GtkComboBoxText* _tmp59_; + GtkEntry* _tmp60_; + GtkButton* _tmp61_; + GtkButton* _tmp62_; #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9597,99 +9612,97 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_ #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp43_ = self->priv->title_label; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = _ ("Publishing to %s as %s."); -#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = url; + _tmp44_ = url; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = username; + _tmp45_ = username; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = g_strdup_printf (_tmp44_, _tmp45_, _tmp46_); + _tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = _tmp47_; + _tmp47_ = _tmp46_; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_label (_tmp43_, _tmp48_); + gtk_label_set_label (_tmp43_, _tmp47_); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp47_); #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = self->priv->strip_metadata_check; + _tmp48_ = self->priv->strip_metadata_check; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = strip_metadata; + _tmp49_ = strip_metadata; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_); #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = self->priv->scaling_combo; + _tmp50_ = self->priv->scaling_combo; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = scaling_id; + _tmp51_ = scaling_id; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), _tmp52_); + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), _tmp51_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = self->priv->pixels; + _tmp52_ = self->priv->pixels; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = scaling_pixels; + _tmp53_ = scaling_pixels; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = g_strdup_printf ("%i", _tmp54_); + _tmp54_ = g_strdup_printf ("%i", _tmp53_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = _tmp55_; + _tmp55_ = _tmp54_; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp53_, _tmp56_); + gtk_entry_set_text (_tmp52_, _tmp55_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp56_); + _g_free0 (_tmp55_); #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = self->priv->use_existing_radio; + _tmp56_ = self->priv->use_existing_radio; #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = self->priv->create_new_radio; + _tmp57_ = self->priv->create_new_radio; #line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = self->priv->new_album_entry; + _tmp58_ = self->priv->new_album_entry; #line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp60_ = self->priv->scaling_combo; + _tmp59_ = self->priv->scaling_combo; #line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed, self, 0); #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp61_ = self->priv->pixels; + _tmp60_ = self->priv->pixels; #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed, self, 0); #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = self->priv->logout_button; + _tmp61_ = self->priv->logout_button; #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp63_ = self->priv->publish_button; + _tmp62_ = self->priv->publish_button; #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 9627 "GalleryConnector.c" +#line 9640 "GalleryConnector.c" } PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_pane_new (SpitPublishingPluginHost* host, const gchar* url, const gchar* username, PublishingGallery3Album** albums, int albums_length1, GtkBuilder* builder, gboolean strip_metadata, gint scaling_id, gint scaling_pixels) { #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_options_pane_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, host, url, username, albums, albums_length1, builder, strip_metadata, scaling_id, scaling_pixels); -#line 9634 "GalleryConnector.c" +#line 9647 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) { gchar* album_name = NULL; gint _tmp0_ = 0; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + GtkComboBoxText* _tmp1_; + gint _tmp2_; gint photo_major_axis_size = 0; PublishingGallery3PublishingParameters* param = NULL; - GtkRadioButton* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - PublishingGallery3PublishingParameters* _tmp34_ = NULL; - gint _tmp35_ = 0; - PublishingGallery3PublishingParameters* _tmp36_ = NULL; - GtkCheckButton* _tmp37_ = NULL; - gboolean _tmp38_ = FALSE; - PublishingGallery3PublishingParameters* _tmp39_ = NULL; + GtkRadioButton* _tmp6_; + gboolean _tmp7_; + PublishingGallery3PublishingParameters* _tmp34_; + gint _tmp35_; + PublishingGallery3PublishingParameters* _tmp36_; + GtkCheckButton* _tmp37_; + gboolean _tmp38_; + PublishingGallery3PublishingParameters* _tmp39_; #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9698,10 +9711,10 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp2_ == 1) { -#line 9661 "GalleryConnector.c" - GtkEntry* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; +#line 9674 "GalleryConnector.c" + GtkEntry* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = self->priv->pixels; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9710,11 +9723,11 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp5_ = atoi (_tmp4_); #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = _tmp5_; -#line 9673 "GalleryConnector.c" +#line 9686 "GalleryConnector.c" } else { #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = -1; -#line 9677 "GalleryConnector.c" +#line 9690 "GalleryConnector.c" } #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" photo_major_axis_size = _tmp0_; @@ -9724,15 +9737,15 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp7_) { -#line 9687 "GalleryConnector.c" - GtkEntry* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - SpitPublishingPluginHost* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - PublishingGallery3PublishingParameters* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; +#line 9700 "GalleryConnector.c" + GtkEntry* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + SpitPublishingPluginHost* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + PublishingGallery3PublishingParameters* _tmp14_; + const gchar* _tmp15_; #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->new_album_entry; #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9761,29 +9774,29 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ _tmp15_ = album_name; #line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp15_); -#line 9724 "GalleryConnector.c" +#line 9737 "GalleryConnector.c" } else { - PublishingGallery3Album** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - GtkComboBoxText* _tmp17_ = NULL; - gint _tmp18_ = 0; - PublishingGallery3Album* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - SpitPublishingPluginHost* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + PublishingGallery3Album** _tmp16_; + gint _tmp16__length1; + GtkComboBoxText* _tmp17_; + gint _tmp18_; + PublishingGallery3Album* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + SpitPublishingPluginHost* _tmp23_; + const gchar* _tmp24_; gchar* album_path = NULL; - PublishingGallery3Album** _tmp25_ = NULL; - gint _tmp25__length1 = 0; - GtkComboBoxText* _tmp26_ = NULL; - gint _tmp27_ = 0; - PublishingGallery3Album* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - PublishingGallery3PublishingParameters* _tmp33_ = NULL; + PublishingGallery3Album** _tmp25_; + gint _tmp25__length1; + GtkComboBoxText* _tmp26_; + gint _tmp27_; + PublishingGallery3Album* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; + const gchar* _tmp32_; + PublishingGallery3PublishingParameters* _tmp33_; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = self->priv->albums; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9838,7 +9851,7 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ param = _tmp33_; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_path); -#line 9801 "GalleryConnector.c" +#line 9814 "GalleryConnector.c" } #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp34_ = param; @@ -9857,19 +9870,19 @@ static void publishing_gallery3_publishing_options_pane_on_publish_clicked (Publ #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp39_ = param; #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "publish", _tmp39_); + g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_); #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (param); #line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); -#line 9825 "GalleryConnector.c" +#line 9838 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { - GtkComboBoxText* _tmp0_ = NULL; - GtkEntry* _tmp1_ = NULL; - GtkComboBoxText* _tmp2_ = NULL; + GtkComboBoxText* _tmp0_; + GtkEntry* _tmp1_; + GtkComboBoxText* _tmp2_; #line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9886,14 +9899,14 @@ static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_cl gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9849 "GalleryConnector.c" +#line 9862 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; + GtkEntry* _tmp0_; + GtkComboBoxText* _tmp1_; + GtkEntry* _tmp2_; #line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9910,7 +9923,7 @@ static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clic gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9873 "GalleryConnector.c" +#line 9886 "GalleryConnector.c" } @@ -9918,45 +9931,45 @@ static void publishing_gallery3_publishing_options_pane_on_logout_clicked (Publi #line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "logout"); -#line 9882 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); +#line 9895 "GalleryConnector.c" } static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 9905 "GalleryConnector.c" +#line 9918 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) { gchar* album_name = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GtkButton* _tmp10_ = NULL; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gboolean _tmp7_; + GtkButton* _tmp10_; #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9979,20 +9992,20 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se _g_free0 (_tmp6_); #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp7_) { -#line 9942 "GalleryConnector.c" - GtkRadioButton* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 9955 "GalleryConnector.c" + GtkRadioButton* _tmp8_; + gboolean _tmp9_; #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->create_new_radio; #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = _tmp9_; -#line 9951 "GalleryConnector.c" +#line 9964 "GalleryConnector.c" } else { #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = FALSE; -#line 9955 "GalleryConnector.c" +#line 9968 "GalleryConnector.c" } #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp10_ = self->priv->publish_button; @@ -10000,7 +10013,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_); #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); -#line 9963 "GalleryConnector.c" +#line 9976 "GalleryConnector.c" } @@ -10009,14 +10022,14 @@ static void publishing_gallery3_publishing_options_pane_on_new_album_entry_chang g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (self); -#line 9972 "GalleryConnector.c" +#line 9985 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) { - GtkEntry* _tmp0_ = NULL; - GtkComboBoxText* _tmp1_ = NULL; - gint _tmp2_ = 0; + GtkEntry* _tmp0_; + GtkComboBoxText* _tmp1_; + gint _tmp2_; #line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10027,7 +10040,7 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp2_ == 1); -#line 9990 "GalleryConnector.c" +#line 10003 "GalleryConnector.c" } @@ -10036,50 +10049,50 @@ static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_ch g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self); -#line 9999 "GalleryConnector.c" +#line 10012 "GalleryConnector.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 10022 "GalleryConnector.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10035 "GalleryConnector.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 10030 "GalleryConnector.c" +#line 10043 "GalleryConnector.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 10042 "GalleryConnector.c" +#line 10055 "GalleryConnector.c" } } @@ -10088,140 +10101,140 @@ 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 10066 "GalleryConnector.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10079 "GalleryConnector.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 10072 "GalleryConnector.c" +#line 10085 "GalleryConnector.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 10076 "GalleryConnector.c" +#line 10089 "GalleryConnector.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 10080 "GalleryConnector.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10093 "GalleryConnector.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 10092 "GalleryConnector.c" +#line 10105 "GalleryConnector.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 10102 "GalleryConnector.c" +#line 10115 "GalleryConnector.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 10108 "GalleryConnector.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10121 "GalleryConnector.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 10122 "GalleryConnector.c" +#line 10135 "GalleryConnector.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 10132 "GalleryConnector.c" +#line 10145 "GalleryConnector.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 10138 "GalleryConnector.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 10151 "GalleryConnector.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 10147 "GalleryConnector.c" +#line 10160 "GalleryConnector.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 10167 "GalleryConnector.c" +#line 10180 "GalleryConnector.c" } static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) { gchar* orig_text = NULL; - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; gchar last_char = '\0'; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gchar _tmp7_ = '\0'; - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + const gchar* _tmp3_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gchar _tmp7_; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10252,23 +10265,23 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi _tmp10_ = _tmp9_; #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp10_ > 0) { -#line 10215 "GalleryConnector.c" - gchar _tmp11_ = '\0'; - gboolean _tmp12_ = FALSE; +#line 10228 "GalleryConnector.c" + gchar _tmp11_; + gboolean _tmp12_; #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = last_char; #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = g_ascii_isdigit (_tmp11_); #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp12_) { -#line 10224 "GalleryConnector.c" - GtkEntry* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - gint _tmp16_ = 0; - gint _tmp17_ = 0; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; +#line 10237 "GalleryConnector.c" + GtkEntry* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = self->priv->pixels; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10287,22 +10300,22 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi gtk_entry_set_text (_tmp13_, _tmp19_); #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp19_); -#line 10250 "GalleryConnector.c" +#line 10263 "GalleryConnector.c" } } #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (orig_text); -#line 10255 "GalleryConnector.c" +#line 10268 "GalleryConnector.c" } void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) { gint default_album_id = 0; gchar* last_album = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PublishingGallery3Album** _tmp27_ = NULL; - gint _tmp27__length1 = 0; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; + PublishingGallery3Album** _tmp27_; + gint _tmp27__length1; #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10313,46 +10326,46 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, ""); #line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" last_album = _tmp1_; -#line 10276 "GalleryConnector.c" +#line 10289 "GalleryConnector.c" { gint i = 0; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 10281 "GalleryConnector.c" +#line 10294 "GalleryConnector.c" { gboolean _tmp2_ = FALSE; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = TRUE; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#line 10288 "GalleryConnector.c" - gint _tmp4_ = 0; - PublishingGallery3Album** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GtkComboBoxText* _tmp6_ = NULL; - PublishingGallery3Album** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - gint _tmp8_ = 0; - PublishingGallery3Album* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; +#line 10301 "GalleryConnector.c" + gint _tmp4_; + PublishingGallery3Album** _tmp5_; + gint _tmp5__length1; + GtkComboBoxText* _tmp6_; + PublishingGallery3Album** _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + PublishingGallery3Album* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; gboolean _tmp12_ = FALSE; - PublishingGallery3Album** _tmp13_ = NULL; - gint _tmp13__length1 = 0; - gint _tmp14_ = 0; - PublishingGallery3Album* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + PublishingGallery3Album** _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + PublishingGallery3Album* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 10309 "GalleryConnector.c" - gint _tmp3_ = 0; +#line 10322 "GalleryConnector.c" + gint _tmp3_; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = i; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = _tmp3_ + 1; -#line 10315 "GalleryConnector.c" +#line 10328 "GalleryConnector.c" } #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -10366,7 +10379,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu if (!(_tmp4_ <= (_tmp5__length1 - 1))) { #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 10329 "GalleryConnector.c" +#line 10342 "GalleryConnector.c" } #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = self->priv->existing_albums_combo; @@ -10402,15 +10415,15 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = TRUE; -#line 10365 "GalleryConnector.c" +#line 10378 "GalleryConnector.c" } else { gboolean _tmp19_ = FALSE; - PublishingGallery3Album** _tmp20_ = NULL; - gint _tmp20__length1 = 0; - gint _tmp21_ = 0; - PublishingGallery3Album* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - const gchar* _tmp24_ = NULL; + PublishingGallery3Album** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + PublishingGallery3Album* _tmp22_; + const gchar* _tmp23_; + const gchar* _tmp24_; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp20_ = self->priv->albums; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10425,31 +10438,31 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp24_ = _tmp23_; #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME, _tmp24_) == 0) { -#line 10388 "GalleryConnector.c" - gint _tmp25_ = 0; +#line 10401 "GalleryConnector.c" + gint _tmp25_; #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp25_ = default_album_id; #line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = -1 == _tmp25_; -#line 10394 "GalleryConnector.c" +#line 10407 "GalleryConnector.c" } else { #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = FALSE; -#line 10398 "GalleryConnector.c" +#line 10411 "GalleryConnector.c" } #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = _tmp19_; -#line 10402 "GalleryConnector.c" +#line 10415 "GalleryConnector.c" } #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp12_) { -#line 10406 "GalleryConnector.c" - gint _tmp26_ = 0; +#line 10419 "GalleryConnector.c" + gint _tmp26_; #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp26_ = i; #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" default_album_id = _tmp26_; -#line 10412 "GalleryConnector.c" +#line 10425 "GalleryConnector.c" } } } @@ -10460,12 +10473,12 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp27__length1 = self->priv->albums_length1; #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp27__length1 == 0) { -#line 10423 "GalleryConnector.c" - GtkComboBoxText* _tmp28_ = NULL; - GtkRadioButton* _tmp29_ = NULL; - GtkRadioButton* _tmp30_ = NULL; - GtkEntry* _tmp31_ = NULL; - GtkEntry* _tmp32_ = NULL; +#line 10436 "GalleryConnector.c" + GtkComboBoxText* _tmp28_; + GtkRadioButton* _tmp29_; + GtkRadioButton* _tmp30_; + GtkEntry* _tmp31_; + GtkEntry* _tmp32_; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp28_ = self->priv->existing_albums_combo; #line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10486,18 +10499,18 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp32_ = self->priv->new_album_entry; #line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_entry_set_text (_tmp32_, PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME); -#line 10449 "GalleryConnector.c" +#line 10462 "GalleryConnector.c" } else { - gint _tmp33_ = 0; + gint _tmp33_; #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp33_ = default_album_id; #line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp33_ >= 0) { -#line 10456 "GalleryConnector.c" - GtkRadioButton* _tmp34_ = NULL; - GtkComboBoxText* _tmp35_ = NULL; - gint _tmp36_ = 0; - GtkEntry* _tmp37_ = NULL; +#line 10469 "GalleryConnector.c" + GtkRadioButton* _tmp34_; + GtkComboBoxText* _tmp35_; + gint _tmp36_; + GtkEntry* _tmp37_; #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp34_ = self->priv->use_existing_radio; #line 1661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10512,12 +10525,12 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp37_ = self->priv->new_album_entry; #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 10475 "GalleryConnector.c" +#line 10488 "GalleryConnector.c" } else { - GtkRadioButton* _tmp38_ = NULL; - GtkComboBoxText* _tmp39_ = NULL; - GtkEntry* _tmp40_ = NULL; - GtkEntry* _tmp41_ = NULL; + GtkRadioButton* _tmp38_; + GtkComboBoxText* _tmp39_; + GtkEntry* _tmp40_; + GtkEntry* _tmp41_; #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = self->priv->create_new_radio; #line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10534,7 +10547,7 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu _tmp41_ = self->priv->new_album_entry; #line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget)); -#line 10497 "GalleryConnector.c" +#line 10510 "GalleryConnector.c" } } #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10543,15 +10556,15 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (self); #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (last_album); -#line 10506 "GalleryConnector.c" +#line 10519 "GalleryConnector.c" } static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingGallery3PublishingOptionsPane * self; GtkWidget* result = NULL; - GtkGrid* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; + GtkGrid* _tmp0_; + GtkWidget* _tmp1_; #line 1675 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); #line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10562,7 +10575,7 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S result = _tmp1_; #line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10525 "GalleryConnector.c" +#line 10538 "GalleryConnector.c" } @@ -10575,7 +10588,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_op result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10538 "GalleryConnector.c" +#line 10551 "GalleryConnector.c" } @@ -10585,7 +10598,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_installed ( self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); #line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_installed (self); -#line 10548 "GalleryConnector.c" +#line 10561 "GalleryConnector.c" } @@ -10593,7 +10606,7 @@ static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled PublishingGallery3PublishingOptionsPane * self; #line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); -#line 10556 "GalleryConnector.c" +#line 10569 "GalleryConnector.c" } @@ -10612,19 +10625,19 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMET data1 = closure->data; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = param_values->data[0].v_pointer; -#line 10575 "GalleryConnector.c" +#line 10588 "GalleryConnector.c" } else { #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data1 = param_values->data[0].v_pointer; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = closure->data; -#line 10581 "GalleryConnector.c" +#line 10594 "GalleryConnector.c" } #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback = (GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback (data1, publishing_gallery3_value_get_publishing_parameters (param_values + 1), data2); -#line 10587 "GalleryConnector.c" +#line 10600 "GalleryConnector.c" } @@ -10636,10 +10649,10 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_publishing_options_pane_finalize; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); + publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 10602 "GalleryConnector.c" + publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 10615 "GalleryConnector.c" } @@ -10647,14 +10660,14 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_widget; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_get_preferred_geometry; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_installed; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled; -#line 10617 "GalleryConnector.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled; +#line 10630 "GalleryConnector.c" } @@ -10685,11 +10698,11 @@ static void publishing_gallery3_publishing_options_pane_instance_init (Publishin self->priv->publish_button = NULL; #line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->logout_button = NULL; -#line 10648 "GalleryConnector.c" +#line 10661 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj) { +static void publishing_gallery3_publishing_options_pane_finalize (GObject * obj) { PublishingGallery3PublishingOptionsPane * self; #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_OPTIONS_PANE, PublishingGallery3PublishingOptionsPane); @@ -10721,7 +10734,7 @@ static void publishing_gallery3_publishing_options_pane_finalize (GObject* obj) self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_publishing_options_pane_parent_class)->finalize (obj); -#line 10684 "GalleryConnector.c" +#line 10697 "GalleryConnector.c" } @@ -10745,54 +10758,54 @@ static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_pa self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type); #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10708 "GalleryConnector.c" +#line 10721 "GalleryConnector.c" } static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void) { #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS); -#line 10715 "GalleryConnector.c" +#line 10728 "GalleryConnector.c" } static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar _tmp3_ = '\0'; -#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar _tmp3_; +#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 10746 "GalleryConnector.c" +#line 10759 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) { PublishingGallery3PublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (album_title != NULL, NULL); #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10813,20 +10826,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_); #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10776 "GalleryConnector.c" +#line 10789 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title) { #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct_to_new_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_title); -#line 10783 "GalleryConnector.c" +#line 10796 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) { PublishingGallery3PublishingParameters* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (album_path != NULL, NULL); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10837,20 +10850,20 @@ PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameter publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10800 "GalleryConnector.c" +#line 10813 "GalleryConnector.c" } PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path) { #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_publishing_parameters_construct_to_existing_album (PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, album_path); -#line 10807 "GalleryConnector.c" +#line 10820 "GalleryConnector.c" } gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE); #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10859,14 +10872,14 @@ gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGa result = g_strcmp0 (_tmp0_, "") != 0; #line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10822 "GalleryConnector.c" +#line 10835 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) { const gchar* result; - gboolean _tmp0_ = FALSE; - const gchar* _tmp1_ = NULL; + gboolean _tmp0_; + const gchar* _tmp1_; #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10879,13 +10892,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_title (Publishi result = _tmp1_; #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10842 "GalleryConnector.c" +#line 10855 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10896,13 +10909,13 @@ static void publishing_gallery3_publishing_parameters_set_album_title (Publishin _g_free0 (self->priv->_album_title); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_title = _tmp1_; -#line 10859 "GalleryConnector.c" +#line 10872 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10911,13 +10924,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_name (Publishin result = _tmp0_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10874 "GalleryConnector.c" +#line 10887 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10928,13 +10941,13 @@ static void publishing_gallery3_publishing_parameters_set_album_name (Publishing _g_free0 (self->priv->_album_name); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_name = _tmp1_; -#line 10891 "GalleryConnector.c" +#line 10904 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10943,13 +10956,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_album_path (Publishin result = _tmp0_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10906 "GalleryConnector.c" +#line 10919 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10960,13 +10973,13 @@ void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery _g_free0 (self->priv->_album_path); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_path = _tmp1_; -#line 10923 "GalleryConnector.c" +#line 10936 "GalleryConnector.c" } const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), NULL); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10975,13 +10988,13 @@ const gchar* publishing_gallery3_publishing_parameters_get_entity_title (Publish result = _tmp0_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10938 "GalleryConnector.c" +#line 10951 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10992,13 +11005,13 @@ static void publishing_gallery3_publishing_parameters_set_entity_title (Publishi _g_free0 (self->priv->_entity_title); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_entity_title = _tmp1_; -#line 10955 "GalleryConnector.c" +#line 10968 "GalleryConnector.c" } gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), 0); #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11007,25 +11020,25 @@ gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (Publis result = _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10970 "GalleryConnector.c" +#line 10983 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) { - gint _tmp0_ = 0; + gint _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_photo_major_axis_size = _tmp0_; -#line 10982 "GalleryConnector.c" +#line 10995 "GalleryConnector.c" } gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) { gboolean result; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self), FALSE); #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11034,26 +11047,26 @@ gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (Publishin result = _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10997 "GalleryConnector.c" +#line 11010 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (self)); #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = value; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_strip_metadata = _tmp0_; -#line 11009 "GalleryConnector.c" +#line 11022 "GalleryConnector.c" } static void publishing_gallery3_value_publishing_parameters_init (GValue* value) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11016 "GalleryConnector.c" +#line 11029 "GalleryConnector.c" } @@ -11062,7 +11075,7 @@ static void publishing_gallery3_value_publishing_parameters_free_value (GValue* if (value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (value->data[0].v_pointer); -#line 11025 "GalleryConnector.c" +#line 11038 "GalleryConnector.c" } } @@ -11072,11 +11085,11 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV if (src_value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 11035 "GalleryConnector.c" +#line 11048 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 11039 "GalleryConnector.c" +#line 11052 "GalleryConnector.c" } } @@ -11084,66 +11097,66 @@ static void publishing_gallery3_value_publishing_parameters_copy_value (const GV static gpointer publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 11047 "GalleryConnector.c" +#line 11060 "GalleryConnector.c" } static gchar* publishing_gallery3_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (collect_values[0].v_pointer) { -#line 11054 "GalleryConnector.c" - PublishingGallery3PublishingParameters* object; +#line 11067 "GalleryConnector.c" + PublishingGallery3PublishingParameters * object; object = collect_values[0].v_pointer; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (object->parent_instance.g_class == NULL) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 11061 "GalleryConnector.c" +#line 11074 "GalleryConnector.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.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 11065 "GalleryConnector.c" +#line 11078 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = publishing_gallery3_publishing_parameters_ref (object); -#line 11069 "GalleryConnector.c" +#line 11082 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11073 "GalleryConnector.c" +#line 11086 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11077 "GalleryConnector.c" +#line 11090 "GalleryConnector.c" } static gchar* publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PublishingGallery3PublishingParameters** object_p; + PublishingGallery3PublishingParameters ** object_p; object_p = collect_values[0].v_pointer; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!object_p) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 11088 "GalleryConnector.c" +#line 11101 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!value->data[0].v_pointer) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = NULL; -#line 11094 "GalleryConnector.c" +#line 11107 "GalleryConnector.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = value->data[0].v_pointer; -#line 11098 "GalleryConnector.c" +#line 11111 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" *object_p = publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer); -#line 11102 "GalleryConnector.c" +#line 11115 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11106 "GalleryConnector.c" +#line 11119 "GalleryConnector.c" } @@ -11157,7 +11170,7 @@ GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* n G_PARAM_SPEC (spec)->value_type = object_type; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return G_PARAM_SPEC (spec); -#line 11120 "GalleryConnector.c" +#line 11133 "GalleryConnector.c" } @@ -11166,12 +11179,12 @@ gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* valu g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return value->data[0].v_pointer; -#line 11129 "GalleryConnector.c" +#line 11142 "GalleryConnector.c" } void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) { - PublishingGallery3PublishingParameters* old; + PublishingGallery3PublishingParameters * old; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS)); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11186,23 +11199,23 @@ void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointe value->data[0].v_pointer = v_object; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_ref (value->data[0].v_pointer); -#line 11149 "GalleryConnector.c" +#line 11162 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11153 "GalleryConnector.c" +#line 11166 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (old); -#line 11159 "GalleryConnector.c" +#line 11172 "GalleryConnector.c" } } void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) { - PublishingGallery3PublishingParameters* old; + PublishingGallery3PublishingParameters * old; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS)); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11215,17 +11228,17 @@ void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpoint g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = v_object; -#line 11178 "GalleryConnector.c" +#line 11191 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11182 "GalleryConnector.c" +#line 11195 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (old) { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_unref (old); -#line 11188 "GalleryConnector.c" +#line 11201 "GalleryConnector.c" } } @@ -11237,15 +11250,15 @@ static void publishing_gallery3_publishing_parameters_class_init (PublishingGall ((PublishingGallery3PublishingParametersClass *) klass)->finalize = publishing_gallery3_publishing_parameters_finalize; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3PublishingParametersPrivate)); -#line 11200 "GalleryConnector.c" +#line 11213 "GalleryConnector.c" } static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_PRIVATE (self); #line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11270,11 +11283,11 @@ static void publishing_gallery3_publishing_parameters_instance_init (PublishingG self->priv->_strip_metadata = FALSE; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->ref_count = 1; -#line 11233 "GalleryConnector.c" +#line 11246 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters* obj) { +static void publishing_gallery3_publishing_parameters_finalize (PublishingGallery3PublishingParameters * obj) { PublishingGallery3PublishingParameters * self; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS, PublishingGallery3PublishingParameters); @@ -11288,7 +11301,7 @@ static void publishing_gallery3_publishing_parameters_finalize (PublishingGaller _g_free0 (self->priv->_album_path); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_entity_title); -#line 11251 "GalleryConnector.c" +#line 11264 "GalleryConnector.c" } @@ -11307,18 +11320,18 @@ GType publishing_gallery3_publishing_parameters_get_type (void) { gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) { - PublishingGallery3PublishingParameters* self; + PublishingGallery3PublishingParameters * self; self = instance; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_atomic_int_inc (&self->ref_count); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return instance; -#line 11276 "GalleryConnector.c" +#line 11289 "GalleryConnector.c" } void publishing_gallery3_publishing_parameters_unref (gpointer instance) { - PublishingGallery3PublishingParameters* self; + PublishingGallery3PublishingParameters * self; self = instance; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -11326,7 +11339,7 @@ void publishing_gallery3_publishing_parameters_unref (gpointer instance) { PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_free_instance ((GTypeInstance *) self); -#line 11289 "GalleryConnector.c" +#line 11302 "GalleryConnector.c" } } @@ -11337,49 +11350,49 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr switch (self) { #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11300 "GalleryConnector.c" +#line 11313 "GalleryConnector.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strdup ("INTRO"); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11309 "GalleryConnector.c" +#line 11322 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11313 "GalleryConnector.c" +#line 11326 "GalleryConnector.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = g_strdup ("FAILED_RETRY"); #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11322 "GalleryConnector.c" +#line 11335 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11326 "GalleryConnector.c" +#line 11339 "GalleryConnector.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = g_strdup ("NOT_GALLERY_URL"); #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11335 "GalleryConnector.c" +#line 11348 "GalleryConnector.c" } default: { #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1746: unrecognized CredentialsPane.Mode enumerat" \ "ion value"); -#line 11341 "GalleryConnector.c" +#line 11354 "GalleryConnector.c" } } } @@ -11400,18 +11413,18 @@ GType publishing_gallery3_credentials_pane_mode_get_type (void) { PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) { PublishingGallery3CredentialsPane * self = NULL; GtkBuilder* builder = NULL; - GtkBuilder* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp10_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp11_ = 0; - const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GtkBuilder* _tmp15_ = NULL; - PublishingGallery3CredentialsGrid* _tmp16_ = NULL; - PublishingGallery3CredentialsGrid* _tmp17_ = NULL; - GtkGrid* _tmp18_ = NULL; - GtkGrid* _tmp19_ = NULL; - GtkWidget* _tmp20_ = NULL; + GtkBuilder* _tmp0_; + SpitPublishingPluginHost* _tmp9_; + PublishingGallery3CredentialsPaneMode _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + GtkBuilder* _tmp14_; + PublishingGallery3CredentialsGrid* _tmp15_; + PublishingGallery3CredentialsGrid* _tmp16_; + GtkGrid* _tmp17_; + GtkGrid* _tmp18_; + GtkWidget* _tmp19_; GError * _inner_error_ = NULL; #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); @@ -11421,16 +11434,16 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc _tmp0_ = gtk_builder_new (); #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" builder = _tmp0_; -#line 11383 "GalleryConnector.c" +#line 11396 "GalleryConnector.c" { - GtkBuilder* _tmp1_ = NULL; + GtkBuilder* _tmp1_; #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = builder; #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/gallery3_authentication_pane.ui", &_inner_error_); #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 11392 "GalleryConnector.c" +#line 11405 "GalleryConnector.c" goto __catch15_g_error; } } @@ -11438,14 +11451,13 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc __catch15_g_error: { GError* e = NULL; - GError* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - SpitPublishingPluginHost* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - GError* _tmp9_ = NULL; + GError* _tmp2_; + const gchar* _tmp3_; + SpitPublishingPluginHost* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" e = _inner_error_; #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11459,29 +11471,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = host; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \ -"continue."); -#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME); + _tmp5_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \ +"continue."), PUBLISHING_GALLERY3_SERVICE_NAME); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_); + _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp9_); + spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_error_free0 (_tmp9_); + _g_error_free0 (_tmp8_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp6_); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (e); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 11442 "GalleryConnector.c" +#line 11452 "GalleryConnector.c" } __finally15: #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11494,50 +11504,50 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc g_clear_error (&_inner_error_); #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11455 "GalleryConnector.c" +#line 11465 "GalleryConnector.c" } #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = host; + _tmp9_ = host; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = mode; + _tmp10_ = mode; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = url; + _tmp11_ = url; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = username; + _tmp12_ = username; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = key; + _tmp13_ = key; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = builder; + _tmp14_ = builder; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_credentials_grid_new (_tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); + _tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->frame); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->frame = _tmp16_; + self->priv->frame = _tmp15_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = self->priv->frame; + _tmp16_ = self->priv->frame; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp17_); + _tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp19_) : NULL); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : NULL); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->grid_widget); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->grid_widget = _tmp20_; + self->priv->grid_widget = _tmp19_; #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (builder); #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 11491 "GalleryConnector.c" +#line 11501 "GalleryConnector.c" } PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) { #line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_credentials_pane_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, host, mode, url, username, key); -#line 11498 "GalleryConnector.c" +#line 11508 "GalleryConnector.c" } @@ -11545,16 +11555,16 @@ void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3Cred #line 1785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self)); #line 1786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "go-back"); -#line 11507 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0); +#line 11517 "GalleryConnector.c" } void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_PANE (self)); #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11574,17 +11584,17 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = key; #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "login", _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 11536 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_); +#line 11546 "GalleryConnector.c" } static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; GtkWidget* result = NULL; - GtkWidget* _tmp0_ = NULL; - GtkWidget* _tmp1_ = NULL; - GtkWidget* _tmp2_ = NULL; + GtkWidget* _tmp0_; + GtkWidget* _tmp1_; + GtkWidget* _tmp2_; #line 1794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11599,7 +11609,7 @@ static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPubl result = _tmp2_; #line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11560 "GalleryConnector.c" +#line 11570 "GalleryConnector.c" } @@ -11612,29 +11622,29 @@ static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_p result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11573 "GalleryConnector.c" +#line 11583 "GalleryConnector.c" } static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self) { #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_notify_go_back ((PublishingGallery3CredentialsPane*) self); -#line 11580 "GalleryConnector.c" +#line 11590 "GalleryConnector.c" } static void _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login (PublishingGallery3CredentialsGrid* _sender, const gchar* url, const gchar* username, const gchar* password, const gchar* key, gpointer self) { #line 1805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_notify_login ((PublishingGallery3CredentialsPane*) self, url, username, password, key); -#line 11587 "GalleryConnector.c" +#line 11597 "GalleryConnector.c" } static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; - PublishingGallery3CredentialsGrid* _tmp0_ = NULL; - PublishingGallery3CredentialsGrid* _tmp1_ = NULL; - PublishingGallery3CredentialsGrid* _tmp2_ = NULL; + PublishingGallery3CredentialsGrid* _tmp0_; + PublishingGallery3CredentialsGrid* _tmp1_; + PublishingGallery3CredentialsGrid* _tmp2_; #line 1803 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11649,16 +11659,16 @@ static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPub _tmp2_ = self->priv->frame; #line 1807 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_installed (_tmp2_); -#line 11610 "GalleryConnector.c" +#line 11620 "GalleryConnector.c" } static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingGallery3CredentialsPane * self; - PublishingGallery3CredentialsGrid* _tmp0_ = NULL; - guint _tmp1_ = 0U; - PublishingGallery3CredentialsGrid* _tmp2_ = NULL; - guint _tmp3_ = 0U; + PublishingGallery3CredentialsGrid* _tmp0_; + guint _tmp1_; + PublishingGallery3CredentialsGrid* _tmp2_; + guint _tmp3_; #line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); #line 1811 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11673,7 +11683,7 @@ static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitP g_signal_parse_name ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, &_tmp3_, NULL, FALSE); #line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_gallery3_credentials_pane_notify_login_publishing_gallery3_credentials_grid_login, self); -#line 11634 "GalleryConnector.c" +#line 11644 "GalleryConnector.c" } @@ -11692,19 +11702,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING (GClosure data1 = closure->data; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = param_values->data[0].v_pointer; -#line 11653 "GalleryConnector.c" +#line 11663 "GalleryConnector.c" } else { #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data1 = param_values->data[0].v_pointer; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" data2 = closure->data; -#line 11659 "GalleryConnector.c" +#line 11669 "GalleryConnector.c" } #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback = (GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_string (param_values + 4), data2); -#line 11665 "GalleryConnector.c" +#line 11675 "GalleryConnector.c" } @@ -11716,10 +11726,10 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_pane_finalize; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("go_back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); -#line 11680 "GalleryConnector.c" + publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); +#line 11690 "GalleryConnector.c" } @@ -11727,14 +11737,14 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_widget; + iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_widget; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_get_preferred_geometry; + iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_get_preferred_geometry; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_on_pane_installed; + iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_installed; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled; -#line 11695 "GalleryConnector.c" + iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_gallery3_credentials_pane_real_on_pane_uninstalled; +#line 11705 "GalleryConnector.c" } @@ -11745,11 +11755,11 @@ static void publishing_gallery3_credentials_pane_instance_init (PublishingGaller self->priv->frame = NULL; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->grid_widget = NULL; -#line 11706 "GalleryConnector.c" +#line 11716 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_finalize (GObject* obj) { +static void publishing_gallery3_credentials_pane_finalize (GObject * obj) { PublishingGallery3CredentialsPane * self; #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_PANE, PublishingGallery3CredentialsPane); @@ -11759,7 +11769,7 @@ static void publishing_gallery3_credentials_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->grid_widget); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_credentials_pane_parent_class)->finalize (obj); -#line 11720 "GalleryConnector.c" +#line 11730 "GalleryConnector.c" } @@ -11780,75 +11790,75 @@ GType publishing_gallery3_credentials_pane_get_type (void) { static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_url_or_username_changed ((PublishingGallery3CredentialsGrid*) self); -#line 11741 "GalleryConnector.c" +#line 11751 "GalleryConnector.c" } static void _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_go_back_button_clicked ((PublishingGallery3CredentialsGrid*) self); -#line 11748 "GalleryConnector.c" +#line 11758 "GalleryConnector.c" } static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_on_login_button_clicked ((PublishingGallery3CredentialsGrid*) self); -#line 11755 "GalleryConnector.c" +#line 11765 "GalleryConnector.c" } PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) { PublishingGallery3CredentialsGrid * self = NULL; - SpitPublishingPluginHost* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GtkBuilder* _tmp7_ = NULL; - GtkBuilder* _tmp8_ = NULL; - GtkBuilder* _tmp9_ = NULL; - GtkBuilder* _tmp10_ = NULL; - GSList* _tmp11_ = NULL; - GSList* _tmp12_ = NULL; - guint _tmp13_ = 0U; - GtkBuilder* _tmp14_ = NULL; - GObject* _tmp15_ = NULL; - GtkBuilder* _tmp16_ = NULL; - GObject* _tmp17_ = NULL; - GtkLabel* _tmp18_ = NULL; - GtkBuilder* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; - GtkEntry* _tmp21_ = NULL; - GtkBuilder* _tmp22_ = NULL; - GObject* _tmp23_ = NULL; - GtkEntry* _tmp24_ = NULL; - GtkBuilder* _tmp25_ = NULL; - GObject* _tmp26_ = NULL; - GtkEntry* _tmp27_ = NULL; - GtkBuilder* _tmp28_ = NULL; - GObject* _tmp29_ = NULL; - GtkEntry* _tmp30_ = NULL; - GtkBuilder* _tmp31_ = NULL; - GObject* _tmp32_ = NULL; - GtkButton* _tmp33_ = NULL; - GtkBuilder* _tmp34_ = NULL; - GObject* _tmp35_ = NULL; - GtkButton* _tmp36_ = NULL; - PublishingGallery3CredentialsPaneMode _tmp37_ = 0; - const gchar* _tmp47_ = NULL; - GtkEntry* _tmp51_ = NULL; - const gchar* _tmp52_ = NULL; - GtkEntry* _tmp56_ = NULL; - const gchar* _tmp57_ = NULL; - GtkEntry* _tmp61_ = NULL; - GtkButton* _tmp62_ = NULL; - GtkButton* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; - const gchar* _tmp65_ = NULL; - GtkButton* _tmp67_ = NULL; + SpitPublishingPluginHost* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + GtkBuilder* _tmp7_; + GtkBuilder* _tmp8_; + GtkBuilder* _tmp9_; + GtkBuilder* _tmp10_; + GSList* _tmp11_; + GSList* _tmp12_; + guint _tmp13_; + GtkBuilder* _tmp14_; + GObject* _tmp15_; + GtkBuilder* _tmp16_; + GObject* _tmp17_; + GtkLabel* _tmp18_; + GtkBuilder* _tmp19_; + GObject* _tmp20_; + GtkEntry* _tmp21_; + GtkBuilder* _tmp22_; + GObject* _tmp23_; + GtkEntry* _tmp24_; + GtkBuilder* _tmp25_; + GObject* _tmp26_; + GtkEntry* _tmp27_; + GtkBuilder* _tmp28_; + GObject* _tmp29_; + GtkEntry* _tmp30_; + GtkBuilder* _tmp31_; + GObject* _tmp32_; + GtkButton* _tmp33_; + GtkBuilder* _tmp34_; + GObject* _tmp35_; + GtkButton* _tmp36_; + PublishingGallery3CredentialsPaneMode _tmp37_; + const gchar* _tmp45_; + GtkEntry* _tmp49_; + const gchar* _tmp50_; + GtkEntry* _tmp54_; + const gchar* _tmp55_; + GtkEntry* _tmp59_; + GtkButton* _tmp60_; + GtkButton* _tmp61_; + gboolean _tmp62_ = FALSE; + const gchar* _tmp63_; + GtkButton* _tmp65_; #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11989,194 +11999,188 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc switch (_tmp37_) { #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11950 "GalleryConnector.c" +#line 11960 "GalleryConnector.c" { - GtkLabel* _tmp38_ = NULL; + GtkLabel* _tmp38_; #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp38_ = self->priv->intro_message_label; #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_label_set_markup (_tmp38_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE); #line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11959 "GalleryConnector.c" +#line 11969 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11963 "GalleryConnector.c" +#line 11973 "GalleryConnector.c" { - GtkLabel* _tmp39_ = NULL; - const gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + GtkLabel* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp39_ = self->priv->intro_message_label; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = _ ("Unrecognized User"); + _tmp40_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE); #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp40_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE); + _tmp41_ = _tmp40_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = _tmp41_; + gtk_label_set_markup (_tmp39_, _tmp41_); #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp39_, _tmp42_); -#line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp42_); + _g_free0 (_tmp41_); #line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11983 "GalleryConnector.c" +#line 11990 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11987 "GalleryConnector.c" +#line 11994 "GalleryConnector.c" { - GtkLabel* _tmp43_ = NULL; - const gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; -#line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp43_ = self->priv->intro_message_label; + GtkLabel* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"); + _tmp42_ = self->priv->intro_message_label; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp44_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE); + _tmp43_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE); #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = _tmp45_; + _tmp44_ = _tmp43_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp43_, _tmp46_); + gtk_label_set_markup (_tmp42_, _tmp44_); #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp44_); #line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12007 "GalleryConnector.c" +#line 12011 "GalleryConnector.c" } default: { #line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode"); -#line 12013 "GalleryConnector.c" +#line 12017 "GalleryConnector.c" } } #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = url; + _tmp45_ = url; #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp47_ != NULL) { -#line 12020 "GalleryConnector.c" - GtkEntry* _tmp48_ = NULL; - const gchar* _tmp49_ = NULL; - GtkEntry* _tmp50_ = NULL; + if (_tmp45_ != NULL) { +#line 12024 "GalleryConnector.c" + GtkEntry* _tmp46_; + const gchar* _tmp47_; + GtkEntry* _tmp48_; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = self->priv->url_entry; + _tmp46_ = self->priv->url_entry; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = url; + _tmp47_ = url; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp48_, _tmp49_); + gtk_entry_set_text (_tmp46_, _tmp47_); #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = self->priv->username_entry; + _tmp48_ = self->priv->username_entry; #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); -#line 12034 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); +#line 12038 "GalleryConnector.c" } #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = self->priv->url_entry; + _tmp49_ = self->priv->url_entry; #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = username; + _tmp50_ = username; #line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp52_ != NULL) { -#line 12044 "GalleryConnector.c" - GtkEntry* _tmp53_ = NULL; - const gchar* _tmp54_ = NULL; - GtkEntry* _tmp55_ = NULL; + if (_tmp50_ != NULL) { +#line 12048 "GalleryConnector.c" + GtkEntry* _tmp51_; + const gchar* _tmp52_; + GtkEntry* _tmp53_; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = self->priv->username_entry; + _tmp51_ = self->priv->username_entry; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = username; + _tmp52_ = username; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp53_, _tmp54_); + gtk_entry_set_text (_tmp51_, _tmp52_); #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = self->priv->password_entry; + _tmp53_ = self->priv->password_entry; #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget)); -#line 12058 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget)); +#line 12062 "GalleryConnector.c" } #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = self->priv->username_entry; + _tmp54_ = self->priv->username_entry; #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = key; + _tmp55_ = key; #line 1899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp57_ != NULL) { -#line 12068 "GalleryConnector.c" - GtkEntry* _tmp58_ = NULL; - const gchar* _tmp59_ = NULL; - GtkEntry* _tmp60_ = NULL; + if (_tmp55_ != NULL) { +#line 12072 "GalleryConnector.c" + GtkEntry* _tmp56_; + const gchar* _tmp57_; + GtkEntry* _tmp58_; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = self->priv->key_entry; + _tmp56_ = self->priv->key_entry; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = key; + _tmp57_ = key; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp58_, _tmp59_); + gtk_entry_set_text (_tmp56_, _tmp57_); #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp60_ = self->priv->key_entry; + _tmp58_ = self->priv->key_entry; #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget)); -#line 12082 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget)); +#line 12086 "GalleryConnector.c" } #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp61_ = self->priv->key_entry; + _tmp59_ = self->priv->key_entry; #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed, self, 0); #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = self->priv->go_back_button; + _tmp60_ = self->priv->go_back_button; #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp60_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0); #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp63_ = self->priv->login_button; + _tmp61_ = self->priv->login_button; #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked, self, 0); #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp65_ = url; + _tmp63_ = url; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp65_ != NULL) { -#line 12100 "GalleryConnector.c" - const gchar* _tmp66_ = NULL; + if (_tmp63_ != NULL) { +#line 12104 "GalleryConnector.c" + const gchar* _tmp64_; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp66_ = username; + _tmp64_ = username; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp64_ = _tmp66_ != NULL; -#line 12106 "GalleryConnector.c" + _tmp62_ = _tmp64_ != NULL; +#line 12110 "GalleryConnector.c" } else { #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp64_ = FALSE; -#line 12110 "GalleryConnector.c" + _tmp62_ = FALSE; +#line 12114 "GalleryConnector.c" } #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp67_ = self->priv->login_button; + _tmp65_ = self->priv->login_button; #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), _tmp64_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_); #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12118 "GalleryConnector.c" +#line 12122 "GalleryConnector.c" } PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) { #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_credentials_grid_construct (PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, host, mode, url, username, key, builder); -#line 12125 "GalleryConnector.c" +#line 12129 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) { - GtkEntry* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkEntry* _tmp0_; + const gchar* _tmp1_; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + GtkEntry* _tmp4_; + const gchar* _tmp5_; + GtkEntry* _tmp6_; + const gchar* _tmp7_; #line 1911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12196,8 +12200,8 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_); -#line 12158 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_); +#line 12162 "GalleryConnector.c" } @@ -12205,17 +12209,17 @@ static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (Publ #line 1916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit_by_name (self, "go-back"); -#line 12167 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0); +#line 12171 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkEntry* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GtkButton* _tmp8_ = NULL; + GtkEntry* _tmp2_; + const gchar* _tmp3_; + GtkButton* _tmp8_; #line 1920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12224,49 +12228,49 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub _tmp3_ = gtk_entry_get_text (_tmp2_); #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp3_, "") != 0) { -#line 12185 "GalleryConnector.c" - GtkEntry* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; +#line 12189 "GalleryConnector.c" + GtkEntry* _tmp4_; + const gchar* _tmp5_; #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = self->priv->username_entry; #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = gtk_entry_get_text (_tmp4_); #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = g_strcmp0 (_tmp5_, "") != 0; -#line 12194 "GalleryConnector.c" +#line 12198 "GalleryConnector.c" } else { #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = FALSE; -#line 12198 "GalleryConnector.c" +#line 12202 "GalleryConnector.c" } #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp1_) { #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = TRUE; -#line 12204 "GalleryConnector.c" +#line 12208 "GalleryConnector.c" } else { - GtkEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + GtkEntry* _tmp6_; + const gchar* _tmp7_; #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = self->priv->key_entry; #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strcmp0 (_tmp7_, "") != 0; -#line 12214 "GalleryConnector.c" +#line 12218 "GalleryConnector.c" } #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp8_ = self->priv->login_button; #line 1921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 12220 "GalleryConnector.c" +#line 12224 "GalleryConnector.c" } void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) { - SpitPublishingPluginHost* _tmp0_ = NULL; - SpitPublishingPluginHost* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; + SpitPublishingPluginHost* _tmp0_; + SpitPublishingPluginHost* _tmp1_; + GtkButton* _tmp2_; #line 1927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12279,13 +12283,13 @@ void publishing_gallery3_credentials_grid_installed (PublishingGallery3Credentia _tmp2_ = self->priv->login_button; #line 1931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" spit_publishing_plugin_host_set_dialog_default_widget (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 12240 "GalleryConnector.c" +#line 12244 "GalleryConnector.c" } GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) { GtkGrid* result; - GtkGrid* _tmp0_ = NULL; + GtkGrid* _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self), NULL); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12294,26 +12298,30 @@ GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery result = _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12255 "GalleryConnector.c" +#line 12259 "GalleryConnector.c" } static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) { - GtkGrid* _tmp0_ = NULL; - GtkGrid* _tmp1_ = NULL; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_CREDENTIALS_GRID (self)); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = value; + if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) { +#line 12268 "GalleryConnector.c" + GtkGrid* _tmp0_; + GtkGrid* _tmp1_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_object_unref0 (self->priv->_pane_widget); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_pane_widget = _tmp1_; + _g_object_unref0 (self->priv->_pane_widget); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_object_notify ((GObject *) self, "pane-widget"); -#line 12274 "GalleryConnector.c" + self->priv->_pane_widget = _tmp1_; +#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + g_object_notify ((GObject *) self, "pane-widget"); +#line 12281 "GalleryConnector.c" + } } @@ -12329,12 +12337,12 @@ static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3C #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (klass)->finalize = publishing_gallery3_credentials_grid_finalize; #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("go_back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL] = g_signal_new ("go-back", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); -#line 12295 "GalleryConnector.c" + publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_STRING, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); +#line 12303 "GalleryConnector.c" } @@ -12367,11 +12375,11 @@ static void publishing_gallery3_credentials_grid_instance_init (PublishingGaller self->priv->username = NULL; #line 1834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->key = NULL; -#line 12328 "GalleryConnector.c" +#line 12336 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_finalize (GObject* obj) { +static void publishing_gallery3_credentials_grid_finalize (GObject * obj) { PublishingGallery3CredentialsGrid * self; #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid); @@ -12401,7 +12409,7 @@ static void publishing_gallery3_credentials_grid_finalize (GObject* obj) { _g_free0 (self->priv->key); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_CLASS (publishing_gallery3_credentials_grid_parent_class)->finalize (obj); -#line 12362 "GalleryConnector.c" +#line 12370 "GalleryConnector.c" } @@ -12423,18 +12431,18 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" switch (property_id) { #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET: + case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_value_set_object (value, publishing_gallery3_credentials_grid_get_pane_widget (self)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12389 "GalleryConnector.c" +#line 12397 "GalleryConnector.c" default: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12395 "GalleryConnector.c" +#line 12403 "GalleryConnector.c" } } @@ -12445,18 +12453,18 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" switch (property_id) { #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET: + case PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_set_pane_widget (self, g_value_get_object (value)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12411 "GalleryConnector.c" +#line 12419 "GalleryConnector.c" default: #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12417 "GalleryConnector.c" +#line 12425 "GalleryConnector.c" } } @@ -12467,21 +12475,21 @@ PublishingGallery3Session* publishing_gallery3_session_construct (GType object_t self = (PublishingGallery3Session*) publishing_rest_support_session_construct (object_type, NULL); #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12428 "GalleryConnector.c" +#line 12436 "GalleryConnector.c" } PublishingGallery3Session* publishing_gallery3_session_new (void) { #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_session_construct (PUBLISHING_GALLERY3_TYPE_SESSION); -#line 12435 "GalleryConnector.c" +#line 12443 "GalleryConnector.c" } static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) { PublishingGallery3Session * self; gboolean result = FALSE; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1945 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12490,14 +12498,14 @@ static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRES result = NULL != _tmp0_; #line 1946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12451 "GalleryConnector.c" +#line 12459 "GalleryConnector.c" } void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12520,7 +12528,7 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, publishing_gallery3_session_set_key (self, _tmp2_); #line 1954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_session_notify_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 12481 "GalleryConnector.c" +#line 12489 "GalleryConnector.c" } @@ -12533,13 +12541,13 @@ void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self publishing_gallery3_session_set_username (self, NULL); #line 1960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_session_set_key (self, NULL); -#line 12494 "GalleryConnector.c" +#line 12502 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12548,13 +12556,13 @@ const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* sel result = _tmp0_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12509 "GalleryConnector.c" +#line 12517 "GalleryConnector.c" } static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12565,13 +12573,13 @@ static void publishing_gallery3_session_set_url (PublishingGallery3Session* self _g_free0 (self->priv->_url); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_url = _tmp1_; -#line 12526 "GalleryConnector.c" +#line 12534 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12580,13 +12588,13 @@ const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session result = _tmp0_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12541 "GalleryConnector.c" +#line 12549 "GalleryConnector.c" } static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12597,13 +12605,13 @@ static void publishing_gallery3_session_set_username (PublishingGallery3Session* _g_free0 (self->priv->_username); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_username = _tmp1_; -#line 12558 "GalleryConnector.c" +#line 12566 "GalleryConnector.c" } const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self), NULL); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12612,13 +12620,13 @@ const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* sel result = _tmp0_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12573 "GalleryConnector.c" +#line 12581 "GalleryConnector.c" } static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12629,7 +12637,7 @@ static void publishing_gallery3_session_set_key (PublishingGallery3Session* self _g_free0 (self->priv->_key); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_key = _tmp1_; -#line 12590 "GalleryConnector.c" +#line 12598 "GalleryConnector.c" } @@ -12641,8 +12649,8 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3SessionPrivate)); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_gallery3_session_real_is_authenticated; -#line 12603 "GalleryConnector.c" + ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_gallery3_session_real_is_authenticated; +#line 12611 "GalleryConnector.c" } @@ -12655,11 +12663,11 @@ static void publishing_gallery3_session_instance_init (PublishingGallery3Session self->priv->_username = NULL; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_key = NULL; -#line 12616 "GalleryConnector.c" +#line 12624 "GalleryConnector.c" } -static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* obj) { +static void publishing_gallery3_session_finalize (PublishingRESTSupportSession * obj) { PublishingGallery3Session * self; #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); @@ -12671,7 +12679,7 @@ static void publishing_gallery3_session_finalize (PublishingRESTSupportSession* _g_free0 (self->priv->_key); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_gallery3_session_parent_class)->finalize (obj); -#line 12632 "GalleryConnector.c" +#line 12640 "GalleryConnector.c" } @@ -12689,11 +12697,11 @@ GType publishing_gallery3_session_get_type (void) { PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) { PublishingGallery3Uploader* self = NULL; - PublishingGallery3Session* _tmp0_ = NULL; - SpitPublishingPublishable** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PublishingGallery3PublishingParameters* _tmp2_ = NULL; - PublishingGallery3PublishingParameters* _tmp3_ = NULL; + PublishingGallery3Session* _tmp0_; + SpitPublishingPublishable** _tmp1_; + gint _tmp1__length1; + PublishingGallery3PublishingParameters* _tmp2_; + PublishingGallery3PublishingParameters* _tmp3_; #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_SESSION (session), NULL); #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12716,21 +12724,21 @@ PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object self->priv->parameters = _tmp3_; #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12677 "GalleryConnector.c" +#line 12685 "GalleryConnector.c" } PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) { #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return publishing_gallery3_uploader_construct (PUBLISHING_GALLERY3_TYPE_UPLOADER, session, publishables, publishables_length1, parameters); -#line 12684 "GalleryConnector.c" +#line 12692 "GalleryConnector.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 12691 "GalleryConnector.c" +#line 12699 "GalleryConnector.c" } @@ -12738,15 +12746,15 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat PublishingGallery3Uploader * self; PublishingRESTSupportTransaction* result = NULL; SpitPublishingPublishable* p = NULL; - SpitPublishingPublishable* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - SpitPublishingPublisherMediaType _tmp2_ = 0; - PublishingRESTSupportSession* _tmp3_ = NULL; - PublishingGallery3Session* _tmp4_ = NULL; - PublishingGallery3PublishingParameters* _tmp5_ = NULL; - PublishingGallery3GalleryUploadTransaction* _tmp6_ = NULL; - PublishingRESTSupportTransaction* _tmp7_ = NULL; - PublishingRESTSupportTransaction* _tmp8_ = NULL; + SpitPublishingPublishable* _tmp0_; + gchar* _tmp1_; + SpitPublishingPublisherMediaType _tmp2_; + PublishingRESTSupportSession* _tmp3_; + PublishingGallery3Session* _tmp4_; + PublishingGallery3PublishingParameters* _tmp5_; + PublishingGallery3GalleryUploadTransaction* _tmp6_; + PublishingRESTSupportTransaction* _tmp7_; + PublishingRESTSupportTransaction* _tmp8_; #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader); #line 2000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12789,13 +12797,13 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat _g_object_unref0 (p); #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12750 "GalleryConnector.c" +#line 12758 "GalleryConnector.c" } const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), NULL); #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12804,14 +12812,14 @@ const gchar* publishing_gallery3_uploader_get_current_publishable_name (Publishi result = _tmp0_; #line 1975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12765 "GalleryConnector.c" +#line 12773 "GalleryConnector.c" } guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) { guint result; - PublishingRESTSupportTransaction* _tmp0_ = NULL; - guint _tmp1_ = 0U; + PublishingRESTSupportTransaction* _tmp0_; + guint _tmp1_; #line 1979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0U); #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12822,13 +12830,13 @@ guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* result = _tmp1_; #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12783 "GalleryConnector.c" +#line 12791 "GalleryConnector.c" } SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) { SpitPublishingPublisherMediaType result; - SpitPublishingPublisherMediaType _tmp0_ = 0; + SpitPublishingPublisherMediaType _tmp0_; #line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_UPLOADER (self), 0); #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12837,7 +12845,7 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis result = _tmp0_; #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12798 "GalleryConnector.c" +#line 12806 "GalleryConnector.c" } @@ -12849,19 +12857,19 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_type_class_add_private (klass, sizeof (PublishingGallery3UploaderPrivate)); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction; -#line 12811 "GalleryConnector.c" + ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_gallery3_uploader_real_create_transaction; +#line 12819 "GalleryConnector.c" } static void publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self) { #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_UPLOADER_GET_PRIVATE (self); -#line 12818 "GalleryConnector.c" +#line 12826 "GalleryConnector.c" } -static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { +static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUploader * obj) { PublishingGallery3Uploader * self; #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GALLERY3_TYPE_UPLOADER, PublishingGallery3Uploader); @@ -12873,7 +12881,7 @@ static void publishing_gallery3_uploader_finalize (PublishingRESTSupportBatchUpl _publishing_rest_support_transaction_unref0 (self->priv->_current_transaction); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_gallery3_uploader_parent_class)->finalize (obj); -#line 12834 "GalleryConnector.c" +#line 12842 "GalleryConnector.c" } @@ -12892,55 +12900,55 @@ GType publishing_gallery3_uploader_get_type (void) { static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) { gint result = 0; gchar* _result_ = NULL; - gint _tmp0_ = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 12873 "GalleryConnector.c" - gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 12881 "GalleryConnector.c" + gchar* _tmp4_; +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12881 "GalleryConnector.c" +#line 12889 "GalleryConnector.c" } else { -#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 12887 "GalleryConnector.c" +#line 12895 "GalleryConnector.c" } } gchar* publishing_gallery3_strip_session_url (const gchar* url) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gint item_loc = 0; - const gchar* _tmp1_ = NULL; - gint _tmp2_ = 0; - const gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gchar* _tmp7_ = NULL; + const gchar* _tmp1_; + gint _tmp2_; + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; + gchar* _tmp7_; #line 2017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (url != NULL, NULL); #line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12955,13 +12963,13 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) { item_loc = _tmp2_; #line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (-1 == item_loc) { -#line 12916 "GalleryConnector.c" - const gchar* _tmp3_ = NULL; +#line 12924 "GalleryConnector.c" + const gchar* _tmp3_; #line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = url; #line 2026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp3_); -#line 12922 "GalleryConnector.c" +#line 12930 "GalleryConnector.c" } #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = url; @@ -12975,7 +12983,7 @@ gchar* publishing_gallery3_strip_session_url (const gchar* url) { result = _tmp7_; #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12936 "GalleryConnector.c" +#line 12944 "GalleryConnector.c" } |