From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- .../shotwell-publishing-extras/GalleryConnector.c | 9011 ++++++++++---------- 1 file changed, 4568 insertions(+), 4443 deletions(-) (limited to 'plugins/shotwell-publishing-extras/GalleryConnector.c') diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index 17f2ef2..bd25726 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.36.6, the Vala compiler +/* GalleryConnector.c generated by valac 0.40.4, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -33,6 +34,11 @@ typedef struct _ShotwellPublishingGallery3 ShotwellPublishingGallery3; typedef struct _ShotwellPublishingGallery3Class ShotwellPublishingGallery3Class; typedef struct _ShotwellPublishingGallery3Private ShotwellPublishingGallery3Private; +enum { + SHOTWELL_PUBLISHING_GALLERY3_0_PROPERTY, + SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES +}; +static GParamSpec* shotwell_publishing_gallery3_properties[SHOTWELL_PUBLISHING_GALLERY3_NUM_PROPERTIES]; #define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ()) #define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service)) @@ -45,6 +51,11 @@ typedef struct _Gallery3Service Gallery3Service; typedef struct _Gallery3ServiceClass Gallery3ServiceClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _Gallery3ServicePrivate Gallery3ServicePrivate; +enum { + GALLERY3_SERVICE_0_PROPERTY, + GALLERY3_SERVICE_NUM_PROPERTIES +}; +static GParamSpec* gallery3_service_properties[GALLERY3_SERVICE_NUM_PROPERTIES]; #define _g_free0(var) (var = (g_free (var), NULL)) #define PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER (publishing_gallery3_gallery_publisher_get_type ()) @@ -217,6 +228,11 @@ typedef struct _PublishingGallery3GalleryPublisherPrivate PublishingGallery3Gall typedef struct _PublishingGallery3PublishingOptionsPane PublishingGallery3PublishingOptionsPane; typedef struct _PublishingGallery3PublishingOptionsPaneClass PublishingGallery3PublishingOptionsPaneClass; +enum { + PUBLISHING_GALLERY3_GALLERY_PUBLISHER_0_PROPERTY, + PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES +}; +static GParamSpec* publishing_gallery3_gallery_publisher_properties[PUBLISHING_GALLERY3_GALLERY_PUBLISHER_NUM_PROPERTIES]; #define PUBLISHING_GALLERY3_CREDENTIALS_PANE_TYPE_MODE (publishing_gallery3_credentials_pane_mode_get_type ()) @@ -241,13 +257,18 @@ typedef struct _PublishingGallery3Uploader PublishingGallery3Uploader; 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; +enum { + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_0_PROPERTY, + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_gallery3_publishing_options_pane_properties[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_PROPERTIES]; #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 + PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS }; -static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0}; +static guint publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_NUM_SIGNALS] = {0}; typedef struct _PublishingGallery3PublishingParametersPrivate PublishingGallery3PublishingParametersPrivate; typedef struct _PublishingGallery3ParamSpecPublishingParameters PublishingGallery3ParamSpecPublishingParameters; typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3CredentialsPanePrivate; @@ -261,19 +282,30 @@ typedef struct _PublishingGallery3CredentialsPanePrivate PublishingGallery3Crede typedef struct _PublishingGallery3CredentialsGrid PublishingGallery3CredentialsGrid; typedef struct _PublishingGallery3CredentialsGridClass PublishingGallery3CredentialsGridClass; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_PANE_0_PROPERTY, + PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES +}; +static GParamSpec* publishing_gallery3_credentials_pane_properties[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_PROPERTIES]; enum { PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL, PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL, - PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL + PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS }; -static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LAST_SIGNAL] = {0}; +static guint publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_NUM_SIGNALS] = {0}; typedef struct _PublishingGallery3CredentialsGridPrivate PublishingGallery3CredentialsGridPrivate; +enum { + PUBLISHING_GALLERY3_CREDENTIALS_GRID_0_PROPERTY, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, + PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES +}; +static GParamSpec* publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_PROPERTIES]; enum { PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL, PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL, - PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL + PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS }; -static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LAST_SIGNAL] = {0}; +static guint publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_NUM_SIGNALS] = {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); @@ -661,33 +693,42 @@ static gpointer publishing_gallery3_uploader_parent_class = NULL; #define WEBSITE_URL "https://github.com/sappjw/shotwell-gallery3" GType shotwell_publishing_gallery3_get_type (void) G_GNUC_CONST; #define SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_GALLERY3, ShotwellPublishingGallery3Private)) -enum { - SHOTWELL_PUBLISHING_GALLERY3_DUMMY_PROPERTY -}; ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file); -ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file); +ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, + GFile* module_file); Gallery3Service* gallery3_service_new (GFile* resource_directory); -Gallery3Service* gallery3_service_construct (GType object_type, 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 SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, + int* result_length1); static void shotwell_publishing_gallery3_finalize (GObject * obj); -enum { - GALLERY3_SERVICE_DUMMY_PROPERTY -}; #define GALLERY3_SERVICE_ICON_FILENAME "gallery3.png" -static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface); +static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, + gint min_host_interface, + gint max_host_interface); static const gchar* gallery3_service_real_get_id (SpitPluggable* base); static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base); -static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length); -static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled); -static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host); -PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host); -PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host); +static void gallery3_service_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info); +static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, + int length); +static void gallery3_service_real_activation (SpitPluggable* base, + gboolean enabled); +static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, + SpitPublishingPluginHost* host); +PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, + SpitPublishingPluginHost* host); +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); @@ -701,123 +742,176 @@ static void gallery3_service_finalize (GObject * obj); #define PUBLISHING_GALLERY3_REST_PATH "/index.php/rest" gpointer publishing_gallery3_album_ref (gpointer instance); void publishing_gallery3_album_unref (gpointer instance); -GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void publishing_gallery3_value_set_album (GValue* value, gpointer v_object); -void publishing_gallery3_value_take_album (GValue* value, gpointer v_object); +GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void publishing_gallery3_value_set_album (GValue* value, + gpointer v_object); +void publishing_gallery3_value_take_album (GValue* value, + gpointer v_object); gpointer publishing_gallery3_value_get_album (const GValue* value); GType publishing_gallery3_album_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_ALBUM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_ALBUM, PublishingGallery3AlbumPrivate)) -enum { - PUBLISHING_GALLERY3_ALBUM_DUMMY_PROPERTY -}; PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection); -PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection); -static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value); -static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value); -static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value); -static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value); -static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value); +PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, + JsonObject* collection); +static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, + const gchar* value); +static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, + const gchar* value); +static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, + const gchar* value); +static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, + const gchar* value); +static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, + gboolean value); gchar* publishing_gallery3_strip_session_url (const gchar* url); const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self); -static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value); +static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, + const gchar* value); const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self); const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self); const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self); -static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value); +static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, + const gchar* value); 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); GType publishing_gallery3_base_gallery_transaction_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_GALLERY3_BASE_GALLERY_TRANSACTION_DUMMY_PROPERTY -}; 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); +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); 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 { - PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_DUMMY_PROPERTY -}; -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); +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); GType publishing_gallery3_gallery_request_transaction_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_GALLERY3_GALLERY_REQUEST_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method); -PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method); +PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, + const gchar* item, + PublishingRESTSupportHttpMethod method); +PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_construct (GType object_type, + PublishingGallery3Session* session, + const gchar* item, + PublishingRESTSupportHttpMethod method); const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self); const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self); GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_GALLERY3_GET_ALBUM_UR_LS_TRANSACTION_DUMMY_PROPERTY -}; 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); +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); 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 { - PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start); -PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start); -static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1); -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); +PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, + gchar** _album_urls, + int _album_urls_length1, + guint start); +PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, + PublishingGallery3Session* session, + gchar** _album_urls, + int _album_urls_length1, + guint start); +static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, + gchar** value, + int value_length1); +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 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 gchar** _vala_array_dup2 (gchar** self, int length); +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 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); GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_GALLERY3_GALLERY_GET_TAG_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name); -PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name); +PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, + const gchar* tag_name); +PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, + PublishingGallery3Session* session, + const gchar* tag_name); static void _vala_JsonNode_free (JsonNode* self); gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self); GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION, PublishingGallery3GalleryGetItemTagsURLsTransactionPrivate)) -enum { - PUBLISHING_GALLERY3_GALLERY_GET_ITEM_TAGS_UR_LS_TRANSACTION_DUMMY_PROPERTY -}; -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); +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); GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) G_GNUC_CONST; -enum { - PUBLISHING_GALLERY3_GALLERY_SET_TAG_RELATIONSHIP_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, const gchar* item_tags_path, const gchar* tag_url, const gchar* item_url); -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* publishing_gallery3_gallery_set_tag_relationship_transaction_new (PublishingGallery3Session* session, + const gchar* item_tags_path, + const gchar* tag_url, + const gchar* item_url); +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); GType publishing_gallery3_gallery_album_create_transaction_get_type (void) G_GNUC_CONST; gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance); void publishing_gallery3_publishing_parameters_unref (gpointer instance); -GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object); -void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object); +GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void publishing_gallery3_value_set_publishing_parameters (GValue* value, + gpointer v_object); +void publishing_gallery3_value_take_publishing_parameters (GValue* value, + gpointer v_object); gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value); GType publishing_gallery3_publishing_parameters_get_type (void) G_GNUC_CONST; #define PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION, PublishingGallery3GalleryAlbumCreateTransactionPrivate)) -enum { - PUBLISHING_GALLERY3_GALLERY_ALBUM_CREATE_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters); -PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters); -static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value); +PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters); +PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, + PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters); +static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, + PublishingGallery3PublishingParameters* value); const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self); const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self); gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self); @@ -825,26 +919,30 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create 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 { - PUBLISHING_GALLERY3_GALLERY_UPLOAD_TRANSACTION_DUMMY_PROPERTY -}; -PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable); -PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable); +PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters, + SpitPublishingPublishable* publishable); +PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, + PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters, + SpitPublishingPublishable* publishable); const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self); static void _g_free0_ (gpointer var); static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self); -static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error); +static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, + const gchar* tag_url, + GError** error); static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self); -static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag); -static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error); +static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, + const gchar* tag); +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_real_execute (PublishingRESTSupportTransaction* base, + GError** error); 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 { - PUBLISHING_GALLERY3_GALLERY_PUBLISHER_DUMMY_PROPERTY -}; #define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG _ ("\n" \ "\n" \ "The file “%s” may not be supported by or may be too large for this ins" \ @@ -860,106 +958,221 @@ gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3Gall static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self); gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self); gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self); -void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key); +void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, + const gchar* gallery_url, + const gchar* username, + const gchar* key); static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self); static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base); -void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key); -void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url); -void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username); +void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, + const gchar* key); +void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, + const gchar* url); +void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, + const gchar* username); gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self); static gboolean* _bool_dup (gboolean* self); -void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata); +void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, + gboolean strip_metadata); gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self); static gint* _int_dup (gint* self); -void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint); +void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, + gint constraint); gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self); -void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels); +void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, + gint pixels); static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self); static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self); GType publishing_gallery3_credentials_pane_mode_get_type (void) G_GNUC_CONST; -static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode); +static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, + PublishingGallery3CredentialsPaneMode mode); gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self); void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self); GType publishing_gallery3_credentials_pane_get_type (void) G_GNUC_CONST; -PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key); -PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key); +PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, + PublishingGallery3CredentialsPaneMode mode, + const gchar* url, + const gchar* username, + const gchar* key); +PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construct (GType object_type, + SpitPublishingPluginHost* host, + PublishingGallery3CredentialsPaneMode mode, + const gchar* url, + const gchar* username, + const gchar* key); static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self); -static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password); -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); -static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password); -static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err); -static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); -static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn); -static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err); -static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); -static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn); -static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start); -static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err); -static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); -static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn); -static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username); -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); -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); -static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters); -static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, PublishingGallery3PublishingParameters* parameters, gpointer self); +static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username, + const gchar* password); +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); +static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username, + const gchar* password); +static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err); +static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, + GError* err, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn); +static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err); +static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, + GError* err, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn); +static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, + gchar** album_urls, + int album_urls_length1, + guint start); +static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err); +static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, + GError* err, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn); +static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username); +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); +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); +static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters); +static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish (PublishingGallery3PublishingOptionsPane* _sender, + PublishingGallery3PublishingParameters* parameters, + gpointer self); static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self); -static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters); -static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err); -static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self); -static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn); -static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self); -static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters); +static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters); +static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err); +static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, + GError* err, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn); +static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, + gpointer self); +static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters); gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self); GType publishing_gallery3_uploader_get_type (void) G_GNUC_CONST; -PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters); -PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters); -static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published); -static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self); -static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err); -static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self); -static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction); -static void _publishing_gallery3_gallery_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self); +PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, + SpitPublishingPublishable** publishables, + int publishables_length1, + PublishingGallery3PublishingParameters* parameters); +PublishingGallery3Uploader* publishing_gallery3_uploader_construct (GType object_type, + PublishingGallery3Session* session, + SpitPublishingPublishable** publishables, + int publishables_length1, + PublishingGallery3PublishingParameters* parameters); +static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportBatchUploader* uploader, + gint num_published); +static void _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, + gint num_photos_published, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportBatchUploader* _uploader, + GError* err); +static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, + GError* err, + gpointer self); +static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, + gint file_number, + gdouble completed_fraction); +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); -void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* 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); #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 -}; #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_DEFAULT_ALBUM_NAME "" #define PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY "last-album" -static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length); +static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, + int length); static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self); -static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title); -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title); +PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, + const gchar* album_title); PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path); -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path); -void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value); -void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value); +PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, + const gchar* album_path); +void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, + gint value); +void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, + gboolean value); static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self); static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self); void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self); @@ -967,43 +1180,67 @@ static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (S static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base); 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 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); #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 -}; static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void); static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type); -static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value); -static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value); +static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, + const gchar* value); +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_set_entity_title (PublishingGallery3PublishingParameters* self, + const gchar* value); 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 { - PUBLISHING_GALLERY3_CREDENTIALS_PANE_DUMMY_PROPERTY -}; -PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder); -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* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, + PublishingGallery3CredentialsPaneMode mode, + const gchar* url, + const gchar* username, + const gchar* key, + GtkBuilder* builder); +PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construct (GType object_type, + SpitPublishingPluginHost* host, + PublishingGallery3CredentialsPaneMode mode, + const gchar* url, + const gchar* username, + const gchar* key, + GtkBuilder* builder); GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self); void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self); -void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, const gchar* url, const gchar* uname, const gchar* password, const gchar* key); +void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, + const gchar* url, + const gchar* uname, + const gchar* password, + const gchar* key); static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base); static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base); static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base); -static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self); -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); +static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, + gpointer self); +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); 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 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); #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_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.") #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE _ ("The username and password or API key were incorrect. To try again, re-" \ @@ -1011,94 +1248,115 @@ enum { #define PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE _ ("The URL entered does not appear to be the main directory of a Gallery3" \ " instance. Please make sure you typed it correctly and it does not hav" \ "e any trailing components (e.g., index.php).") -static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value); +static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, + GtkGrid* value); static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self); -static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void _publishing_gallery3_credentials_grid_on_url_or_username_changed_gtk_editable_changed (GtkEditable* _sender, + gpointer self); static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self); -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_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_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); 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); +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)) -enum { - PUBLISHING_GALLERY3_SESSION_DUMMY_PROPERTY -}; static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base); -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_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); #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 PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, + SpitPublishingPublishable* publishable); 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_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) +{ #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 1020 "GalleryConnector.c" +#line 1274 "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 1026 "GalleryConnector.c" +#line 1280 "GalleryConnector.c" } -ShotwellPublishingGallery3* shotwell_publishing_gallery3_construct (GType object_type, GFile* module_file) { +ShotwellPublishingGallery3* +shotwell_publishing_gallery3_construct (GType object_type, + GFile* module_file) +{ ShotwellPublishingGallery3 * self = NULL; GFile* resource_directory = NULL; GFile* _tmp0_; - GFile* _tmp1_; - SpitPluggable** _tmp2_; - gint _tmp2__length1; - Gallery3Service* _tmp3_; + SpitPluggable** _tmp1_; + gint _tmp1__length1; + Gallery3Service* _tmp2_; #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" self = (ShotwellPublishingGallery3*) g_object_new (object_type, NULL); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = module_file; -#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_file_get_parent (_tmp0_); + _tmp0_ = g_file_get_parent (module_file); #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - resource_directory = _tmp1_; + resource_directory = _tmp0_; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = self->priv->pluggables; + _tmp1_ = self->priv->pluggables; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2__length1 = self->priv->pluggables_length1; + _tmp1__length1 = self->priv->pluggables_length1; #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = gallery3_service_new (resource_directory); + _tmp2_ = gallery3_service_new (resource_directory); #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); + _vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable)); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (resource_directory); #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1060 "GalleryConnector.c" +#line 1314 "GalleryConnector.c" } -ShotwellPublishingGallery3* shotwell_publishing_gallery3_new (GFile* module_file) { +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 1067 "GalleryConnector.c" +#line 1323 "GalleryConnector.c" } -static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) { +static const gchar* +shotwell_publishing_gallery3_real_get_module_name (SpitModule* base) +{ ShotwellPublishingGallery3 * self; const gchar* result = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1107,11 +1365,13 @@ static const gchar* shotwell_publishing_gallery3_real_get_module_name (SpitModul result = _ ("Gallery3 publishing module"); #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1080 "GalleryConnector.c" +#line 1338 "GalleryConnector.c" } -static const gchar* shotwell_publishing_gallery3_real_get_version (SpitModule* base) { +static const gchar* +shotwell_publishing_gallery3_real_get_version (SpitModule* base) +{ ShotwellPublishingGallery3 * self; const gchar* result = NULL; #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1120,11 +1380,13 @@ 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 1093 "GalleryConnector.c" +#line 1353 "GalleryConnector.c" } -static const gchar* shotwell_publishing_gallery3_real_get_id (SpitModule* base) { +static const gchar* +shotwell_publishing_gallery3_real_get_id (SpitModule* base) +{ ShotwellPublishingGallery3 * self; const gchar* result = NULL; #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1133,11 +1395,14 @@ 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 1106 "GalleryConnector.c" +#line 1368 "GalleryConnector.c" } -static SpitPluggable** shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, int* result_length1) { +static SpitPluggable** +shotwell_publishing_gallery3_real_get_pluggables (SpitModule* base, + int* result_length1) +{ ShotwellPublishingGallery3 * self; SpitPluggable** result = NULL; SpitPluggable** _tmp0_; @@ -1158,28 +1423,32 @@ 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 1131 "GalleryConnector.c" +#line 1396 "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 1137 "GalleryConnector.c" +#line 1402 "GalleryConnector.c" } -static void shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass) { +static void +shotwell_publishing_gallery3_class_init (ShotwellPublishingGallery3Class * klass) +{ #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" shotwell_publishing_gallery3_parent_class = g_type_class_peek_parent (klass); #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 1148 "GalleryConnector.c" +#line 1415 "GalleryConnector.c" } -static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface) { +static void +shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleIface * iface) +{ #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" @@ -1190,11 +1459,13 @@ static void shotwell_publishing_gallery3_spit_module_interface_init (SpitModuleI 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 1163 "GalleryConnector.c" +#line 1432 "GalleryConnector.c" } -static void shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) { +static void +shotwell_publishing_gallery3_instance_init (ShotwellPublishingGallery3 * self) +{ SpitPluggable** _tmp0_; #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = SHOTWELL_PUBLISHING_GALLERY3_GET_PRIVATE (self); @@ -1206,11 +1477,13 @@ 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 1179 "GalleryConnector.c" +#line 1450 "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); @@ -1218,11 +1491,13 @@ 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 1191 "GalleryConnector.c" +#line 1464 "GalleryConnector.c" } -GType shotwell_publishing_gallery3_get_type (void) { +GType +shotwell_publishing_gallery3_get_type (void) +{ static volatile gsize shotwell_publishing_gallery3_type_id__volatile = 0; if (g_once_init_enter (&shotwell_publishing_gallery3_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingGallery3Class), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_gallery3_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingGallery3), 0, (GInstanceInitFunc) shotwell_publishing_gallery3_instance_init, NULL }; @@ -1236,7 +1511,10 @@ GType shotwell_publishing_gallery3_get_type (void) { } -Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory) { +Gallery3Service* +gallery3_service_construct (GType object_type, + GFile* resource_directory) +{ Gallery3Service * self = NULL; GdkPixbuf** _tmp0_; gint _tmp0__length1; @@ -1250,7 +1528,7 @@ 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 1223 "GalleryConnector.c" +#line 1501 "GalleryConnector.c" gint _tmp1_; GdkPixbuf** _tmp2_; #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1263,44 +1541,43 @@ 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 1236 "GalleryConnector.c" +#line 1514 "GalleryConnector.c" } #line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1240 "GalleryConnector.c" +#line 1518 "GalleryConnector.c" } -Gallery3Service* gallery3_service_new (GFile* resource_directory) { +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 1247 "GalleryConnector.c" +#line 1527 "GalleryConnector.c" } -static gint gallery3_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) { +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_; - 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" - _tmp0_ = min_host_interface; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = max_host_interface; -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE); -#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp2_; + result = spit_negotiate_interfaces (min_host_interface, max_host_interface, SPIT_PUBLISHING_CURRENT_INTERFACE); #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1269 "GalleryConnector.c" +#line 1544 "GalleryConnector.c" } -static const gchar* gallery3_service_real_get_id (SpitPluggable* base) { +static const gchar* +gallery3_service_real_get_id (SpitPluggable* base) +{ Gallery3Service * self; const gchar* result = NULL; #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1309,11 +1586,13 @@ 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 1282 "GalleryConnector.c" +#line 1559 "GalleryConnector.c" } -static const gchar* gallery3_service_real_get_pluggable_name (SpitPluggable* base) { +static const gchar* +gallery3_service_real_get_pluggable_name (SpitPluggable* base) +{ Gallery3Service * self; const gchar* result = NULL; #line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1322,39 +1601,47 @@ 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 1295 "GalleryConnector.c" +#line 1574 "GalleryConnector.c" } -static gpointer _g_object_ref0 (gpointer self) { +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 1302 "GalleryConnector.c" +#line 1583 "GalleryConnector.c" } -static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) { +static GdkPixbuf** +_vala_array_dup1 (GdkPixbuf** self, + int length) +{ GdkPixbuf** result; int i; #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 1313 "GalleryConnector.c" +#line 1597 "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 1319 "GalleryConnector.c" +#line 1603 "GalleryConnector.c" } #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1323 "GalleryConnector.c" +#line 1607 "GalleryConnector.c" } -static void gallery3_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) { +static void +gallery3_service_real_get_info (SpitPluggable* base, + SpitPluggableInfo* info) +{ Gallery3Service * self; gchar* _tmp0_; gchar* _tmp1_; @@ -1422,40 +1709,45 @@ 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 1395 "GalleryConnector.c" +#line 1682 "GalleryConnector.c" } -static void gallery3_service_real_activation (SpitPluggable* base, gboolean enabled) { +static void +gallery3_service_real_activation (SpitPluggable* base, + gboolean enabled) +{ 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 1403 "GalleryConnector.c" +#line 1693 "GalleryConnector.c" } -static SpitPublishingPublisher* gallery3_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) { +static SpitPublishingPublisher* +gallery3_service_real_create_publisher (SpitPublishingService* base, + SpitPublishingPluginHost* host) +{ Gallery3Service * self; SpitPublishingPublisher* result = NULL; - SpitPublishingPluginHost* _tmp0_; - PublishingGallery3GalleryPublisher* _tmp1_; + PublishingGallery3GalleryPublisher* _tmp0_; #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" g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = host; -#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_); + _tmp0_ = publishing_gallery3_gallery_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), host); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 1424 "GalleryConnector.c" +#line 1714 "GalleryConnector.c" } -static SpitPublishingPublisherMediaType gallery3_service_real_get_supported_media (SpitPublishingService* base) { +static SpitPublishingPublisherMediaType +gallery3_service_real_get_supported_media (SpitPublishingService* base) +{ Gallery3Service * self; SpitPublishingPublisherMediaType result = 0; #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1464,20 +1756,24 @@ 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 1437 "GalleryConnector.c" +#line 1729 "GalleryConnector.c" } -static void gallery3_service_class_init (Gallery3ServiceClass * klass) { +static void +gallery3_service_class_init (Gallery3ServiceClass * klass) +{ #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 1446 "GalleryConnector.c" +#line 1740 "GalleryConnector.c" } -static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface) { +static void +gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * iface) +{ #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" @@ -1490,36 +1786,44 @@ static void gallery3_service_spit_pluggable_interface_init (SpitPluggableIface * 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 1463 "GalleryConnector.c" +#line 1759 "GalleryConnector.c" } -static void gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) { +static void +gallery3_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) +{ #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; #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 1474 "GalleryConnector.c" +#line 1772 "GalleryConnector.c" } -static void gallery3_service_instance_init (Gallery3Service * self) { +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 1488 "GalleryConnector.c" +#line 1790 "GalleryConnector.c" } -GType gallery3_service_get_type (void) { +GType +gallery3_service_get_type (void) +{ static volatile gsize gallery3_service_type_id__volatile = 0; if (g_once_init_enter (&gallery3_service_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (Gallery3ServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gallery3_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Gallery3Service), 0, (GInstanceInitFunc) gallery3_service_instance_init, NULL }; @@ -1535,76 +1839,74 @@ GType gallery3_service_get_type (void) { } -PublishingGallery3Album* publishing_gallery3_album_construct (GType object_type, JsonObject* collection) { +PublishingGallery3Album* +publishing_gallery3_album_construct (GType object_type, + JsonObject* collection) +{ PublishingGallery3Album* self = NULL; JsonObject* entity = NULL; JsonObject* _tmp0_; - JsonObject* _tmp1_; + const gchar* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; const gchar* _tmp4_; - JsonObject* _tmp5_; - const gchar* _tmp6_; - gboolean _tmp7_; - const gchar* _tmp8_; - gchar* _tmp9_; - gchar* _tmp10_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #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" self = (PublishingGallery3Album*) g_type_create_instance (object_type); #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = collection; -#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = json_object_get_object_member (_tmp0_, "entity"); + _tmp0_ = json_object_get_object_member (collection, "entity"); #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity = _tmp1_; + entity = _tmp0_; #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = json_object_get_string_member (entity, "title"); + _tmp1_ = json_object_get_string_member (entity, "title"); #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_title (self, _tmp2_); + publishing_gallery3_album_set_title (self, _tmp1_); #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = json_object_get_string_member (entity, "name"); + _tmp2_ = json_object_get_string_member (entity, "name"); #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_name (self, _tmp3_); + publishing_gallery3_album_set_name (self, _tmp2_); #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = json_object_get_string_member (entity, "parent"); + _tmp3_ = json_object_get_string_member (entity, "parent"); #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_parentname (self, _tmp4_); + publishing_gallery3_album_set_parentname (self, _tmp3_); #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = collection; + _tmp4_ = json_object_get_string_member (collection, "url"); #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = json_object_get_string_member (_tmp5_, "url"); -#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_url (self, _tmp6_); -#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = json_object_get_boolean_member (entity, "can_edit"); + publishing_gallery3_album_set_url (self, _tmp4_); #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_editable (self, _tmp7_); + publishing_gallery3_album_set_editable (self, json_object_get_boolean_member (entity, "can_edit")); #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = self->priv->_url; + _tmp5_ = self->priv->_url; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = publishing_gallery3_strip_session_url (_tmp8_); + _tmp6_ = publishing_gallery3_strip_session_url (_tmp5_); #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = _tmp9_; + _tmp7_ = _tmp6_; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_album_set_path (self, _tmp10_); + publishing_gallery3_album_set_path (self, _tmp7_); #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp7_); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 1566 "GalleryConnector.c" +#line 1864 "GalleryConnector.c" } -PublishingGallery3Album* publishing_gallery3_album_new (JsonObject* collection) { +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 1573 "GalleryConnector.c" +#line 1873 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_name (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_name (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1615,28 +1917,30 @@ 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 1588 "GalleryConnector.c" +#line 1890 "GalleryConnector.c" } -static void publishing_gallery3_album_set_name (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_name (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_name); #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_name = _tmp1_; -#line 1605 "GalleryConnector.c" + self->priv->_name = _tmp0_; +#line 1907 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_title (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_title (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1647,28 +1951,30 @@ 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 1620 "GalleryConnector.c" +#line 1924 "GalleryConnector.c" } -static void publishing_gallery3_album_set_title (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_title (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_title); #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_title = _tmp1_; -#line 1637 "GalleryConnector.c" + self->priv->_title = _tmp0_; +#line 1941 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_summary (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_summary (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1679,28 +1985,30 @@ 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 1652 "GalleryConnector.c" +#line 1958 "GalleryConnector.c" } -static void publishing_gallery3_album_set_summary (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_summary (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_summary); #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_summary = _tmp1_; -#line 1669 "GalleryConnector.c" + self->priv->_summary = _tmp0_; +#line 1975 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_parentname (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1711,28 +2019,30 @@ 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 1684 "GalleryConnector.c" +#line 1992 "GalleryConnector.c" } -static void publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_parentname (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_parentname); #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_parentname = _tmp1_; -#line 1701 "GalleryConnector.c" + self->priv->_parentname = _tmp0_; +#line 2009 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_url (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_url (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1743,28 +2053,30 @@ 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 1716 "GalleryConnector.c" +#line 2026 "GalleryConnector.c" } -static void publishing_gallery3_album_set_url (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_url (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_url); #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_url = _tmp1_; -#line 1733 "GalleryConnector.c" + self->priv->_url = _tmp0_; +#line 2043 "GalleryConnector.c" } -const gchar* publishing_gallery3_album_get_path (PublishingGallery3Album* self) { +const gchar* +publishing_gallery3_album_get_path (PublishingGallery3Album* self) +{ const gchar* result; const gchar* _tmp0_; #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1775,28 +2087,30 @@ 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 1748 "GalleryConnector.c" +#line 2060 "GalleryConnector.c" } -static void publishing_gallery3_album_set_path (PublishingGallery3Album* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_album_set_path (PublishingGallery3Album* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_path); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_path = _tmp1_; -#line 1765 "GalleryConnector.c" + self->priv->_path = _tmp0_; +#line 2077 "GalleryConnector.c" } -gboolean publishing_gallery3_album_get_editable (PublishingGallery3Album* self) { +gboolean +publishing_gallery3_album_get_editable (PublishingGallery3Album* self) +{ gboolean result; gboolean _tmp0_; #line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -1807,120 +2121,145 @@ 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 1780 "GalleryConnector.c" +#line 2094 "GalleryConnector.c" } -static void publishing_gallery3_album_set_editable (PublishingGallery3Album* self, gboolean value) { - gboolean _tmp0_; +static void +publishing_gallery3_album_set_editable (PublishingGallery3Album* self, + gboolean value) +{ #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 1792 "GalleryConnector.c" + self->priv->_editable = value; +#line 2106 "GalleryConnector.c" } -static void publishing_gallery3_value_album_init (GValue* value) { +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 1799 "GalleryConnector.c" +#line 2115 "GalleryConnector.c" } -static void publishing_gallery3_value_album_free_value (GValue* value) { +static void +publishing_gallery3_value_album_free_value (GValue* value) +{ #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" publishing_gallery3_album_unref (value->data[0].v_pointer); -#line 1808 "GalleryConnector.c" +#line 2126 "GalleryConnector.c" } } -static void publishing_gallery3_value_album_copy_value (const GValue* src_value, GValue* dest_value) { +static void +publishing_gallery3_value_album_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 1818 "GalleryConnector.c" +#line 2139 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 1822 "GalleryConnector.c" +#line 2143 "GalleryConnector.c" } } -static gpointer publishing_gallery3_value_album_peek_pointer (const GValue* 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 1830 "GalleryConnector.c" +#line 2153 "GalleryConnector.c" } -static gchar* publishing_gallery3_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1837 "GalleryConnector.c" +#line 2165 "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 1844 "GalleryConnector.c" +#line 2172 "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 1848 "GalleryConnector.c" +#line 2176 "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 1852 "GalleryConnector.c" +#line 2180 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1856 "GalleryConnector.c" +#line 2184 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1860 "GalleryConnector.c" +#line 2188 "GalleryConnector.c" } -static gchar* publishing_gallery3_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +publishing_gallery3_value_album_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ 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 1871 "GalleryConnector.c" +#line 2204 "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 1877 "GalleryConnector.c" +#line 2210 "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 1881 "GalleryConnector.c" +#line 2214 "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 1885 "GalleryConnector.c" +#line 2218 "GalleryConnector.c" } #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 1889 "GalleryConnector.c" +#line 2222 "GalleryConnector.c" } -GParamSpec* publishing_gallery3_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +publishing_gallery3_param_spec_album (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PublishingGallery3ParamSpecAlbum* spec; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_ALBUM), NULL); @@ -1930,20 +2269,25 @@ 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 1903 "GalleryConnector.c" +#line 2242 "GalleryConnector.c" } -gpointer publishing_gallery3_value_get_album (const GValue* value) { +gpointer +publishing_gallery3_value_get_album (const GValue* value) +{ #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 1912 "GalleryConnector.c" +#line 2253 "GalleryConnector.c" } -void publishing_gallery3_value_set_album (GValue* value, gpointer v_object) { +void +publishing_gallery3_value_set_album (GValue* value, + gpointer v_object) +{ 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)); @@ -1959,22 +2303,25 @@ 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 1932 "GalleryConnector.c" +#line 2276 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1936 "GalleryConnector.c" +#line 2280 "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 1942 "GalleryConnector.c" +#line 2286 "GalleryConnector.c" } } -void publishing_gallery3_value_take_album (GValue* value, gpointer v_object) { +void +publishing_gallery3_value_take_album (GValue* value, + gpointer v_object) +{ 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)); @@ -1988,33 +2335,37 @@ 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 1961 "GalleryConnector.c" +#line 2308 "GalleryConnector.c" } else { #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 1965 "GalleryConnector.c" +#line 2312 "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 1971 "GalleryConnector.c" +#line 2318 "GalleryConnector.c" } } -static void publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass) { +static void +publishing_gallery3_album_class_init (PublishingGallery3AlbumClass * klass) +{ #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_album_parent_class = g_type_class_peek_parent (klass); #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 1983 "GalleryConnector.c" +#line 2332 "GalleryConnector.c" } -static void publishing_gallery3_album_instance_init (PublishingGallery3Album * self) { +static void +publishing_gallery3_album_instance_init (PublishingGallery3Album * self) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -2051,11 +2402,13 @@ 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 2024 "GalleryConnector.c" +#line 2375 "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); @@ -2073,11 +2426,13 @@ 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 2046 "GalleryConnector.c" +#line 2399 "GalleryConnector.c" } -GType publishing_gallery3_album_get_type (void) { +GType +publishing_gallery3_album_get_type (void) +{ static volatile gsize publishing_gallery3_album_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_album_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_album_init, publishing_gallery3_value_album_free_value, publishing_gallery3_value_album_copy_value, publishing_gallery3_value_album_peek_pointer, "p", publishing_gallery3_value_album_collect_value, "p", publishing_gallery3_value_album_lcopy_value }; @@ -2091,18 +2446,22 @@ GType publishing_gallery3_album_get_type (void) { } -gpointer publishing_gallery3_album_ref (gpointer instance) { +gpointer +publishing_gallery3_album_ref (gpointer instance) +{ 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 2071 "GalleryConnector.c" +#line 2428 "GalleryConnector.c" } -void publishing_gallery3_album_unref (gpointer instance) { +void +publishing_gallery3_album_unref (gpointer instance) +{ PublishingGallery3Album * self; self = instance; #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2111,42 +2470,43 @@ 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 2084 "GalleryConnector.c" +#line 2443 "GalleryConnector.c" } } -static gchar string_get (const gchar* self, glong index) { +static gchar +string_get (const gchar* self, + glong index) +{ gchar result = '\0'; - glong _tmp0_; - gchar _tmp1_; -#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar _tmp0_; +#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = index; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_; -#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = ((gchar*) self)[index]; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_; +#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2103 "GalleryConnector.c" +#line 2462 "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* +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_; - PublishingGallery3Session* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - PublishingRESTSupportHttpMethod _tmp12_; - JsonParser* _tmp13_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + JsonParser* _tmp5_; #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" @@ -2154,78 +2514,65 @@ PublishingGallery3BaseGalleryTransaction* publishing_gallery3_base_gallery_trans #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (item_path != NULL, NULL); #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = item_path; -#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (g_strcmp0 (_tmp1_, "") != 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; + if (g_strcmp0 (item_path, "") != 0) { #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 2139 "GalleryConnector.c" + _tmp0_ = string_get (item_path, (glong) 0) != '/'; +#line 2490 "GalleryConnector.c" } else { #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = FALSE; -#line 2143 "GalleryConnector.c" +#line 2494 "GalleryConnector.c" } #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp0_) { -#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 2155 "GalleryConnector.c" + g_error ("GalleryConnector.vala:165: %s", item_path); +#line 2502 "GalleryConnector.c" } #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = session; -#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = endpoint_url; -#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = g_strconcat (_tmp6_, PUBLISHING_GALLERY3_REST_PATH, NULL); -#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; -#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = item_path; + _tmp1_ = g_strconcat (endpoint_url, PUBLISHING_GALLERY3_REST_PATH, NULL); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = g_strconcat (_tmp8_, _tmp9_, NULL); + _tmp2_ = _tmp1_; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = _tmp10_; + _tmp3_ = g_strconcat (_tmp2_, item_path, NULL); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = method; + _tmp4_ = _tmp3_; #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp11_, _tmp12_); + self = (PublishingGallery3BaseGalleryTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp4_, method); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp4_); #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp2_); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = json_parser_new (); + _tmp5_ = json_parser_new (); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->parser); #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->parser = _tmp13_; + self->parser = _tmp5_; #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2187 "GalleryConnector.c" +#line 2526 "GalleryConnector.c" } -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_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 2194 "GalleryConnector.c" +#line 2538 "GalleryConnector.c" } -JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, GError** error) { +JsonNode* +publishing_gallery3_base_gallery_transaction_get_root_node (PublishingGallery3BaseGalleryTransaction* self, + GError** error) +{ JsonNode* result = NULL; gchar* json_object = NULL; JsonNode* root_node = NULL; @@ -2234,7 +2581,6 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing 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); @@ -2250,7 +2596,7 @@ 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 2223 "GalleryConnector.c" +#line 2569 "GalleryConnector.c" } else { const gchar* _tmp3_; gint _tmp4_; @@ -2263,11 +2609,11 @@ 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 2236 "GalleryConnector.c" +#line 2582 "GalleryConnector.c" } #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp1_) { -#line 2240 "GalleryConnector.c" +#line 2586 "GalleryConnector.c" gchar* _tmp6_; gchar* _tmp7_; GError* _tmp8_; @@ -2292,7 +2638,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 2265 "GalleryConnector.c" +#line 2611 "GalleryConnector.c" } else { #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2302,7 +2648,7 @@ 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 2275 "GalleryConnector.c" +#line 2621 "GalleryConnector.c" } } { @@ -2316,7 +2662,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 2289 "GalleryConnector.c" +#line 2635 "GalleryConnector.c" goto __catch0_g_error; } } @@ -2345,7 +2691,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 2318 "GalleryConnector.c" +#line 2664 "GalleryConnector.c" goto __finally0; } __finally0: @@ -2359,7 +2705,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 2332 "GalleryConnector.c" +#line 2678 "GalleryConnector.c" } else { #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2369,7 +2715,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 2342 "GalleryConnector.c" +#line 2688 "GalleryConnector.c" } } #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2379,15 +2725,13 @@ JsonNode* publishing_gallery3_base_gallery_transaction_get_root_node (Publishing #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp16_; #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = json_node_is_null (root_node); -#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp17_) { -#line 2355 "GalleryConnector.c" - GError* _tmp18_; + if (json_node_is_null (root_node)) { +#line 2699 "GalleryConnector.c" + GError* _tmp17_; #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"); + _tmp17_ = 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" - _inner_error_ = _tmp18_; + _inner_error_ = _tmp17_; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2396,7 +2740,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 2369 "GalleryConnector.c" +#line 2713 "GalleryConnector.c" } else { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (json_object); @@ -2406,7 +2750,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 2379 "GalleryConnector.c" +#line 2723 "GalleryConnector.c" } } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2415,24 +2759,30 @@ 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 2388 "GalleryConnector.c" +#line 2732 "GalleryConnector.c" } -static void publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass) { +static void +publishing_gallery3_base_gallery_transaction_class_init (PublishingGallery3BaseGalleryTransactionClass * klass) +{ #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 2397 "GalleryConnector.c" +#line 2743 "GalleryConnector.c" } -static void publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self) { +static void +publishing_gallery3_base_gallery_transaction_instance_init (PublishingGallery3BaseGalleryTransaction * self) +{ } -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); @@ -2440,11 +2790,13 @@ 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 2413 "GalleryConnector.c" +#line 2763 "GalleryConnector.c" } -GType publishing_gallery3_base_gallery_transaction_get_type (void) { +GType +publishing_gallery3_base_gallery_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_base_gallery_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_base_gallery_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3BaseGalleryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_base_gallery_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3BaseGalleryTransaction), 0, (GInstanceInitFunc) publishing_gallery3_base_gallery_transaction_instance_init, NULL }; @@ -2456,12 +2808,14 @@ 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* +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_; - 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,152 +2825,116 @@ PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (password != NULL, NULL); #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = url; -#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp0_, _tmp1_, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); + self = (PublishingGallery3KeyFetchTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, url, "", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = username; -#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", _tmp2_); -#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = password; + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "user", username); #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", password); #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2459 "GalleryConnector.c" +#line 2805 "GalleryConnector.c" } -PublishingGallery3KeyFetchTransaction* publishing_gallery3_key_fetch_transaction_new (PublishingGallery3Session* session, const gchar* url, const gchar* username, const gchar* password) { +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 2466 "GalleryConnector.c" +#line 2817 "GalleryConnector.c" } -static gchar* string_slice (const gchar* self, glong start, glong end) { +static gchar* +string_slice (const gchar* self, + glong start, + glong end) +{ gchar* result = NULL; glong string_length = 0L; gint _tmp0_; gint _tmp1_; - glong _tmp2_; - glong _tmp5_; - gboolean _tmp8_ = FALSE; - glong _tmp9_; - gboolean _tmp12_ = FALSE; - 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" + gboolean _tmp4_ = FALSE; + gboolean _tmp6_ = FALSE; + gchar* _tmp8_; +#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = start; -#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_ < ((glong) 0)) { -#line 2499 "GalleryConnector.c" +#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start < ((glong) 0)) { +#line 2843 "GalleryConnector.c" + glong _tmp2_; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = string_length; +#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + start = _tmp2_ + start; +#line 2849 "GalleryConnector.c" + } +#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end < ((glong) 0)) { +#line 2853 "GalleryConnector.c" glong _tmp3_; - glong _tmp4_; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = start; -#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - start = _tmp3_ + _tmp4_; -#line 2508 "GalleryConnector.c" - } -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp5_ < ((glong) 0)) { -#line 2514 "GalleryConnector.c" - glong _tmp6_; - glong _tmp7_; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = string_length; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = end; -#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp6_ + _tmp7_; -#line 2523 "GalleryConnector.c" - } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp9_ >= ((glong) 0)) { -#line 2529 "GalleryConnector.c" - glong _tmp10_; - glong _tmp11_; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = start; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = string_length; -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp10_ <= _tmp11_; -#line 2538 "GalleryConnector.c" +#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp3_ + end; +#line 2859 "GalleryConnector.c" + } +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (start >= ((glong) 0)) { +#line 2863 "GalleryConnector.c" + glong _tmp5_; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = start <= _tmp5_; +#line 2869 "GalleryConnector.c" } else { -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = FALSE; -#line 2542 "GalleryConnector.c" - } -#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp8_, NULL); -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13_ >= ((glong) 0)) { -#line 2550 "GalleryConnector.c" - glong _tmp14_; - glong _tmp15_; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = end; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ <= _tmp15_; -#line 2559 "GalleryConnector.c" +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 2873 "GalleryConnector.c" + } +#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp4_, NULL); +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (end >= ((glong) 0)) { +#line 2879 "GalleryConnector.c" + glong _tmp7_; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = string_length; +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = end <= _tmp7_; +#line 2885 "GalleryConnector.c" } else { -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 2563 "GalleryConnector.c" - } -#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_, NULL); -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = start; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = end; -#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = end; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = start; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp21_; -#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = FALSE; +#line 2889 "GalleryConnector.c" + } +#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (_tmp6_, NULL); +#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (start <= end, NULL); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start)); +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp8_; +#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2585 "GalleryConnector.c" +#line 2901 "GalleryConnector.c" } -gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) { +gchar* +publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyFetchTransaction* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp3_; @@ -2633,7 +2951,7 @@ gchar* publishing_gallery3_key_fetch_transaction_get_key (PublishingGallery3KeyF _tmp0_ = self->priv->key; #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (g_strcmp0 (_tmp0_, "") != 0) { -#line 2606 "GalleryConnector.c" +#line 2924 "GalleryConnector.c" const gchar* _tmp1_; gchar* _tmp2_; #line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2644,7 +2962,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 2617 "GalleryConnector.c" +#line 2935 "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)); @@ -2658,20 +2976,20 @@ 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 2631 "GalleryConnector.c" +#line 2949 "GalleryConnector.c" } else { 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 2638 "GalleryConnector.c" +#line 2956 "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 2644 "GalleryConnector.c" +#line 2962 "GalleryConnector.c" } else { const gchar* _tmp8_; gint _tmp9_; @@ -2684,11 +3002,11 @@ 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 2657 "GalleryConnector.c" +#line 2975 "GalleryConnector.c" } #line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp4_) { -#line 2661 "GalleryConnector.c" +#line 2979 "GalleryConnector.c" gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; @@ -2706,7 +3024,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 2679 "GalleryConnector.c" +#line 2997 "GalleryConnector.c" } #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = self->priv->key; @@ -2724,22 +3042,26 @@ 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 2697 "GalleryConnector.c" +#line 3015 "GalleryConnector.c" } -static void publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass) { +static void +publishing_gallery3_key_fetch_transaction_class_init (PublishingGallery3KeyFetchTransactionClass * klass) +{ #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_key_fetch_transaction_parent_class = g_type_class_peek_parent (klass); #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 2708 "GalleryConnector.c" +#line 3028 "GalleryConnector.c" } -static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) { +static void +publishing_gallery3_key_fetch_transaction_instance_init (PublishingGallery3KeyFetchTransaction * self) +{ gchar* _tmp0_; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_KEY_FETCH_TRANSACTION_GET_PRIVATE (self); @@ -2747,11 +3069,13 @@ static void publishing_gallery3_key_fetch_transaction_instance_init (PublishingG _tmp0_ = g_strdup (""); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->key = _tmp0_; -#line 2720 "GalleryConnector.c" +#line 3042 "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); @@ -2759,11 +3083,13 @@ 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 2732 "GalleryConnector.c" +#line 3056 "GalleryConnector.c" } -GType publishing_gallery3_key_fetch_transaction_get_type (void) { +GType +publishing_gallery3_key_fetch_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_key_fetch_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_key_fetch_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3KeyFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_key_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3KeyFetchTransaction), 0, (GInstanceInitFunc) publishing_gallery3_key_fetch_transaction_instance_init, NULL }; @@ -2775,84 +3101,78 @@ 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* +publishing_gallery3_gallery_request_transaction_construct (GType object_type, + PublishingGallery3Session* session, + const gchar* item, + PublishingRESTSupportHttpMethod method) +{ PublishingGallery3GalleryRequestTransaction* self = NULL; - 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" g_return_val_if_fail (item != NULL, NULL); #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp1_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:254: Not authenticated"); -#line 2764 "GalleryConnector.c" +#line 3089 "GalleryConnector.c" } else { - 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" - _tmp3_ = session; -#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = publishing_gallery3_session_get_url (_tmp3_); -#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _tmp4_; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = item; + _tmp0_ = publishing_gallery3_session_get_url (session); #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = method; + _tmp1_ = _tmp0_; #line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp2_, _tmp5_, _tmp6_, _tmp7_); + self = (PublishingGallery3GalleryRequestTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp1_, item, method); #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = session; + _tmp2_ = publishing_gallery3_session_get_key (session); #line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = publishing_gallery3_session_get_key (_tmp8_); -#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = _tmp9_; + _tmp3_ = _tmp2_; #line 258 "/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-Key", _tmp10_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp3_); #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 2799 "GalleryConnector.c" +#line 3109 "GalleryConnector.c" } #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 2803 "GalleryConnector.c" +#line 3113 "GalleryConnector.c" } -PublishingGallery3GalleryRequestTransaction* publishing_gallery3_gallery_request_transaction_new (PublishingGallery3Session* session, const gchar* item, PublishingRESTSupportHttpMethod method) { +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 2810 "GalleryConnector.c" +#line 3124 "GalleryConnector.c" } -static void publishing_gallery3_gallery_request_transaction_class_init (PublishingGallery3GalleryRequestTransactionClass * klass) { +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 2817 "GalleryConnector.c" +#line 3133 "GalleryConnector.c" } -static void publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self) { +static void +publishing_gallery3_gallery_request_transaction_instance_init (PublishingGallery3GalleryRequestTransaction * self) +{ } -GType publishing_gallery3_gallery_request_transaction_get_type (void) { +GType +publishing_gallery3_gallery_request_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_request_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_request_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryRequestTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_request_transaction_instance_init, NULL }; @@ -2864,50 +3184,60 @@ GType publishing_gallery3_gallery_request_transaction_get_type (void) { } -PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, PublishingGallery3Session* session) { +PublishingGallery3GetAlbumURLsTransaction* +publishing_gallery3_get_album_ur_ls_transaction_construct (GType object_type, + PublishingGallery3Session* session) +{ PublishingGallery3GetAlbumURLsTransaction* self = 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" - _tmp0_ = session; -#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); + self = (PublishingGallery3GetAlbumURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "album"); #line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 2852 "GalleryConnector.c" +#line 3172 "GalleryConnector.c" } -PublishingGallery3GetAlbumURLsTransaction* publishing_gallery3_get_album_ur_ls_transaction_new (PublishingGallery3Session* session) { +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 2859 "GalleryConnector.c" +#line 3181 "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 2870 "GalleryConnector.c" +#line 3197 "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 2876 "GalleryConnector.c" +#line 3203 "GalleryConnector.c" } -gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, int* result_length1) { +gchar** +publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (PublishingGallery3GetAlbumURLsTransaction* self, + int* result_length1) +{ gchar** result = NULL; JsonNode* root_node = NULL; JsonArray* all_members = NULL; @@ -2916,12 +3246,12 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi gchar** member_urls = NULL; gint member_urls_length1; gint _member_urls_size_; - gchar** _tmp14_; - gint _tmp14__length1; + gchar** _tmp13_; + gint _tmp13__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 2894 "GalleryConnector.c" +#line 3224 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; JsonNode* _tmp1_; @@ -2933,7 +3263,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 2906 "GalleryConnector.c" +#line 3236 "GalleryConnector.c" goto __catch1_spit_publishing_publishing_error; } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2942,11 +3272,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 2915 "GalleryConnector.c" +#line 3245 "GalleryConnector.c" } #line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 2919 "GalleryConnector.c" +#line 3249 "GalleryConnector.c" } goto __finally1; __catch1_spit_publishing_publishing_error: @@ -2960,7 +3290,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 2933 "GalleryConnector.c" +#line 3263 "GalleryConnector.c" } __finally1: #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -2971,7 +3301,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 2944 "GalleryConnector.c" +#line 3274 "GalleryConnector.c" } #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -2985,37 +3315,36 @@ 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 2958 "GalleryConnector.c" +#line 3288 "GalleryConnector.c" { guint i = 0U; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 2963 "GalleryConnector.c" +#line 3293 "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 2970 "GalleryConnector.c" +#line 3300 "GalleryConnector.c" guint _tmp6_; JsonArray* _tmp7_; - guint _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; - JsonArray* _tmp10_; - guint _tmp11_; - const gchar* _tmp12_; - gchar* _tmp13_; + gchar** _tmp8_; + gint _tmp8__length1; + JsonArray* _tmp9_; + guint _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp4_) { -#line 2982 "GalleryConnector.c" +#line 3311 "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 2988 "GalleryConnector.c" +#line 3317 "GalleryConnector.c" } #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp4_ = FALSE; @@ -3024,61 +3353,65 @@ gchar** publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (Publishi #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = all_members; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = json_array_get_length (_tmp7_); -#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!(_tmp6_ <= (_tmp8_ - 1))) { + if (!(_tmp6_ <= (json_array_get_length (_tmp7_) - 1))) { #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3002 "GalleryConnector.c" +#line 3329 "GalleryConnector.c" } #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = member_urls; + _tmp8_ = member_urls; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9__length1 = member_urls_length1; + _tmp8__length1 = member_urls_length1; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = all_members; + _tmp9_ = all_members; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = i; + _tmp10_ = i; #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = json_array_get_string_element (_tmp10_, _tmp11_); + _tmp11_ = json_array_get_string_element (_tmp9_, _tmp10_); #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = g_strdup (_tmp12_); + _tmp12_ = g_strdup (_tmp11_); #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 3018 "GalleryConnector.c" + _vala_array_add2 (&member_urls, &member_urls_length1, &_member_urls_size_, _tmp12_); +#line 3345 "GalleryConnector.c" } } } #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = member_urls; + _tmp13_ = member_urls; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14__length1 = member_urls_length1; + _tmp13__length1 = member_urls_length1; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (result_length1) { #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - *result_length1 = _tmp14__length1; -#line 3030 "GalleryConnector.c" + *result_length1 = _tmp13__length1; +#line 3357 "GalleryConnector.c" } #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp14_; + result = _tmp13_; #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 3036 "GalleryConnector.c" +#line 3363 "GalleryConnector.c" } -static void publishing_gallery3_get_album_ur_ls_transaction_class_init (PublishingGallery3GetAlbumURLsTransactionClass * klass) { +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 3043 "GalleryConnector.c" +#line 3372 "GalleryConnector.c" } -static void publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self) { +static void +publishing_gallery3_get_album_ur_ls_transaction_instance_init (PublishingGallery3GetAlbumURLsTransaction * self) +{ } -GType publishing_gallery3_get_album_ur_ls_transaction_get_type (void) { +GType +publishing_gallery3_get_album_ur_ls_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_get_album_ur_ls_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_album_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_album_ur_ls_transaction_instance_init, NULL }; @@ -3090,476 +3423,388 @@ 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 3070 "GalleryConnector.c" +#line 3408 "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 3076 "GalleryConnector.c" +#line 3414 "GalleryConnector.c" } -static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) { +static gchar* +_vala_g_strjoinv (const gchar* separator, + gchar** str_array, + int str_array_length1) +{ gchar* result = NULL; - const gchar* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar** _tmp3_; - gint _tmp3__length1; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = separator; -#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp0_ == NULL) { -#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp0_ = FALSE; +#line 1092 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (separator == NULL) { +#line 1093 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" separator = ""; -#line 3093 "GalleryConnector.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = TRUE; -#line 3103 "GalleryConnector.c" - } else { - gchar** _tmp4_; - gint _tmp4__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = _tmp4__length1 > 0; -#line 3113 "GalleryConnector.c" - } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp2_) { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = TRUE; -#line 3119 "GalleryConnector.c" - } else { - gboolean _tmp5_ = FALSE; - gchar** _tmp6_; - gint _tmp6__length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str_array; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp6__length1 == -1) { -#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 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7__length1 = str_array_length1; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_[0]; -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_ != NULL; -#line 3142 "GalleryConnector.c" +#line 3429 "GalleryConnector.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array != NULL) { +#line 3433 "GalleryConnector.c" + gboolean _tmp1_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 > 0) { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 3439 "GalleryConnector.c" } else { -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = FALSE; -#line 3146 "GalleryConnector.c" + gboolean _tmp2_ = FALSE; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 3444 "GalleryConnector.c" + const gchar* _tmp3_; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = str_array[0]; +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp3_ != NULL; +#line 3450 "GalleryConnector.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = FALSE; +#line 3454 "GalleryConnector.c" + } +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _tmp2_; +#line 3458 "GalleryConnector.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = _tmp5_; -#line 3150 "GalleryConnector.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = _tmp1_; +#line 3462 "GalleryConnector.c" + } else { +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = FALSE; +#line 3466 "GalleryConnector.c" } -#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_) { -#line 3154 "GalleryConnector.c" +#line 1095 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 3470 "GalleryConnector.c" gint i = 0; gsize len = 0UL; - gint _tmp31_; - gint _tmp33_; - gint _tmp34_; - gsize _tmp35_; - const gchar* _tmp36_; - gint _tmp37_; - gint _tmp38_; - gint _tmp39_; + gint _tmp20_; + gint _tmp22_; + gint _tmp23_; + gsize _tmp24_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; const gchar* res = NULL; - gsize _tmp40_; - void* _tmp41_; + gsize _tmp28_; + void* _tmp29_; void* ptr = NULL; - 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" + const gchar* _tmp30_; + const gchar* _tmp31_; + void* _tmp32_; + const gchar* _tmp45_; +#line 1097 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 3177 "GalleryConnector.c" +#line 3490 "GalleryConnector.c" { - gboolean _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 0; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = TRUE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = TRUE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 3186 "GalleryConnector.c" - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gchar** _tmp13_; - gint _tmp13__length1; - gint _tmp21_ = 0; - 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 3199 "GalleryConnector.c" - gint _tmp10_; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp10_ + 1; -#line 3205 "GalleryConnector.c" +#line 3499 "GalleryConnector.c" + gboolean _tmp6_ = FALSE; + gboolean _tmp7_ = FALSE; + gint _tmp12_ = 0; + gint _tmp13_; + const gchar* _tmp14_; + gsize _tmp19_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp4_) { +#line 3508 "GalleryConnector.c" + gint _tmp5_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp5_ + 1; +#line 3514 "GalleryConnector.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = FALSE; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp13__length1 != -1) { -#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 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = _tmp14_ < _tmp15__length1; -#line 3227 "GalleryConnector.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 != -1) { +#line 3520 "GalleryConnector.c" + gint _tmp8_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp8_ < str_array_length1; +#line 3526 "GalleryConnector.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = FALSE; -#line 3231 "GalleryConnector.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = FALSE; +#line 3530 "GalleryConnector.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp12_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = TRUE; -#line 3237 "GalleryConnector.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp7_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = TRUE; +#line 3536 "GalleryConnector.c" } else { - gboolean _tmp16_ = FALSE; - gchar** _tmp17_; - gint _tmp17__length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = str_array; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp17__length1 == -1) { -#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 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18__length1 = str_array_length1; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = i; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = _tmp18_[_tmp19_]; -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = _tmp20_ != NULL; -#line 3263 "GalleryConnector.c" + gboolean _tmp9_ = FALSE; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (str_array_length1 == -1) { +#line 3541 "GalleryConnector.c" + gint _tmp10_; + const gchar* _tmp11_; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = i; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp11_ = str_array[_tmp10_]; +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = _tmp11_ != NULL; +#line 3550 "GalleryConnector.c" } else { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = FALSE; -#line 3267 "GalleryConnector.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = FALSE; +#line 3554 "GalleryConnector.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp16_; -#line 3271 "GalleryConnector.c" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp9_; +#line 3558 "GalleryConnector.c" } -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!_tmp11_) { -#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp6_) { +#line 1098 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 3277 "GalleryConnector.c" +#line 3564 "GalleryConnector.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = str_array; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp23_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp24_ = _tmp22_[_tmp23_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp24_ != NULL) { -#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 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp25__length1 = str_array_length1; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp26_ = i; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp27_ = _tmp25_[_tmp26_]; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp29_ = _tmp28_; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = _tmp29_; -#line 3310 "GalleryConnector.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp13_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp14_ = str_array[_tmp13_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp14_ != NULL) { +#line 3572 "GalleryConnector.c" + gint _tmp15_; + const gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp15_ = i; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp16_ = str_array[_tmp15_]; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp17_ = strlen ((const gchar*) _tmp16_); +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp18_ = _tmp17_; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = _tmp18_; +#line 3587 "GalleryConnector.c" } else { -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = 0; -#line 3314 "GalleryConnector.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp12_ = 0; +#line 3591 "GalleryConnector.c" } -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp30_ = len; -#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp30_ + _tmp21_; -#line 3320 "GalleryConnector.c" +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp19_ = len; +#line 1099 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp19_ + _tmp12_; +#line 3597 "GalleryConnector.c" } } -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp31_ = i; -#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp31_ == 0) { -#line 3327 "GalleryConnector.c" - gchar* _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp32_ = g_strdup (""); -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp32_; -#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp20_ = i; +#line 1101 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp20_ == 0) { +#line 3604 "GalleryConnector.c" + gchar* _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp21_ = g_strdup (""); +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp21_; +#line 1102 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3335 "GalleryConnector.c" +#line 3612 "GalleryConnector.c" } -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp33_ = i; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - str_array_length1 = _tmp33_; -#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp34_ = str_array_length1; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp35_ = len; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp36_ = separator; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp38_ = _tmp37_; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp39_ = i; -#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp40_ = len; -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp41_ = g_malloc (_tmp40_); -#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - res = _tmp41_; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp42_ = res; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43_ = str_array; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp43__length1 = str_array_length1; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp44_ = _tmp43_[0]; -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp45_; -#line 3373 "GalleryConnector.c" +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp22_ = i; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + str_array_length1 = _tmp22_; +#line 1104 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp23_ = str_array_length1; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp24_ = len; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp25_ = strlen ((const gchar*) separator); +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp26_ = _tmp25_; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp27_ = i; +#line 1105 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp24_ + (_tmp26_ * (_tmp27_ - 1)); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp28_ = len; +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp29_ = g_malloc (_tmp28_); +#line 1107 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + res = _tmp29_; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp30_ = res; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp31_ = str_array[0]; +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp32_ = g_stpcpy ((void*) _tmp30_, (const gchar*) _tmp31_); +#line 1108 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp32_; +#line 3644 "GalleryConnector.c" { - gboolean _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gboolean _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" i = 1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = TRUE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = TRUE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" while (TRUE) { -#line 3382 "GalleryConnector.c" - gint _tmp48_; - gchar** _tmp49_; - gint _tmp49__length1; - void* _tmp50_; - const gchar* _tmp51_; - void* _tmp52_; - const gchar* _tmp53_ = NULL; - 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 3398 "GalleryConnector.c" - gint _tmp47_; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp47_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - i = _tmp47_ + 1; -#line 3404 "GalleryConnector.c" +#line 3653 "GalleryConnector.c" + gint _tmp35_; + void* _tmp36_; + void* _tmp37_; + const gchar* _tmp38_ = NULL; + gint _tmp39_; + const gchar* _tmp40_; + void* _tmp43_; + void* _tmp44_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!_tmp33_) { +#line 3664 "GalleryConnector.c" + gint _tmp34_; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp34_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + i = _tmp34_ + 1; +#line 3670 "GalleryConnector.c" } -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp46_ = FALSE; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp48_ = i; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49_ = str_array; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp49__length1 = str_array_length1; -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (!(_tmp48_ < _tmp49__length1)) { -#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp33_ = FALSE; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp35_ = i; +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (!(_tmp35_ < str_array_length1)) { +#line 1109 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" break; -#line 3418 "GalleryConnector.c" +#line 3680 "GalleryConnector.c" } -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp50_ = ptr; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp51_ = separator; -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp52_; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54_ = str_array; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp54__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp55_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp56_ = _tmp54_[_tmp55_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp56_ != NULL) { -#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 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp57__length1 = str_array_length1; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp58_ = i; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp59_ = _tmp57_[_tmp58_]; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = (const gchar*) _tmp59_; -#line 3453 "GalleryConnector.c" +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp36_ = ptr; +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp37_ = g_stpcpy (_tmp36_, (const gchar*) separator); +#line 1110 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp37_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp39_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp40_ = str_array[_tmp39_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp40_ != NULL) { +#line 3694 "GalleryConnector.c" + gint _tmp41_; + const gchar* _tmp42_; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp41_ = i; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp42_ = str_array[_tmp41_]; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = (const gchar*) _tmp42_; +#line 3703 "GalleryConnector.c" } else { -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp53_ = ""; -#line 3457 "GalleryConnector.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp38_ = ""; +#line 3707 "GalleryConnector.c" } -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp60_ = ptr; -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - ptr = _tmp61_; -#line 3465 "GalleryConnector.c" +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp43_ = ptr; +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp44_ = g_stpcpy (_tmp43_, _tmp38_); +#line 1111 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + ptr = _tmp44_; +#line 3715 "GalleryConnector.c" } } -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp62_ = res; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp45_ = res; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" res = NULL; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gchar*) _tmp62_; -#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gchar*) _tmp45_; +#line 1114 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3476 "GalleryConnector.c" +#line 3726 "GalleryConnector.c" } else { - gchar* _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp63_ = g_strdup (""); -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp63_; -#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp46_ = g_strdup (""); +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp46_; +#line 1116 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3485 "GalleryConnector.c" +#line 3735 "GalleryConnector.c" } } -PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_construct (GType object_type, PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { +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_; - gchar** _tmp1_; - gint _tmp1__length1; gchar* url_list = NULL; - gchar* _tmp2_; + gchar* _tmp0_; gchar** my_album_urls = NULL; gint my_album_urls_length1; gint _my_album_urls_size_; gchar* endpoint_url = NULL; - PublishingGallery3Session* _tmp3_; - gchar* _tmp4_; - gint _tmp5_ = 0; - const gchar* _tmp6_; + gchar* _tmp1_; + gint _tmp2_ = 0; + const gchar* _tmp3_; gint url_length = 0; - gint _tmp10_; - guint _tmp11_; - gchar** _tmp12_; - gint _tmp12__length1; - gchar** _tmp13_; - gint _tmp13__length1; - const gchar* _tmp51_; - gchar* _tmp52_; - const gchar* _tmp53_; + gint _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + gchar** _tmp9_; + gint _tmp9__length1; + const gchar* _tmp46_; + gchar* _tmp47_; + const gchar* _tmp48_; #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" - _tmp0_ = session; -#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); + self = (PublishingGallery3GetAlbumsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, "/items", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "scope", "all"); #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _album_urls; -#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1__length1 = _album_urls_length1; -#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_get_albums_transaction_set_album_urls (self, _tmp1_, _tmp1__length1); + publishing_gallery3_get_albums_transaction_set_album_urls (self, _album_urls, _album_urls_length1); #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = g_strdup ("["); + _tmp0_ = g_strdup ("["); #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_list = _tmp2_; + url_list = _tmp0_; #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" my_album_urls = NULL; #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3567,248 +3812,241 @@ PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transacti #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _my_album_urls_size_ = my_album_urls_length1; #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = session; + _tmp1_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = publishing_rest_support_session_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - endpoint_url = _tmp4_; + endpoint_url = _tmp1_; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = endpoint_url; + _tmp3_ = endpoint_url; #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (NULL != _tmp6_) { -#line 3549 "GalleryConnector.c" - const gchar* _tmp7_; - gint _tmp8_; - gint _tmp9_; + if (NULL != _tmp3_) { +#line 3792 "GalleryConnector.c" + const gchar* _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = endpoint_url; + _tmp4_ = endpoint_url; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = strlen (_tmp7_); + _tmp5_ = strlen (_tmp4_); #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = _tmp9_; -#line 3561 "GalleryConnector.c" + _tmp2_ = _tmp6_; +#line 3804 "GalleryConnector.c" } else { #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = 0; -#line 3565 "GalleryConnector.c" + _tmp2_ = 0; +#line 3808 "GalleryConnector.c" } #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_length = _tmp5_; + url_length = _tmp2_; #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = url_length; + _tmp7_ = url_length; #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_length = _tmp10_ + 18; + url_length = _tmp7_ + 18; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = start; + _tmp8_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp8__length1); #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp12__length1); -#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = _tmp12_; + _tmp9_ = _tmp8_; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13__length1 = _tmp12__length1; + _tmp9__length1 = _tmp8__length1; #line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp11_ <= ((guint) (_tmp13__length1 - 1))) { -#line 3583 "GalleryConnector.c" - guint _tmp14_; - const gchar* _tmp43_; + if (start <= ((guint) (_tmp9__length1 - 1))) { +#line 3824 "GalleryConnector.c" + const gchar* _tmp38_; + gchar** _tmp39_; + gint _tmp39__length1; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + guint _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; + gchar** _tmp45_; + gint _tmp45__length1; #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp14_); -#line 3600 "GalleryConnector.c" + publishing_gallery3_get_albums_transaction_set_urls_sent (self, start); +#line 3838 "GalleryConnector.c" { - gboolean _tmp15_ = FALSE; + gboolean _tmp10_ = FALSE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = TRUE; + _tmp10_ = TRUE; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#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_; +#line 3845 "GalleryConnector.c" + gchar** _tmp22_; + gint _tmp22__length1; + gchar** _tmp23_; + gint _tmp23__length1; + gchar** _tmp24_; + gint _tmp24__length1; + guint _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gint _tmp30_; + gchar** _tmp31_; + gint _tmp31__length1; + gchar** _tmp32_; + gint _tmp32__length1; + guint _tmp33_; + const 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_; + gint _tmp36_; + guint _tmp37_; #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp15_) { -#line 3631 "GalleryConnector.c" - gboolean _tmp16_ = FALSE; - guint _tmp17_; - gchar** _tmp18_; - gint _tmp18__length1; - gchar** _tmp19_; - gint _tmp19__length1; + if (!_tmp10_) { +#line 3869 "GalleryConnector.c" + gboolean _tmp11_ = FALSE; + guint _tmp12_; + gchar** _tmp13_; + gint _tmp13__length1; + gchar** _tmp14_; + gint _tmp14__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = self->priv->_urls_sent; + _tmp12_ = self->priv->_urls_sent; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp18__length1); + _tmp13_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp13__length1); #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19__length1 = _tmp18__length1; + _tmp14__length1 = _tmp13__length1; #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp17_ <= ((guint) (_tmp19__length1 - 1))) { -#line 3648 "GalleryConnector.c" + if (_tmp12_ <= ((guint) (_tmp14__length1 - 1))) { +#line 3886 "GalleryConnector.c" + gint _tmp15_; + gchar** _tmp16_; + gint _tmp16__length1; + gchar** _tmp17_; + gint _tmp17__length1; + guint _tmp18_; + const gchar* _tmp19_; gint _tmp20_; - gchar** _tmp21_; - gint _tmp21__length1; - gchar** _tmp22_; - gint _tmp22__length1; - guint _tmp23_; - const gchar* _tmp24_; - gint _tmp25_; - gint _tmp26_; + gint _tmp21_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = url_length; + _tmp15_ = url_length; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp21__length1); + _tmp16_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp16__length1); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22__length1 = _tmp21__length1; + _tmp17__length1 = _tmp16__length1; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = self->priv->_urls_sent; + _tmp18_ = self->priv->_urls_sent; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = _tmp22_[_tmp23_]; + _tmp19_ = _tmp17_[_tmp18_]; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = strlen (_tmp24_); + _tmp20_ = strlen (_tmp19_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = _tmp25_; + _tmp21_ = _tmp20_; #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = ((_tmp20_ + _tmp26_) + 3) <= 255; -#line 3676 "GalleryConnector.c" + _tmp11_ = ((_tmp15_ + _tmp21_) + 3) <= 255; +#line 3914 "GalleryConnector.c" } else { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = FALSE; -#line 3680 "GalleryConnector.c" + _tmp11_ = FALSE; +#line 3918 "GalleryConnector.c" } #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp16_) { + if (!_tmp11_) { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3686 "GalleryConnector.c" +#line 3924 "GalleryConnector.c" } } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = FALSE; + _tmp10_ = FALSE; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = my_album_urls; + _tmp22_ = my_album_urls; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27__length1 = my_album_urls_length1; + _tmp22__length1 = my_album_urls_length1; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp28__length1); + _tmp23_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp23__length1); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = _tmp28_; + _tmp24_ = _tmp23_; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29__length1 = _tmp28__length1; + _tmp24__length1 = _tmp23__length1; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = self->priv->_urls_sent; + _tmp25_ = self->priv->_urls_sent; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = _tmp29_[_tmp30_]; + _tmp26_ = _tmp24_[_tmp25_]; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = g_strconcat ("\"", _tmp31_, NULL); + _tmp27_ = g_strconcat ("\"", _tmp26_, NULL); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = _tmp32_; + _tmp28_ = _tmp27_; #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = g_strconcat (_tmp33_, "\"", NULL); + _tmp29_ = g_strconcat (_tmp28_, "\"", NULL); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp34_); + _vala_array_add3 (&my_album_urls, &my_album_urls_length1, &_my_album_urls_size_, _tmp29_); #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp33_); + _g_free0 (_tmp28_); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = url_length; + _tmp30_ = url_length; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp36__length1); + _tmp31_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp31__length1); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = _tmp36_; + _tmp32_ = _tmp31_; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37__length1 = _tmp36__length1; + _tmp32__length1 = _tmp31__length1; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = self->priv->_urls_sent; + _tmp33_ = self->priv->_urls_sent; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = _tmp37_[_tmp38_]; + _tmp34_ = _tmp32_[_tmp33_]; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = strlen (_tmp39_); + _tmp35_ = strlen (_tmp34_); #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = _tmp40_; + _tmp36_ = _tmp35_; #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_length = _tmp35_ + (_tmp41_ + 3); + url_length = _tmp30_ + (_tmp36_ + 3); #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = self->priv->_urls_sent; + _tmp37_ = 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 3737 "GalleryConnector.c" + publishing_gallery3_get_albums_transaction_set_urls_sent (self, _tmp37_ + 1); +#line 3975 "GalleryConnector.c" } } #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp43_ = url_list; + _tmp38_ = url_list; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = my_album_urls; + _tmp39_ = my_album_urls; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44__length1 = my_album_urls_length1; + _tmp39__length1 = my_album_urls_length1; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = _vala_g_strjoinv (",", _tmp44_, _tmp44__length1); + _tmp40_ = _vala_g_strjoinv (",", _tmp39_, _tmp39__length1); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = _tmp45_; + _tmp41_ = _tmp40_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = g_strconcat (_tmp43_, _tmp46_, NULL); + _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url_list); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_list = _tmp47_; + url_list = _tmp42_; #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp46_); + _g_free0 (_tmp41_); #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = self->priv->_urls_sent; + _tmp43_ = self->priv->_urls_sent; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp49__length1); + _tmp44_ = publishing_gallery3_get_albums_transaction_get_album_urls (self, &_tmp44__length1); #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = _tmp49_; + _tmp45_ = _tmp44_; #line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50__length1 = _tmp49__length1; + _tmp45__length1 = _tmp44__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 3768 "GalleryConnector.c" + publishing_gallery3_get_albums_transaction_set_more_urls (self, _tmp43_ <= ((guint) (_tmp45__length1 - 1))); +#line 4006 "GalleryConnector.c" } #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = url_list; + _tmp46_ = url_list; #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = g_strconcat (_tmp51_, "]", NULL); + _tmp47_ = g_strconcat (_tmp46_, "]", NULL); #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url_list); #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url_list = _tmp52_; + url_list = _tmp47_; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = url_list; + _tmp48_ = url_list; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp53_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "urls", _tmp48_); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (endpoint_url); #line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -3817,54 +4055,72 @@ 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 3790 "GalleryConnector.c" +#line 4028 "GalleryConnector.c" } -PublishingGallery3GetAlbumsTransaction* publishing_gallery3_get_albums_transaction_new (PublishingGallery3Session* session, gchar** _album_urls, int _album_urls_length1, guint start) { +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 3797 "GalleryConnector.c" +#line 4040 "GalleryConnector.c" } -static gpointer _publishing_gallery3_album_ref0 (gpointer self) { +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 3804 "GalleryConnector.c" +#line 4049 "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 3815 "GalleryConnector.c" +#line 4065 "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 3821 "GalleryConnector.c" +#line 4071 "GalleryConnector.c" } -static const gchar* string_to_string (const gchar* self) { +static const gchar* +string_to_string (const gchar* self) +{ const gchar* result = NULL; -#line 1442 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1456 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = self; -#line 1443 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1457 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 3833 "GalleryConnector.c" +#line 4085 "GalleryConnector.c" } -PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, int* result_length1, GError** error) { +PublishingGallery3Album** +publishing_gallery3_get_albums_transaction_get_albums (PublishingGallery3GetAlbumsTransaction* self, + int* result_length1, + GError** error) +{ PublishingGallery3Album** result = NULL; PublishingGallery3Album** albums = NULL; gint albums_length1; @@ -3874,8 +4130,8 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums JsonNode* _tmp0_; JsonArray* members = NULL; JsonArray* _tmp1_; - PublishingGallery3Album** _tmp23_; - gint _tmp23__length1; + PublishingGallery3Album** _tmp22_; + gint _tmp22__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); @@ -3901,7 +4157,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 3874 "GalleryConnector.c" +#line 4130 "GalleryConnector.c" } else { #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_album_unref0 (tmp_album); @@ -3913,45 +4169,44 @@ 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 3886 "GalleryConnector.c" +#line 4142 "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 3893 "GalleryConnector.c" +#line 4149 "GalleryConnector.c" { guint i = 0U; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = (guint) 0; -#line 3898 "GalleryConnector.c" +#line 4154 "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 3905 "GalleryConnector.c" +#line 4161 "GalleryConnector.c" guint _tmp4_; JsonArray* _tmp5_; - guint _tmp6_; - JsonArray* _tmp7_; - guint _tmp8_; - JsonObject* _tmp9_; + JsonArray* _tmp6_; + guint _tmp7_; + JsonObject* _tmp8_; + PublishingGallery3Album* _tmp9_; PublishingGallery3Album* _tmp10_; - PublishingGallery3Album* _tmp11_; + gboolean _tmp11_; gboolean _tmp12_; - gboolean _tmp13_; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 3918 "GalleryConnector.c" +#line 4173 "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 3924 "GalleryConnector.c" +#line 4179 "GalleryConnector.c" } #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -3960,98 +4215,99 @@ PublishingGallery3Album** publishing_gallery3_get_albums_transaction_get_albums #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp5_ = members; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = json_array_get_length (_tmp5_); -#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!(_tmp4_ <= (_tmp6_ - 1))) { + if (!(_tmp4_ <= (json_array_get_length (_tmp5_) - 1))) { #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 3938 "GalleryConnector.c" +#line 4191 "GalleryConnector.c" } #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = members; + _tmp6_ = members; #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = i; + _tmp7_ = i; #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = json_array_get_object_element (_tmp7_, _tmp8_); + _tmp8_ = json_array_get_object_element (_tmp6_, _tmp7_); #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_album_new (_tmp9_); + _tmp9_ = publishing_gallery3_album_new (_tmp8_); #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_album_unref0 (tmp_album); #line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - tmp_album = _tmp10_; + tmp_album = _tmp9_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = tmp_album; + _tmp10_ = tmp_album; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = publishing_gallery3_album_get_editable (_tmp11_); + _tmp11_ = publishing_gallery3_album_get_editable (_tmp10_); #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp13_) { -#line 3960 "GalleryConnector.c" - PublishingGallery3Album** _tmp14_; - gint _tmp14__length1; + if (_tmp12_) { +#line 4213 "GalleryConnector.c" + PublishingGallery3Album** _tmp13_; + gint _tmp13__length1; + PublishingGallery3Album* _tmp14_; PublishingGallery3Album* _tmp15_; - PublishingGallery3Album* _tmp16_; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = albums; + _tmp13_ = albums; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14__length1 = albums_length1; + _tmp13__length1 = albums_length1; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = tmp_album; + _tmp14_ = tmp_album; #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_); + _tmp15_ = _publishing_gallery3_album_ref0 (_tmp14_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp16_); -#line 3975 "GalleryConnector.c" + _vala_array_add4 (&albums, &albums_length1, &_albums_size_, _tmp15_); +#line 4228 "GalleryConnector.c" } else { - PublishingGallery3Album* _tmp17_; + PublishingGallery3Album* _tmp16_; + const gchar* _tmp17_; const gchar* _tmp18_; const gchar* _tmp19_; - const gchar* _tmp20_; + gchar* _tmp20_; gchar* _tmp21_; - gchar* _tmp22_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = tmp_album; + _tmp16_ = tmp_album; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_album_get_title (_tmp17_); + _tmp17_ = publishing_gallery3_album_get_title (_tmp16_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = string_to_string (_tmp19_); + _tmp19_ = string_to_string (_tmp18_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = g_strconcat ("Album \"", _tmp20_, "\" is not editable", NULL); + _tmp20_ = g_strconcat ("Album \"", _tmp19_, "\" is not editable", NULL); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_warning ("GalleryConnector.vala:373: %s", _tmp22_); + g_warning ("GalleryConnector.vala:373: %s", _tmp21_); #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp22_); -#line 3999 "GalleryConnector.c" + _g_free0 (_tmp21_); +#line 4252 "GalleryConnector.c" } } } } #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = albums; + _tmp22_ = albums; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23__length1 = albums_length1; + _tmp22__length1 = albums_length1; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (result_length1) { #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - *result_length1 = _tmp23__length1; -#line 4012 "GalleryConnector.c" + *result_length1 = _tmp22__length1; +#line 4265 "GalleryConnector.c" } #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp23_; + result = _tmp22_; #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_album_unref0 (tmp_album); #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4020 "GalleryConnector.c" +#line 4273 "GalleryConnector.c" } -gchar** publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, int* result_length1) { +gchar** +publishing_gallery3_get_albums_transaction_get_album_urls (PublishingGallery3GetAlbumsTransaction* self, + int* result_length1) +{ gchar** result; gchar** _tmp0_; gint _tmp0__length1; @@ -4071,65 +4327,68 @@ 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 4044 "GalleryConnector.c" +#line 4300 "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 4050 "GalleryConnector.c" +#line 4306 "GalleryConnector.c" } -static gchar** _vala_array_dup2 (gchar** self, int length) { +static gchar** +_vala_array_dup2 (gchar** self, + int length) +{ gchar** result; int i; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 4061 "GalleryConnector.c" +#line 4320 "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 4067 "GalleryConnector.c" +#line 4326 "GalleryConnector.c" } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 4071 "GalleryConnector.c" +#line 4330 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, gchar** value, int value_length1) { +static void +publishing_gallery3_get_albums_transaction_set_album_urls (PublishingGallery3GetAlbumsTransaction* self, + gchar** value, + int value_length1) +{ 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" - _tmp0_ = value; + _tmp0_ = (value != NULL) ? _vala_array_dup2 (value, value_length1) : ((gpointer) value); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0__length1 = value_length1; -#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1__length1 = _tmp0__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_album_urls = (_vala_array_free (self->priv->_album_urls, self->priv->_album_urls_length1, (GDestroyNotify) g_free), NULL); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_album_urls = _tmp1_; + self->priv->_album_urls = _tmp0_; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_album_urls_length1 = _tmp1__length1; + self->priv->_album_urls_length1 = _tmp0__length1; #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->__album_urls_size_ = self->priv->_album_urls_length1; -#line 4098 "GalleryConnector.c" +#line 4355 "GalleryConnector.c" } -guint publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) { +guint +publishing_gallery3_get_albums_transaction_get_urls_sent (PublishingGallery3GetAlbumsTransaction* self) +{ guint result; guint _tmp0_; #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4140,23 +4399,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 4113 "GalleryConnector.c" +#line 4372 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, guint value) { - guint _tmp0_; +static void +publishing_gallery3_get_albums_transaction_set_urls_sent (PublishingGallery3GetAlbumsTransaction* self, + guint value) +{ #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 4125 "GalleryConnector.c" + self->priv->_urls_sent = value; +#line 4384 "GalleryConnector.c" } -gboolean publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) { +gboolean +publishing_gallery3_get_albums_transaction_get_more_urls (PublishingGallery3GetAlbumsTransaction* self) +{ gboolean result; gboolean _tmp0_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4167,34 +4428,38 @@ 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 4140 "GalleryConnector.c" +#line 4401 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, gboolean value) { - gboolean _tmp0_; +static void +publishing_gallery3_get_albums_transaction_set_more_urls (PublishingGallery3GetAlbumsTransaction* self, + gboolean value) +{ #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 4152 "GalleryConnector.c" + self->priv->_more_urls = value; +#line 4413 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass) { +static void +publishing_gallery3_get_albums_transaction_class_init (PublishingGallery3GetAlbumsTransactionClass * klass) +{ #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_get_albums_transaction_parent_class = g_type_class_peek_parent (klass); #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 4163 "GalleryConnector.c" +#line 4426 "GalleryConnector.c" } -static void publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self) { +static void +publishing_gallery3_get_albums_transaction_instance_init (PublishingGallery3GetAlbumsTransaction * self) +{ #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GET_ALBUMS_TRANSACTION_GET_PRIVATE (self); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4207,11 +4472,13 @@ 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 4180 "GalleryConnector.c" +#line 4445 "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); @@ -4219,11 +4486,13 @@ 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 4192 "GalleryConnector.c" +#line 4459 "GalleryConnector.c" } -GType publishing_gallery3_get_albums_transaction_get_type (void) { +GType +publishing_gallery3_get_albums_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_get_albums_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_get_albums_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GetAlbumsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_get_albums_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GetAlbumsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_get_albums_transaction_instance_init, NULL }; @@ -4235,95 +4504,83 @@ GType publishing_gallery3_get_albums_transaction_get_type (void) { } -static void _vala_JsonNode_free (JsonNode* self) { +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 4211 "GalleryConnector.c" +#line 4482 "GalleryConnector.c" } -PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, PublishingGallery3Session* session, const gchar* tag_name) { +PublishingGallery3GalleryGetTagTransaction* +publishing_gallery3_gallery_get_tag_transaction_construct (GType object_type, + PublishingGallery3Session* session, + const gchar* tag_name) +{ PublishingGallery3GalleryGetTagTransaction* self = NULL; - 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" g_return_val_if_fail (tag_name != NULL, NULL); #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp1_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:389: Not authenticated"); -#line 4231 "GalleryConnector.c" +#line 4500 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_; + JsonGenerator* _tmp0_; JsonNode* root_node = NULL; - JsonNode* _tmp3_; + JsonNode* _tmp1_; JsonObject* obj = NULL; - JsonObject* _tmp4_; - PublishingGallery3Session* _tmp5_; - PublishingGallery3Session* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - PublishingGallery3Session* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; + JsonObject* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; gsize entity_length = 0UL; gchar* entity_value = NULL; - gsize _tmp13_ = 0UL; - gchar* _tmp14_; + gsize _tmp7_ = 0UL; + gchar* _tmp8_; #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = json_generator_new (); + _tmp0_ = json_generator_new (); #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity = _tmp2_; + entity = _tmp0_; #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = json_node_new (JSON_NODE_OBJECT); + _tmp1_ = json_node_new (JSON_NODE_OBJECT); #line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - root_node = _tmp3_; + root_node = _tmp1_; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = json_object_new (); + _tmp2_ = json_object_new (); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - obj = _tmp4_; + obj = _tmp2_; #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = session; + _tmp3_ = publishing_gallery3_session_get_url (session); #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = session; -#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_gallery3_session_get_url (_tmp6_); -#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); + self = (PublishingGallery3GalleryGetTagTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/tags", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = session; + _tmp5_ = publishing_gallery3_session_get_key (session); #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_session_get_key (_tmp9_); -#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = _tmp10_; + _tmp6_ = _tmp5_; #line 399 "/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-Key", _tmp11_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_); #line 400 "/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", "POST"); #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = tag_name; -#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "name", _tmp12_); + json_object_set_string_member (obj, "name", tag_name); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_node_set_object (root_node, obj); #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_generator_set_root (entity, root_node); #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = json_generator_to_data (entity, &_tmp13_); + _tmp8_ = json_generator_to_data (entity, &_tmp7_); #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity_length = _tmp13_; + entity_length = _tmp7_; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity_value = _tmp14_; + entity_value = _tmp8_; #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:409: created entity: %s", entity_value); #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4336,22 +4593,27 @@ 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 4309 "GalleryConnector.c" +#line 4566 "GalleryConnector.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4313 "GalleryConnector.c" +#line 4570 "GalleryConnector.c" } -PublishingGallery3GalleryGetTagTransaction* publishing_gallery3_gallery_get_tag_transaction_new (PublishingGallery3Session* session, const gchar* tag_name) { +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 4320 "GalleryConnector.c" +#line 4580 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self) { +gchar* +publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGallery3GalleryGetTagTransaction* self) +{ gchar* result = NULL; JsonNode* root_node = NULL; gchar* url = NULL; @@ -4361,7 +4623,7 @@ gchar* publishing_gallery3_gallery_get_tag_transaction_tag_url (PublishingGaller 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 4334 "GalleryConnector.c" +#line 4596 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; JsonNode* _tmp1_; @@ -4373,7 +4635,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 4346 "GalleryConnector.c" +#line 4608 "GalleryConnector.c" goto __catch2_spit_publishing_publishing_error; } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4384,11 +4646,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 4357 "GalleryConnector.c" +#line 4619 "GalleryConnector.c" } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4361 "GalleryConnector.c" +#line 4623 "GalleryConnector.c" } goto __finally2; __catch2_spit_publishing_publishing_error: @@ -4402,7 +4664,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 4375 "GalleryConnector.c" +#line 4637 "GalleryConnector.c" } __finally2: #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4415,7 +4677,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 4388 "GalleryConnector.c" +#line 4650 "GalleryConnector.c" } #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -4431,22 +4693,28 @@ 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 4404 "GalleryConnector.c" +#line 4666 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_tag_transaction_class_init (PublishingGallery3GalleryGetTagTransactionClass * klass) { +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 4411 "GalleryConnector.c" +#line 4675 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self) { +static void +publishing_gallery3_gallery_get_tag_transaction_instance_init (PublishingGallery3GalleryGetTagTransaction * self) +{ } -GType publishing_gallery3_gallery_get_tag_transaction_get_type (void) { +GType +publishing_gallery3_gallery_get_tag_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_get_tag_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_get_tag_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetTagTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_tag_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetTagTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_tag_transaction_instance_init, NULL }; @@ -4458,34 +4726,37 @@ 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* +publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_construct (GType object_type, + PublishingGallery3Session* session, + const gchar* item_url) +{ PublishingGallery3GalleryGetItemTagsURLsTransaction* self = 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" g_return_val_if_fail (item_url != NULL, NULL); #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = item_url; -#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); + self = (PublishingGallery3GalleryGetItemTagsURLsTransaction*) publishing_gallery3_gallery_request_transaction_construct (object_type, session, item_url, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4447 "GalleryConnector.c" +#line 4713 "GalleryConnector.c" } -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_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 4454 "GalleryConnector.c" +#line 4723 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self) { +gchar* +publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_item_tags_path (PublishingGallery3GalleryGetItemTagsURLsTransaction* self) +{ gchar* result = NULL; JsonNode* root_node = NULL; JsonObject* relationships = NULL; @@ -4500,7 +4771,7 @@ 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 4473 "GalleryConnector.c" +#line 4744 "GalleryConnector.c" JsonNode* _tmp3_; JsonObject* _tmp4_; JsonObject* _tmp5_; @@ -4522,7 +4793,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 4495 "GalleryConnector.c" +#line 4766 "GalleryConnector.c" goto __catch3_spit_publishing_publishing_error; } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4531,11 +4802,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 4504 "GalleryConnector.c" +#line 4775 "GalleryConnector.c" } #line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp1_; -#line 4508 "GalleryConnector.c" +#line 4779 "GalleryConnector.c" } goto __finally3; __catch3_spit_publishing_publishing_error: @@ -4549,7 +4820,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 4522 "GalleryConnector.c" +#line 4793 "GalleryConnector.c" } __finally3: #line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4560,7 +4831,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 4533 "GalleryConnector.c" +#line 4804 "GalleryConnector.c" } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = root_node; @@ -4594,7 +4865,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 4567 "GalleryConnector.c" +#line 4838 "GalleryConnector.c" } #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp13_ = self->priv->item_tags_path; @@ -4604,22 +4875,26 @@ 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 4577 "GalleryConnector.c" +#line 4848 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass) { +static void +publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init (PublishingGallery3GalleryGetItemTagsURLsTransactionClass * klass) +{ #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_parent_class = g_type_class_peek_parent (klass); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 4588 "GalleryConnector.c" +#line 4861 "GalleryConnector.c" } -static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) { +static void +publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init (PublishingGallery3GalleryGetItemTagsURLsTransaction * self) +{ 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); @@ -4627,11 +4902,13 @@ static void publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance _tmp0_ = g_strdup (""); #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->item_tags_path = _tmp0_; -#line 4600 "GalleryConnector.c" +#line 4875 "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); @@ -4639,11 +4916,13 @@ 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 4612 "GalleryConnector.c" +#line 4889 "GalleryConnector.c" } -GType publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) { +GType +publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryGetItemTagsURLsTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryGetItemTagsURLsTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_get_item_tags_ur_ls_transaction_instance_init, NULL }; @@ -4655,10 +4934,14 @@ 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* +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_; - 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" @@ -4668,87 +4951,65 @@ PublishingGallery3GallerySetTagRelationshipTransaction* publishing_gallery3_gall #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (item_url != NULL, NULL); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp1_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:489: Not authenticated"); -#line 4648 "GalleryConnector.c" +#line 4927 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_; + JsonGenerator* _tmp0_; JsonNode* root_node = NULL; - JsonNode* _tmp3_; + JsonNode* _tmp1_; JsonObject* obj = 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_; + JsonObject* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; gsize entity_length = 0UL; gchar* entity_value = NULL; - gsize _tmp15_ = 0UL; - gchar* _tmp16_; + gsize _tmp7_ = 0UL; + gchar* _tmp8_; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = json_generator_new (); + _tmp0_ = json_generator_new (); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity = _tmp2_; + entity = _tmp0_; #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = json_node_new (JSON_NODE_OBJECT); + _tmp1_ = json_node_new (JSON_NODE_OBJECT); #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - root_node = _tmp3_; + root_node = _tmp1_; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = json_object_new (); + _tmp2_ = json_object_new (); #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - obj = _tmp4_; -#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = session; + obj = _tmp2_; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = session; + _tmp3_ = publishing_gallery3_session_get_url (session); #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_gallery3_session_get_url (_tmp6_); -#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; -#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = item_tags_path; + _tmp4_ = _tmp3_; #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, _tmp9_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); + self = (PublishingGallery3GallerySetTagRelationshipTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, item_tags_path, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = session; + _tmp5_ = publishing_gallery3_session_get_key (session); #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_gallery3_session_get_key (_tmp10_); -#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = _tmp11_; + _tmp6_ = _tmp5_; #line 499 "/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-Key", _tmp12_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_); #line 500 "/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", "POST"); #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = tag_url; -#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "tag", _tmp13_); + json_object_set_string_member (obj, "tag", tag_url); #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = item_url; -#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "item", _tmp14_); + json_object_set_string_member (obj, "item", item_url); #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_node_set_object (root_node, obj); #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_generator_set_root (entity, root_node); #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = json_generator_to_data (entity, &_tmp15_); + _tmp8_ = json_generator_to_data (entity, &_tmp7_); #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity_length = _tmp15_; + entity_length = _tmp7_; #line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity_value = _tmp16_; + entity_value = _tmp8_; #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:510: created entity: %s", entity_value); #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4761,33 +5022,44 @@ 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 4734 "GalleryConnector.c" +#line 4995 "GalleryConnector.c" } #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4738 "GalleryConnector.c" +#line 4999 "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) { +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 4745 "GalleryConnector.c" +#line 5011 "GalleryConnector.c" } -static void publishing_gallery3_gallery_set_tag_relationship_transaction_class_init (PublishingGallery3GallerySetTagRelationshipTransactionClass * klass) { +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 4752 "GalleryConnector.c" +#line 5020 "GalleryConnector.c" } -static void publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self) { +static void +publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init (PublishingGallery3GallerySetTagRelationshipTransaction * self) +{ } -GType publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) { +GType +publishing_gallery3_gallery_set_tag_relationship_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_set_tag_relationship_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GallerySetTagRelationshipTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GallerySetTagRelationshipTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_set_tag_relationship_transaction_instance_init, NULL }; @@ -4799,124 +5071,101 @@ 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* +publishing_gallery3_gallery_album_create_transaction_construct (GType object_type, + PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters) +{ PublishingGallery3GalleryAlbumCreateTransaction* self = NULL; - 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" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL); #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp1_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:533: Not authenticated"); -#line 4788 "GalleryConnector.c" +#line 5058 "GalleryConnector.c" } else { JsonGenerator* entity = NULL; - JsonGenerator* _tmp2_; + JsonGenerator* _tmp0_; JsonNode* root_node = NULL; - JsonNode* _tmp3_; + JsonNode* _tmp1_; JsonObject* obj = NULL; - JsonObject* _tmp4_; - PublishingGallery3Session* _tmp5_; - PublishingGallery3Session* _tmp6_; + JsonObject* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; const gchar* _tmp7_; const gchar* _tmp8_; - PublishingGallery3Session* _tmp9_; + gchar* _tmp9_; const gchar* _tmp10_; const gchar* _tmp11_; - PublishingGallery3Session* _tmp12_; + const gchar* _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_; + gchar* _tmp14_; #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = json_generator_new (); + _tmp0_ = json_generator_new (); #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity = _tmp2_; + entity = _tmp0_; #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = json_node_new (JSON_NODE_OBJECT); + _tmp1_ = json_node_new (JSON_NODE_OBJECT); #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - root_node = _tmp3_; + root_node = _tmp1_; #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = json_object_new (); + _tmp2_ = json_object_new (); #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - obj = _tmp4_; + obj = _tmp2_; #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = session; + _tmp3_ = publishing_gallery3_session_get_url (session); #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = session; -#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_gallery3_session_get_url (_tmp6_); -#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; + _tmp4_ = _tmp3_; #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, _tmp5_, _tmp8_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); + self = (PublishingGallery3GalleryAlbumCreateTransaction*) publishing_gallery3_base_gallery_transaction_construct (object_type, session, _tmp4_, "/item/1", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = session; + _tmp5_ = publishing_gallery3_session_get_key (session); #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_session_get_key (_tmp9_); -#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = _tmp10_; + _tmp6_ = _tmp5_; #line 542 "/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-Key", _tmp11_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp6_); #line 543 "/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", "POST"); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = session; -#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = publishing_gallery3_session_get_url (_tmp12_); + _tmp7_ = publishing_gallery3_session_get_url (session); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = g_strdup (_tmp14_); + _tmp9_ = g_strdup (_tmp8_); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->session_url); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->session_url = _tmp15_; -#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = parameters; + self->priv->session_url = _tmp9_; #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_album_create_transaction_set_parameters (self, _tmp16_); + publishing_gallery3_gallery_album_create_transaction_set_parameters (self, parameters); #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = parameters; + _tmp10_ = publishing_gallery3_publishing_parameters_get_album_name (parameters); #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp17_); -#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp11_ = _tmp10_; #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "name", _tmp19_); + json_object_set_string_member (obj, "name", _tmp11_); #line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_object_set_string_member (obj, "type", "album"); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = parameters; + _tmp12_ = publishing_gallery3_publishing_parameters_get_album_title (parameters); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = publishing_gallery3_publishing_parameters_get_album_title (_tmp20_); -#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _tmp21_; + _tmp13_ = _tmp12_; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "title", _tmp22_); + json_object_set_string_member (obj, "title", _tmp13_); #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_node_set_object (root_node, obj); #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_generator_set_root (entity, root_node); #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = json_generator_to_data (entity, NULL); + _tmp14_ = json_generator_to_data (entity, NULL); #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - entity_value = _tmp23_; + entity_value = _tmp14_; #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:556: created entity: %s", entity_value); #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4929,22 +5178,27 @@ 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 4902 "GalleryConnector.c" +#line 5151 "GalleryConnector.c" } #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 4906 "GalleryConnector.c" +#line 5155 "GalleryConnector.c" } -PublishingGallery3GalleryAlbumCreateTransaction* publishing_gallery3_gallery_album_create_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters) { +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 4913 "GalleryConnector.c" +#line 5165 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self) { +gchar* +publishing_gallery3_gallery_album_create_transaction_get_new_album_path (PublishingGallery3GalleryAlbumCreateTransaction* self) +{ gchar* result = NULL; JsonNode* root_node = NULL; gchar* new_path = NULL; @@ -4956,7 +5210,7 @@ gchar* publishing_gallery3_gallery_album_create_transaction_get_new_album_path ( 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 4929 "GalleryConnector.c" +#line 5183 "GalleryConnector.c" { JsonNode* _tmp0_ = NULL; JsonNode* _tmp1_; @@ -4968,7 +5222,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 4941 "GalleryConnector.c" +#line 5195 "GalleryConnector.c" goto __catch4_spit_publishing_publishing_error; } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -4979,11 +5233,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 4952 "GalleryConnector.c" +#line 5206 "GalleryConnector.c" } #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" root_node = _tmp0_; -#line 4956 "GalleryConnector.c" +#line 5210 "GalleryConnector.c" } goto __finally4; __catch4_spit_publishing_publishing_error: @@ -4997,7 +5251,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 4970 "GalleryConnector.c" +#line 5224 "GalleryConnector.c" } __finally4: #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5010,7 +5264,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 4983 "GalleryConnector.c" +#line 5237 "GalleryConnector.c" } #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = json_node_get_object (root_node); @@ -5034,11 +5288,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 5007 "GalleryConnector.c" +#line 5261 "GalleryConnector.c" } -PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) { +PublishingGallery3PublishingParameters* +publishing_gallery3_gallery_album_create_transaction_get_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self) +{ PublishingGallery3PublishingParameters* result; PublishingGallery3PublishingParameters* _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5049,53 +5305,61 @@ PublishingGallery3PublishingParameters* publishing_gallery3_gallery_album_create result = _tmp0_; #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5022 "GalleryConnector.c" +#line 5278 "GalleryConnector.c" } -static gpointer _publishing_gallery3_publishing_parameters_ref0 (gpointer self) { +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 5029 "GalleryConnector.c" +#line 5287 "GalleryConnector.c" } -static void publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, PublishingGallery3PublishingParameters* value) { +static void +publishing_gallery3_gallery_album_create_transaction_set_parameters (PublishingGallery3GalleryAlbumCreateTransaction* self, + PublishingGallery3PublishingParameters* value) +{ 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" - _tmp0_ = value; -#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp0_); + _tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (value); #line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _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 5046 "GalleryConnector.c" + self->priv->_parameters = _tmp0_; +#line 5304 "GalleryConnector.c" } -static void publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass) { +static void +publishing_gallery3_gallery_album_create_transaction_class_init (PublishingGallery3GalleryAlbumCreateTransactionClass * klass) +{ #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_album_create_transaction_parent_class = g_type_class_peek_parent (klass); #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 5057 "GalleryConnector.c" +#line 5317 "GalleryConnector.c" } -static void publishing_gallery3_gallery_album_create_transaction_instance_init (PublishingGallery3GalleryAlbumCreateTransaction * self) { +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 5064 "GalleryConnector.c" +#line 5326 "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); @@ -5105,11 +5369,13 @@ 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 5078 "GalleryConnector.c" +#line 5342 "GalleryConnector.c" } -GType publishing_gallery3_gallery_album_create_transaction_get_type (void) { +GType +publishing_gallery3_gallery_album_create_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_album_create_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_album_create_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryAlbumCreateTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_album_create_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryAlbumCreateTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_album_create_transaction_instance_init, NULL }; @@ -5121,86 +5387,81 @@ GType publishing_gallery3_gallery_album_create_transaction_get_type (void) { } -static gpointer _publishing_rest_support_session_ref0 (gpointer self) { +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 5097 "GalleryConnector.c" +#line 5365 "GalleryConnector.c" } -static void _g_free0_ (gpointer var) { +static void +_g_free0_ (gpointer var) +{ #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" var = (g_free (var), NULL); -#line 5104 "GalleryConnector.c" +#line 5374 "GalleryConnector.c" } -PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_construct (GType object_type, PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { +PublishingGallery3GalleryUploadTransaction* +publishing_gallery3_gallery_upload_transaction_construct (GType object_type, + PublishingGallery3Session* session, + PublishingGallery3PublishingParameters* parameters, + SpitPublishingPublishable* publishable) +{ PublishingGallery3GalleryUploadTransaction* self = NULL; - PublishingGallery3PublishingParameters* _tmp0_; + const gchar* _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* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + PublishingGallery3PublishingParameters* _tmp12_; + PublishingGallery3Session* _tmp13_; + const gchar* _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_; - GEqualFunc _tmp27_; - GHashTable* _tmp28_; + GHashFunc _tmp16_; + GEqualFunc _tmp17_; + GHashTable* _tmp18_; gchar* title = NULL; - SpitPublishingPublishable* _tmp29_; - gchar* _tmp30_; + gchar* _tmp19_; gchar* filename = NULL; - SpitPublishingPublishable* _tmp31_; + gchar* _tmp20_; + gboolean _tmp21_ = FALSE; + const gchar* _tmp22_; + GHashTable* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + GHashTable* _tmp31_; gchar* _tmp32_; - gboolean _tmp33_ = FALSE; - 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* _tmp33_; + GHashTable* _tmp34_; + JsonGenerator* _tmp35_; gchar* desc = NULL; - SpitPublishingPublishable* _tmp48_; - gchar* _tmp49_; - const gchar* _tmp50_ = NULL; - SpitPublishingPublishable* _tmp51_; - SpitPublishingPublisherMediaType _tmp52_; + gchar* _tmp36_; + const gchar* _tmp37_ = NULL; gchar* type = NULL; - gchar* _tmp53_; + gchar* _tmp38_; JsonNode* root_node = NULL; - JsonNode* _tmp54_; + JsonNode* _tmp39_; JsonObject* obj = NULL; - JsonObject* _tmp55_; - const gchar* _tmp56_; - const gchar* _tmp57_; - const gchar* _tmp58_; - JsonGenerator* _tmp59_; - JsonGenerator* _tmp60_; - gchar* _tmp61_; - gchar* _tmp62_; + JsonObject* _tmp40_; + const gchar* _tmp41_; + const gchar* _tmp42_; + const gchar* _tmp43_; + JsonGenerator* _tmp44_; + JsonGenerator* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; #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" @@ -5208,229 +5469,198 @@ PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_t #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = parameters; + _tmp0_ = publishing_gallery3_publishing_parameters_get_album_path (parameters); #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp0_); -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = _tmp1_; -#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = string_get (_tmp2_, (glong) 0); + _tmp1_ = _tmp0_; #line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp3_ != '/') { -#line 5190 "GalleryConnector.c" - PublishingGallery3PublishingParameters* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; + if (string_get (_tmp1_, (glong) 0) != '/') { +#line 5447 "GalleryConnector.c" + const gchar* _tmp2_; + const gchar* _tmp3_; #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" - _tmp4_ = parameters; + _tmp2_ = publishing_gallery3_publishing_parameters_get_album_path (parameters); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp4_); + _tmp3_ = _tmp2_; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = _tmp5_; -#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_error ("GalleryConnector.vala:602: %s", _tmp6_); -#line 5204 "GalleryConnector.c" + g_error ("GalleryConnector.vala:602: %s", _tmp3_); +#line 5458 "GalleryConnector.c" } #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = session; -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishable; -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = session; + _tmp4_ = publishing_gallery3_session_get_url (session); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_session_get_url (_tmp9_); + _tmp5_ = _tmp4_; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = _tmp10_; -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = g_strconcat (_tmp11_, PUBLISHING_GALLERY3_REST_PATH, NULL); -#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = _tmp12_; + _tmp6_ = g_strconcat (_tmp5_, PUBLISHING_GALLERY3_REST_PATH, NULL); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = parameters; + _tmp7_ = _tmp6_; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp14_); + _tmp8_ = publishing_gallery3_publishing_parameters_get_album_path (parameters); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = _tmp15_; + _tmp9_ = _tmp8_; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL); + _tmp10_ = g_strconcat (_tmp7_, _tmp9_, NULL); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _tmp17_; + _tmp11_ = _tmp10_; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp8_, _tmp18_); + self = (PublishingGallery3GalleryUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishable, _tmp11_); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp11_); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp13_); -#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = parameters; + _g_free0 (_tmp7_); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp19_); + _tmp12_ = _publishing_gallery3_publishing_parameters_ref0 (parameters); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters); #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->parameters = _tmp20_; + self->priv->parameters = _tmp12_; #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = session; -#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _publishing_rest_support_session_ref0 (_tmp21_); + _tmp13_ = _publishing_rest_support_session_ref0 (session); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_session_unref0 (self->priv->session); #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->session = _tmp22_; -#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = session; + self->priv->session = _tmp13_; #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = publishing_gallery3_session_get_key (_tmp23_); + _tmp14_ = publishing_gallery3_session_get_key (session); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = _tmp24_; + _tmp15_ = _tmp14_; #line 611 "/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-Key", _tmp25_); + publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "X-Gallery-Request-Key", _tmp15_); #line 612 "/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", "POST"); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = g_str_hash; + _tmp16_ = g_str_hash; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = g_str_equal; + _tmp17_ = g_str_equal; #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = g_hash_table_new_full (_tmp26_, _tmp27_, _g_free0_, _g_free0_); + _tmp18_ = g_hash_table_new_full (_tmp16_, _tmp17_, _g_free0_, _g_free0_); #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - disposition_table = _tmp28_; -#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = publishable; + disposition_table = _tmp18_; #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = spit_publishing_publishable_get_publishing_name (_tmp29_); + _tmp19_ = spit_publishing_publishable_get_publishing_name (publishable); #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - title = _tmp30_; + title = _tmp19_; #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = publishable; + _tmp20_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - filename = _tmp32_; + filename = _tmp20_; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = title; + _tmp22_ = title; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp34_ == NULL) { + if (_tmp22_ == NULL) { #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = TRUE; -#line 5288 "GalleryConnector.c" + _tmp21_ = TRUE; +#line 5524 "GalleryConnector.c" } else { - const gchar* _tmp35_; + const gchar* _tmp23_; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = title; + _tmp23_ = title; #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = g_strcmp0 (_tmp35_, "") == 0; -#line 5295 "GalleryConnector.c" + _tmp21_ = g_strcmp0 (_tmp23_, "") == 0; +#line 5531 "GalleryConnector.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp33_) { -#line 5299 "GalleryConnector.c" - const gchar* _tmp36_; - gchar* _tmp37_; + if (_tmp21_) { +#line 5535 "GalleryConnector.c" + const gchar* _tmp24_; + gchar* _tmp25_; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = filename; + _tmp24_ = filename; #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = g_strdup (_tmp36_); + _tmp25_ = g_strdup (_tmp24_); #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (title); #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - title = _tmp37_; -#line 5310 "GalleryConnector.c" + title = _tmp25_; +#line 5546 "GalleryConnector.c" } #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = disposition_table; + _tmp26_ = disposition_table; #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = g_strdup ("filename"); + _tmp27_ = g_strdup ("filename"); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = filename; + _tmp28_ = filename; #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = string_to_string (_tmp40_); + _tmp29_ = string_to_string (_tmp28_); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = g_strdup (_tmp41_); + _tmp30_ = g_strdup (_tmp29_); #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_hash_table_insert (_tmp38_, _tmp39_, _tmp42_); + g_hash_table_insert (_tmp26_, _tmp27_, _tmp30_); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp43_ = disposition_table; + _tmp31_ = disposition_table; #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp44_ = g_strdup ("name"); + _tmp32_ = g_strdup ("name"); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = g_strdup ("file"); + _tmp33_ = g_strdup ("file"); #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_hash_table_insert (_tmp43_, _tmp44_, _tmp45_); + g_hash_table_insert (_tmp31_, _tmp32_, _tmp33_); #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = disposition_table; + _tmp34_ = disposition_table; #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp46_); + publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp34_); #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = json_generator_new (); + _tmp35_ = json_generator_new (); #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->generator); #line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->generator = _tmp47_; + self->priv->generator = _tmp35_; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = publishable; + _tmp36_ = spit_publishing_publishable_get_param_string (publishable, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = spit_publishing_publishable_get_param_string (_tmp48_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT); -#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - desc = _tmp49_; -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp51_ = publishable; + desc = _tmp36_; #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = spit_publishing_publishable_get_media_type (_tmp51_); -#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp52_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { + if (spit_publishing_publishable_get_media_type (publishable) == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = "movie"; -#line 5356 "GalleryConnector.c" + _tmp37_ = "movie"; +#line 5586 "GalleryConnector.c" } else { #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = "photo"; -#line 5360 "GalleryConnector.c" + _tmp37_ = "photo"; +#line 5590 "GalleryConnector.c" } #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = g_strdup (_tmp50_); + _tmp38_ = g_strdup (_tmp37_); #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - type = _tmp53_; + type = _tmp38_; #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = json_node_new (JSON_NODE_OBJECT); + _tmp39_ = json_node_new (JSON_NODE_OBJECT); #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - root_node = _tmp54_; + root_node = _tmp39_; #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = json_object_new (); + _tmp40_ = json_object_new (); #line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - obj = _tmp55_; + obj = _tmp40_; #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = filename; + _tmp41_ = filename; #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "name", _tmp56_); + json_object_set_string_member (obj, "name", _tmp41_); #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_object_set_string_member (obj, "type", type); #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = title; + _tmp42_ = title; #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "title", _tmp57_); + json_object_set_string_member (obj, "title", _tmp42_); #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = desc; + _tmp43_ = desc; #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_object_set_string_member (obj, "description", _tmp58_); + json_object_set_string_member (obj, "description", _tmp43_); #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" json_node_set_object (root_node, obj); #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = self->priv->generator; + _tmp44_ = self->priv->generator; #line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - json_generator_set_root (_tmp59_, root_node); + json_generator_set_root (_tmp44_, root_node); #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp60_ = self->priv->generator; + _tmp45_ = self->priv->generator; #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp61_ = json_generator_to_data (_tmp60_, NULL); + _tmp46_ = json_generator_to_data (_tmp45_, NULL); #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = _tmp61_; + _tmp47_ = _tmp46_; #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp62_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "entity", _tmp47_); #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp47_); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _json_object_unref0 (obj); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5447,18 +5677,24 @@ 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 5420 "GalleryConnector.c" +#line 5650 "GalleryConnector.c" } -PublishingGallery3GalleryUploadTransaction* publishing_gallery3_gallery_upload_transaction_new (PublishingGallery3Session* session, PublishingGallery3PublishingParameters* parameters, SpitPublishingPublishable* publishable) { +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 5427 "GalleryConnector.c" +#line 5661 "GalleryConnector.c" } -static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self) { +static gchar* +publishing_gallery3_gallery_upload_transaction_get_new_item_url (PublishingGallery3GalleryUploadTransaction* self) +{ gchar* result = NULL; gchar* json_object = NULL; gchar* new_url = NULL; @@ -5472,11 +5708,10 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P JsonParser* _tmp14_; JsonNode* _tmp15_; JsonNode* _tmp16_; - gboolean _tmp17_; - JsonNode* _tmp19_; - JsonObject* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; + JsonNode* _tmp18_; + JsonObject* _tmp19_; + const gchar* _tmp20_; + gchar* _tmp21_; 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); @@ -5496,7 +5731,7 @@ 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 5469 "GalleryConnector.c" +#line 5704 "GalleryConnector.c" } else { const gchar* _tmp4_; gint _tmp5_; @@ -5509,11 +5744,11 @@ 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 5482 "GalleryConnector.c" +#line 5717 "GalleryConnector.c" } #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp2_) { -#line 5486 "GalleryConnector.c" +#line 5721 "GalleryConnector.c" gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; @@ -5537,13 +5772,13 @@ 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 5510 "GalleryConnector.c" +#line 5745 "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 5516 "GalleryConnector.c" +#line 5751 "GalleryConnector.c" { JsonParser* _tmp11_; const gchar* _tmp12_; @@ -5555,7 +5790,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 5528 "GalleryConnector.c" +#line 5763 "GalleryConnector.c" goto __catch5_g_error; } } @@ -5578,7 +5813,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 5551 "GalleryConnector.c" +#line 5786 "GalleryConnector.c" } __finally5: #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5595,7 +5830,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 5568 "GalleryConnector.c" +#line 5803 "GalleryConnector.c" } #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp14_ = parser; @@ -5606,18 +5841,16 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_url (P #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp16_ = root_node; #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = json_node_is_null (_tmp16_); -#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp17_) { -#line 5582 "GalleryConnector.c" - gchar* _tmp18_; + if (json_node_is_null (_tmp16_)) { +#line 5815 "GalleryConnector.c" + gchar* _tmp17_; #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"); #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = g_strdup (""); + _tmp17_ = g_strdup (""); #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp18_; + result = _tmp17_; #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (parser); #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5626,20 +5859,20 @@ 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 5598 "GalleryConnector.c" +#line 5831 "GalleryConnector.c" } #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = root_node; + _tmp18_ = root_node; #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = json_node_get_object (_tmp19_); + _tmp19_ = json_node_get_object (_tmp18_); #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = json_object_get_string_member (_tmp20_, "url"); + _tmp20_ = json_object_get_string_member (_tmp19_, "url"); #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp21_ = g_strdup (_tmp20_); #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_url); #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - new_url = _tmp22_; + new_url = _tmp21_; #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" result = new_url; #line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5648,21 +5881,24 @@ 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 5620 "GalleryConnector.c" +#line 5853 "GalleryConnector.c" } -static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationship (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag_url, GError** error) { +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_; PublishingGallery3Session* _tmp1_; const gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + PublishingGallery3GallerySetTagRelationshipTransaction* _tmp4_; PublishingGallery3GallerySetTagRelationshipTransaction* _tmp5_; - PublishingGallery3GallerySetTagRelationshipTransaction* _tmp6_; + gchar* _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)); @@ -5675,17 +5911,15 @@ static void publishing_gallery3_gallery_upload_transaction_do_set_tag_relationsh #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = self->priv->item_tags_path; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = tag_url; + _tmp3_ = self->priv->item_url; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = self->priv->item_url; + _tmp4_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, tag_url, _tmp3_); #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = publishing_gallery3_gallery_set_tag_relationship_transaction_new (_tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_session_unref0 (_tmp1_); #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - tag_txn = _tmp6_; + tag_txn = _tmp5_; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5698,7 +5932,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 5670 "GalleryConnector.c" +#line 5904 "GalleryConnector.c" } else { #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); @@ -5708,24 +5942,26 @@ 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 5680 "GalleryConnector.c" +#line 5914 "GalleryConnector.c" } } #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp6_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (tag_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp8_); + g_debug ("GalleryConnector.vala:699: Response from setting tag relationship: %s", _tmp7_); #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp8_); + _g_free0 (_tmp7_); #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); -#line 5693 "GalleryConnector.c" +#line 5927 "GalleryConnector.c" } -static gchar* publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) { +static gchar* +publishing_gallery3_gallery_upload_transaction_get_new_item_tags_path (PublishingGallery3GalleryUploadTransaction* self) +{ gchar* result = NULL; PublishingGallery3GalleryGetItemTagsURLsTransaction* tag_urls_txn = NULL; PublishingRESTSupportSession* _tmp0_; @@ -5752,7 +5988,7 @@ 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 5724 "GalleryConnector.c" +#line 5960 "GalleryConnector.c" { PublishingGallery3GalleryGetItemTagsURLsTransaction* _tmp5_; #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5763,7 +5999,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 5735 "GalleryConnector.c" +#line 5971 "GalleryConnector.c" goto __catch6_spit_publishing_publishing_error; } #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5774,7 +6010,7 @@ 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 5746 "GalleryConnector.c" +#line 5982 "GalleryConnector.c" } } goto __finally6; @@ -5804,7 +6040,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 5776 "GalleryConnector.c" +#line 6012 "GalleryConnector.c" } __finally6: #line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5817,7 +6053,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 5789 "GalleryConnector.c" +#line 6025 "GalleryConnector.c" } #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = tag_urls_txn; @@ -5829,20 +6065,22 @@ 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 5801 "GalleryConnector.c" +#line 6037 "GalleryConnector.c" } -static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, const gchar* tag) { +static gchar* +publishing_gallery3_gallery_upload_transaction_get_tag_url (PublishingGallery3GalleryUploadTransaction* self, + const gchar* tag) +{ gchar* result = NULL; PublishingGallery3GalleryGetTagTransaction* tag_txn = NULL; PublishingRESTSupportSession* _tmp0_; PublishingGallery3Session* _tmp1_; - const gchar* _tmp2_; + PublishingGallery3GalleryGetTagTransaction* _tmp2_; PublishingGallery3GalleryGetTagTransaction* _tmp3_; - PublishingGallery3GalleryGetTagTransaction* _tmp4_; - PublishingGallery3GalleryGetTagTransaction* _tmp9_; - gchar* _tmp10_; + PublishingGallery3GalleryGetTagTransaction* _tmp8_; + gchar* _tmp9_; 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); @@ -5853,27 +6091,25 @@ static gchar* publishing_gallery3_gallery_upload_transaction_get_tag_url (Publis #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = tag; -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, _tmp2_); + _tmp2_ = publishing_gallery3_gallery_get_tag_transaction_new (_tmp1_, tag); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_session_unref0 (_tmp1_); #line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - tag_txn = _tmp4_; -#line 5834 "GalleryConnector.c" + tag_txn = _tmp3_; +#line 6070 "GalleryConnector.c" { - PublishingGallery3GalleryGetTagTransaction* _tmp5_; + PublishingGallery3GalleryGetTagTransaction* _tmp4_; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = tag_txn; + _tmp4_ = tag_txn; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); + publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 5845 "GalleryConnector.c" +#line 6081 "GalleryConnector.c" goto __catch7_spit_publishing_publishing_error; } #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5884,37 +6120,37 @@ 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 5856 "GalleryConnector.c" +#line 6092 "GalleryConnector.c" } } goto __finally7; __catch7_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; + GError* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; #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" _inner_error_ = NULL; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = err; + _tmp5_ = err; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp6_->message; + _tmp6_ = _tmp5_->message; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp7_); + g_debug ("GalleryConnector.vala:728: Problem getting the tags URL: %s", _tmp6_); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = g_strdup (""); + _tmp7_ = g_strdup (""); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp8_; + result = _tmp7_; #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5886 "GalleryConnector.c" +#line 6122 "GalleryConnector.c" } __finally7: #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -5927,30 +6163,35 @@ 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 5899 "GalleryConnector.c" +#line 6135 "GalleryConnector.c" } #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = tag_txn; + _tmp8_ = tag_txn; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp9_); + _tmp9_ = publishing_gallery3_gallery_get_tag_transaction_tag_url (_tmp8_); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp10_; + result = _tmp9_; #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (tag_txn); #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 5911 "GalleryConnector.c" +#line 6147 "GalleryConnector.c" } -static gpointer _g_error_copy0 (gpointer self) { +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 5918 "GalleryConnector.c" +#line 6156 "GalleryConnector.c" } -static void publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, GError** error) { +static void +publishing_gallery3_gallery_upload_transaction_on_upload_completed (PublishingGallery3GalleryUploadTransaction* self, + GError** error) +{ PublishingGallery3PublishingParameters* _tmp0_; gboolean _tmp1_; gboolean _tmp2_; @@ -5967,7 +6208,7 @@ 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 5939 "GalleryConnector.c" +#line 6180 "GalleryConnector.c" gchar** keywords = NULL; gint keywords_length1 = 0; gint _keywords_size_ = 0; @@ -6012,7 +6253,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 5984 "GalleryConnector.c" +#line 6225 "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); @@ -6048,18 +6289,18 @@ 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 6020 "GalleryConnector.c" +#line 6261 "GalleryConnector.c" } else { 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 6027 "GalleryConnector.c" +#line 6268 "GalleryConnector.c" } #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp13_) { -#line 6031 "GalleryConnector.c" +#line 6272 "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"); @@ -6073,7 +6314,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 6045 "GalleryConnector.c" +#line 6286 "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); @@ -6083,14 +6324,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 6055 "GalleryConnector.c" +#line 6296 "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 6062 "GalleryConnector.c" +#line 6303 "GalleryConnector.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -6102,14 +6343,14 @@ 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 6074 "GalleryConnector.c" +#line 6315 "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 6081 "GalleryConnector.c" +#line 6322 "GalleryConnector.c" { const gchar* _tmp19_; const gchar* _tmp20_; @@ -6136,7 +6377,7 @@ 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 6108 "GalleryConnector.c" +#line 6349 "GalleryConnector.c" { const gchar* _tmp25_; #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6147,7 +6388,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 6119 "GalleryConnector.c" +#line 6360 "GalleryConnector.c" goto __catch8_spit_publishing_publishing_error; } #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6162,7 +6403,7 @@ 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 6134 "GalleryConnector.c" +#line 6375 "GalleryConnector.c" } } goto __finally8; @@ -6191,7 +6432,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 6163 "GalleryConnector.c" +#line 6404 "GalleryConnector.c" goto __finally8; } __finally8: @@ -6209,7 +6450,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 6181 "GalleryConnector.c" +#line 6422 "GalleryConnector.c" } else { #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (new_tag_url); @@ -6223,25 +6464,28 @@ 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 6195 "GalleryConnector.c" +#line 6436 "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 6202 "GalleryConnector.c" +#line 6443 "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 6208 "GalleryConnector.c" +#line 6449 "GalleryConnector.c" } } -static void publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) { +static void +publishing_gallery3_gallery_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, + GError** error) +{ PublishingGallery3GalleryUploadTransaction * self; GError * _inner_error_ = NULL; #line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6256,7 +6500,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 6228 "GalleryConnector.c" +#line 6472 "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); @@ -6264,7 +6508,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 6236 "GalleryConnector.c" +#line 6480 "GalleryConnector.c" } } #line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6277,7 +6521,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 6249 "GalleryConnector.c" +#line 6493 "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); @@ -6285,13 +6529,15 @@ 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 6257 "GalleryConnector.c" +#line 6501 "GalleryConnector.c" } } } -static void publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass) { +static void +publishing_gallery3_gallery_upload_transaction_class_init (PublishingGallery3GalleryUploadTransactionClass * klass) +{ #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_upload_transaction_parent_class = g_type_class_peek_parent (klass); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -6300,18 +6546,22 @@ static void publishing_gallery3_gallery_upload_transaction_class_init (Publishin 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 6272 "GalleryConnector.c" +#line 6518 "GalleryConnector.c" } -static void publishing_gallery3_gallery_upload_transaction_instance_init (PublishingGallery3GalleryUploadTransaction * self) { +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 6279 "GalleryConnector.c" +#line 6527 "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); @@ -6329,11 +6579,13 @@ 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 6301 "GalleryConnector.c" +#line 6551 "GalleryConnector.c" } -GType publishing_gallery3_gallery_upload_transaction_get_type (void) { +GType +publishing_gallery3_gallery_upload_transaction_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_upload_transaction_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_upload_transaction_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryUploadTransaction), 0, (GInstanceInitFunc) publishing_gallery3_gallery_upload_transaction_instance_init, NULL }; @@ -6345,11 +6597,13 @@ GType publishing_gallery3_gallery_upload_transaction_get_type (void) { } -PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) { +PublishingGallery3GalleryPublisher* +publishing_gallery3_gallery_publisher_construct (GType object_type, + SpitPublishingService* service, + SpitPublishingPluginHost* host) +{ PublishingGallery3GalleryPublisher * self = NULL; - SpitPublishingService* _tmp0_; - SpitPublishingPluginHost* _tmp1_; - PublishingGallery3Session* _tmp2_; + PublishingGallery3Session* _tmp0_; #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,33 +6611,34 @@ PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_constr #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = (PublishingGallery3GalleryPublisher*) g_object_new (object_type, NULL); #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = service; -#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->service = _tmp0_; -#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = host; + self->priv->service = service; #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->host = _tmp1_; + self->priv->host = host; #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = publishing_gallery3_session_new (); + _tmp0_ = publishing_gallery3_session_new (); #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_session_unref0 (self->priv->session); #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->session = _tmp2_; + self->priv->session = _tmp0_; #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 6344 "GalleryConnector.c" +#line 6594 "GalleryConnector.c" } -PublishingGallery3GalleryPublisher* publishing_gallery3_gallery_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { +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 6351 "GalleryConnector.c" +#line 6604 "GalleryConnector.c" } -static gboolean publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) { +static gboolean +publishing_gallery3_gallery_publisher_real_is_running (SpitPublishingPublisher* base) +{ PublishingGallery3GalleryPublisher * self; gboolean result = FALSE; gboolean _tmp0_; @@ -6395,11 +6650,13 @@ 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 6367 "GalleryConnector.c" +#line 6622 "GalleryConnector.c" } -static SpitPublishingService* publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) { +static SpitPublishingService* +publishing_gallery3_gallery_publisher_real_get_service (SpitPublishingPublisher* base) +{ PublishingGallery3GalleryPublisher * self; SpitPublishingService* result = NULL; SpitPublishingService* _tmp0_; @@ -6414,156 +6671,157 @@ 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 6386 "GalleryConnector.c" +#line 6643 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) { +static void +publishing_gallery3_gallery_publisher_real_start (SpitPublishingPublisher* base) +{ PublishingGallery3GalleryPublisher * self; - gboolean _tmp0_; - SpitPublishingPluginHost* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_; + SpitPublishingPluginHost* _tmp0_; + gchar* _tmp1_; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; #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" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp0_) { + if (spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 6405 "GalleryConnector.c" +#line 6661 "GalleryConnector.c" } #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = self->priv->host; + _tmp0_ = self->priv->host; #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp1_ == NULL) { + if (_tmp0_ == 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 6413 "GalleryConnector.c" +#line 6669 "GalleryConnector.c" } #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:837: GalleryPublisher: starting interaction."); #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->running = TRUE; #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = publishing_gallery3_gallery_publisher_get_api_key (self); + _tmp1_ = publishing_gallery3_gallery_publisher_get_api_key (self); #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->key); #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->key = _tmp2_; + self->priv->key = _tmp1_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = self->priv->key; + _tmp3_ = self->priv->key; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (NULL == _tmp4_) { + if (NULL == _tmp3_) { #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = TRUE; -#line 6431 "GalleryConnector.c" + _tmp2_ = TRUE; +#line 6687 "GalleryConnector.c" } else { - const gchar* _tmp5_; + const gchar* _tmp4_; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->key; + _tmp4_ = self->priv->key; #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = g_strcmp0 ("", _tmp5_) == 0; -#line 6438 "GalleryConnector.c" + _tmp2_ = g_strcmp0 ("", _tmp4_) == 0; +#line 6694 "GalleryConnector.c" } #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp3_) { + if (_tmp2_) { #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6444 "GalleryConnector.c" +#line 6700 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp6_; + gchar* _tmp5_; gchar* username = NULL; - gchar* _tmp7_; + gchar* _tmp6_; + gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - const gchar* _tmp10_; + const gchar* _tmp9_; #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); + _tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url = _tmp6_; + url = _tmp5_; #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); + _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - username = _tmp7_; + username = _tmp6_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = username; + _tmp9_ = username; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (NULL == _tmp10_) { + if (NULL == _tmp9_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = TRUE; -#line 6467 "GalleryConnector.c" + _tmp8_ = TRUE; +#line 6723 "GalleryConnector.c" } else { - const gchar* _tmp11_; + const gchar* _tmp10_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = self->priv->key; + _tmp10_ = self->priv->key; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = NULL == _tmp11_; -#line 6474 "GalleryConnector.c" + _tmp8_ = NULL == _tmp10_; +#line 6730 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp9_) { + if (_tmp8_) { #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = TRUE; -#line 6480 "GalleryConnector.c" + _tmp7_ = TRUE; +#line 6736 "GalleryConnector.c" } else { - const gchar* _tmp12_; + const gchar* _tmp11_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = url; + _tmp11_ = url; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = NULL == _tmp12_; -#line 6487 "GalleryConnector.c" + _tmp7_ = NULL == _tmp11_; +#line 6743 "GalleryConnector.c" } #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp8_) { + if (_tmp7_) { #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 6493 "GalleryConnector.c" +#line 6749 "GalleryConnector.c" } else { + const gchar* _tmp12_; const gchar* _tmp13_; - const gchar* _tmp14_; - SpitPublishingPluginHost* _tmp15_; - PublishingGallery3Session* _tmp16_; + SpitPublishingPluginHost* _tmp14_; + PublishingGallery3Session* _tmp15_; + const gchar* _tmp16_; const gchar* _tmp17_; const gchar* _tmp18_; - const gchar* _tmp19_; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = username; + _tmp12_ = username; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = url; + _tmp13_ = url; #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp13_, _tmp14_); + g_debug ("ACTION: attempting network login for user " "'%s' at URL '%s' from saved credentials.", _tmp12_, _tmp13_); #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = self->priv->host; + _tmp14_ = self->priv->host; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp15_); + spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp14_); #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = self->priv->session; + _tmp15_ = self->priv->session; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = url; + _tmp16_ = url; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = username; + _tmp17_ = username; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = self->priv->key; + _tmp18_ = self->priv->key; #line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_authenticate (_tmp16_, _tmp17_, _tmp18_, _tmp19_); + publishing_gallery3_session_authenticate (_tmp15_, _tmp16_, _tmp17_, _tmp18_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_album_urls (self); -#line 6524 "GalleryConnector.c" +#line 6780 "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 6530 "GalleryConnector.c" +#line 6786 "GalleryConnector.c" } } -static void publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base) { +static void +publishing_gallery3_gallery_publisher_real_stop (SpitPublishingPublisher* base) +{ PublishingGallery3GalleryPublisher * self; #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GALLERY3_TYPE_GALLERY_PUBLISHER, PublishingGallery3GalleryPublisher); @@ -6571,11 +6829,13 @@ 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 6543 "GalleryConnector.c" +#line 6801 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) { +gchar* +publishing_gallery3_gallery_publisher_get_api_key (PublishingGallery3GalleryPublisher* self) +{ gchar* result = NULL; SpitPublishingPluginHost* _tmp0_; gchar* _tmp1_; @@ -6589,13 +6849,15 @@ 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 6561 "GalleryConnector.c" +#line 6821 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, const gchar* key) { +void +publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3GalleryPublisher* self, + const gchar* key) +{ 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" @@ -6603,14 +6865,14 @@ void publishing_gallery3_gallery_publisher_set_api_key (PublishingGallery3Galler #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->host; #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6578 "GalleryConnector.c" + spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "api-key", key); +#line 6838 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) { +gchar* +publishing_gallery3_gallery_publisher_get_gallery_url (PublishingGallery3GalleryPublisher* self) +{ gchar* result = NULL; SpitPublishingPluginHost* _tmp0_; gchar* _tmp1_; @@ -6624,13 +6886,15 @@ 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 6596 "GalleryConnector.c" +#line 6858 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, const gchar* url) { +void +publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3GalleryPublisher* self, + const gchar* url) +{ 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" @@ -6638,14 +6902,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_url (PublishingGallery3Ga #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->host; #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6613 "GalleryConnector.c" + spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", url); +#line 6875 "GalleryConnector.c" } -gchar* publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) { +gchar* +publishing_gallery3_gallery_publisher_get_gallery_username (PublishingGallery3GalleryPublisher* self) +{ gchar* result = NULL; SpitPublishingPluginHost* _tmp0_; gchar* _tmp1_; @@ -6659,13 +6923,15 @@ 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 6631 "GalleryConnector.c" +#line 6895 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, const gchar* username) { +void +publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGallery3GalleryPublisher* self, + const gchar* username) +{ 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" @@ -6673,14 +6939,14 @@ void publishing_gallery3_gallery_publisher_set_gallery_username (PublishingGalle #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->host; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6648 "GalleryConnector.c" + spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", username); +#line 6912 "GalleryConnector.c" } -static gboolean* _bool_dup (gboolean* self) { +static gboolean* +_bool_dup (gboolean* self) +{ gboolean* dup; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dup = g_new0 (gboolean, 1); @@ -6688,18 +6954,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 6660 "GalleryConnector.c" +#line 6926 "GalleryConnector.c" } -static gpointer __bool_dup0 (gpointer self) { +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 6667 "GalleryConnector.c" +#line 6935 "GalleryConnector.c" } -gboolean* publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) { +gboolean* +publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self) +{ gboolean* result = NULL; SpitPublishingPluginHost* _tmp0_; gboolean _tmp1_; @@ -6716,26 +6986,28 @@ 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 6688 "GalleryConnector.c" +#line 6958 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, gboolean strip_metadata) { +void +publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (PublishingGallery3GalleryPublisher* self, + gboolean strip_metadata) +{ 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" _tmp0_ = self->priv->host; #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6703 "GalleryConnector.c" + spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", strip_metadata); +#line 6973 "GalleryConnector.c" } -static gint* _int_dup (gint* self) { +static gint* +_int_dup (gint* self) +{ gint* dup; #line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dup = g_new0 (gint, 1); @@ -6743,18 +7015,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 6715 "GalleryConnector.c" +#line 6987 "GalleryConnector.c" } -static gpointer __int_dup0 (gpointer self) { +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 6722 "GalleryConnector.c" +#line 6996 "GalleryConnector.c" } -gint* publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) { +gint* +publishing_gallery3_gallery_publisher_get_scaling_constraint_id (PublishingGallery3GalleryPublisher* self) +{ gint* result = NULL; SpitPublishingPluginHost* _tmp0_; gint _tmp1_; @@ -6771,26 +7047,28 @@ 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 6743 "GalleryConnector.c" +#line 7019 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, gint constraint) { +void +publishing_gallery3_gallery_publisher_set_scaling_constraint_id (PublishingGallery3GalleryPublisher* self, + gint constraint) +{ 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" _tmp0_ = self->priv->host; #line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6758 "GalleryConnector.c" + spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-constraint-id", constraint); +#line 7034 "GalleryConnector.c" } -gint* publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) { +gint* +publishing_gallery3_gallery_publisher_get_scaling_pixels (PublishingGallery3GalleryPublisher* self) +{ gint* result = NULL; SpitPublishingPluginHost* _tmp0_; gint _tmp1_; @@ -6807,33 +7085,37 @@ 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 6779 "GalleryConnector.c" +#line 7057 "GalleryConnector.c" } -void publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, gint pixels) { +void +publishing_gallery3_gallery_publisher_set_scaling_pixels (PublishingGallery3GalleryPublisher* self, + gint pixels) +{ 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" _tmp0_ = self->priv->host; #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 6794 "GalleryConnector.c" + spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "scaling-pixels", pixels); +#line 7072 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) { +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 6801 "GalleryConnector.c" +#line 7081 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) { +static void +publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (PublishingGallery3GalleryPublisher* self) +{ SpitPublishingPluginHost* _tmp0_; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_GALLERY_PUBLISHER (self)); @@ -6843,124 +7125,138 @@ 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 6815 "GalleryConnector.c" +#line 7097 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back (PublishingGallery3CredentialsPane* _sender, gpointer self) { +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 6822 "GalleryConnector.c" +#line 7107 "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) { +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 6829 "GalleryConnector.c" +#line 7121 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, PublishingGallery3CredentialsPaneMode mode) { - PublishingGallery3CredentialsPaneMode _tmp0_; +static void +publishing_gallery3_gallery_publisher_do_show_credentials_pane (PublishingGallery3GalleryPublisher* self, + PublishingGallery3CredentialsPaneMode mode) +{ + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - PublishingGallery3Session* _tmp3_; + PublishingGallery3Session* _tmp2_; PublishingGallery3CredentialsPane* creds_pane = NULL; - SpitPublishingPluginHost* _tmp4_; - PublishingGallery3CredentialsPaneMode _tmp5_; + SpitPublishingPluginHost* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - PublishingGallery3CredentialsPane* _tmp12_; - PublishingGallery3CredentialsPane* _tmp13_; - SpitPublishingPluginHost* _tmp14_; + PublishingGallery3CredentialsPane* _tmp10_; + PublishingGallery3CredentialsPane* _tmp11_; + SpitPublishingPluginHost* _tmp12_; #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" - _tmp0_ = mode; -#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_gallery3_credentials_pane_mode_to_string (_tmp0_); + _tmp0_ = publishing_gallery3_credentials_pane_mode_to_string (mode); #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:933: ACTION: showing credentials capture pane in" \ -" %s mode.", _tmp2_); +" %s mode.", _tmp1_); #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = self->priv->session; + _tmp2_ = self->priv->session; #line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_deauthenticate (_tmp3_); + publishing_gallery3_session_deauthenticate (_tmp2_); +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + _tmp3_ = self->priv->host; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = self->priv->host; + _tmp4_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = mode; + _tmp5_ = _tmp4_; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); + _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp7_ = _tmp6_; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); + _tmp8_ = publishing_gallery3_gallery_publisher_get_api_key (self); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = _tmp8_; #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_gallery_publisher_get_api_key (self); + _tmp10_ = publishing_gallery3_credentials_pane_new (_tmp3_, mode, _tmp5_, _tmp7_, _tmp9_); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp11_ = _tmp10_; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = publishing_gallery3_credentials_pane_new (_tmp4_, _tmp5_, _tmp7_, _tmp9_, _tmp11_); -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = _tmp12_; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp11_); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp9_); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp7_); #line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - creds_pane = _tmp13_; + _g_free0 (_tmp5_); +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + creds_pane = _tmp11_; #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (creds_pane, "go-back", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_go_back_publishing_gallery3_credentials_pane_go_back, self, 0); #line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_connect_object (creds_pane, "login", (GCallback) _publishing_gallery3_gallery_publisher_on_credentials_login_publishing_gallery3_credentials_pane_login, self, 0); #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = self->priv->host; + _tmp12_ = self->priv->host; #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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); + spit_publishing_plugin_host_install_dialog_pane (_tmp12_, 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 6904 "GalleryConnector.c" +#line 7193 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { +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 6911 "GalleryConnector.c" +#line 7204 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { +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 6918 "GalleryConnector.c" +#line 7214 "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_; - const gchar* _tmp1_; - SpitPublishingPluginHost* _tmp2_; +static void +publishing_gallery3_gallery_publisher_do_network_login (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username, + const gchar* password) +{ + SpitPublishingPluginHost* _tmp0_; PublishingGallery3KeyFetchTransaction* fetch_trans = NULL; - PublishingGallery3Session* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - PublishingGallery3KeyFetchTransaction* _tmp7_; + PublishingGallery3Session* _tmp1_; + PublishingGallery3KeyFetchTransaction* _tmp2_; 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)); @@ -6971,32 +7267,22 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (password != NULL); #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = username; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = url; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", _tmp0_, _tmp1_); + g_debug ("ACTION: attempting network login for user '%s' at URL " "'%s'.", username, url); #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = self->priv->host; + _tmp0_ = self->priv->host; #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_install_login_wait_pane (_tmp2_); -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = self->priv->session; + spit_publishing_plugin_host_install_login_wait_pane (_tmp0_); #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = url; -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = username; -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = password; + _tmp1_ = self->priv->session; #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = publishing_gallery3_key_fetch_transaction_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_); + _tmp2_ = publishing_gallery3_key_fetch_transaction_new (_tmp1_, url, username, password); #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - fetch_trans = _tmp7_; + fetch_trans = _tmp2_; #line 956 "/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), "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 6967 "GalleryConnector.c" +#line 7253 "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_); @@ -7004,7 +7290,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 6975 "GalleryConnector.c" +#line 7261 "GalleryConnector.c" goto __catch9_spit_publishing_publishing_error; } #line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7015,14 +7301,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 6986 "GalleryConnector.c" +#line 7272 "GalleryConnector.c" } } goto __finally9; __catch9_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp8_; + GError* _tmp3_; #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" @@ -7030,12 +7316,12 @@ static void publishing_gallery3_gallery_publisher_do_network_login (PublishingGa #line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:962: Caught an error attempting to login"); #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = err; + _tmp3_ = err; #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp8_); + publishing_gallery3_gallery_publisher_on_key_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (fetch_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7006 "GalleryConnector.c" +#line 7292 "GalleryConnector.c" } __finally9: #line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7048,29 +7334,38 @@ 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 7019 "GalleryConnector.c" +#line 7305 "GalleryConnector.c" } #line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (fetch_trans); -#line 7023 "GalleryConnector.c" +#line 7309 "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) { +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 7030 "GalleryConnector.c" +#line 7320 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { +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 7037 "GalleryConnector.c" +#line 7330 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) { +static void +publishing_gallery3_gallery_publisher_do_fetch_album_urls (PublishingGallery3GalleryPublisher* self) +{ SpitPublishingPluginHost* _tmp0_; PublishingGallery3GetAlbumURLsTransaction* album_trans = NULL; PublishingGallery3Session* _tmp1_; @@ -7092,7 +7387,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 7063 "GalleryConnector.c" +#line 7358 "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_); @@ -7100,7 +7395,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 7071 "GalleryConnector.c" +#line 7366 "GalleryConnector.c" goto __catch10_spit_publishing_publishing_error; } #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7111,7 +7406,7 @@ 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 7082 "GalleryConnector.c" +#line 7377 "GalleryConnector.c" } } goto __finally10; @@ -7131,7 +7426,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 7102 "GalleryConnector.c" +#line 7397 "GalleryConnector.c" } __finally10: #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7144,55 +7439,58 @@ 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 7115 "GalleryConnector.c" +#line 7410 "GalleryConnector.c" } #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7119 "GalleryConnector.c" +#line 7414 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { +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 7126 "GalleryConnector.c" +#line 7425 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { +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 7133 "GalleryConnector.c" +#line 7435 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_fetch_albums (PublishingGallery3GalleryPublisher* self, gchar** album_urls, int album_urls_length1, guint start) { +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_; - gchar** _tmp1_; - gint _tmp1__length1; - guint _tmp2_; - PublishingGallery3GetAlbumsTransaction* _tmp3_; + PublishingGallery3GetAlbumsTransaction* _tmp1_; 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)); #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->session; #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = album_urls; -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1__length1 = album_urls_length1; -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = start; -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_); + _tmp1_ = publishing_gallery3_get_albums_transaction_new (_tmp0_, album_urls, album_urls_length1, start); #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_trans = _tmp3_; + album_trans = _tmp1_; #line 993 "/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), "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 7163 "GalleryConnector.c" +#line 7461 "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_); @@ -7200,7 +7498,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 7171 "GalleryConnector.c" +#line 7469 "GalleryConnector.c" goto __catch11_spit_publishing_publishing_error; } #line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7211,25 +7509,25 @@ 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 7182 "GalleryConnector.c" +#line 7480 "GalleryConnector.c" } } goto __finally11; __catch11_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp4_; + GError* _tmp2_; #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" _inner_error_ = NULL; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = err; + _tmp2_ = err; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp4_); + publishing_gallery3_gallery_publisher_on_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_); #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7200 "GalleryConnector.c" +#line 7498 "GalleryConnector.c" } __finally11: #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7242,48 +7540,57 @@ 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 7213 "GalleryConnector.c" +#line 7511 "GalleryConnector.c" } #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7217 "GalleryConnector.c" +#line 7515 "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) { +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 7224 "GalleryConnector.c" +#line 7526 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout (PublishingGallery3PublishingOptionsPane* _sender, gpointer self) { +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 7231 "GalleryConnector.c" +#line 7536 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username) { +static void +publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username) +{ GtkBuilder* builder = NULL; GtkBuilder* _tmp0_; SpitPublishingPluginHost* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - PublishingGallery3Album** _tmp12_; - gint _tmp12__length1; - GtkBuilder* _tmp13_; - gboolean* _tmp14_; - gboolean* _tmp15_; + PublishingGallery3Album** _tmp10_; + gint _tmp10__length1; + GtkBuilder* _tmp11_; + gboolean* _tmp12_; + gboolean* _tmp13_; + gint* _tmp14_; + gint* _tmp15_; gint* _tmp16_; gint* _tmp17_; - gint* _tmp18_; - gint* _tmp19_; + PublishingGallery3PublishingOptionsPane* _tmp18_; + PublishingGallery3PublishingOptionsPane* _tmp19_; PublishingGallery3PublishingOptionsPane* _tmp20_; - PublishingGallery3PublishingOptionsPane* _tmp21_; + SpitPublishingPluginHost* _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)); @@ -7297,7 +7604,7 @@ 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 7268 "GalleryConnector.c" +#line 7575 "GalleryConnector.c" { GtkBuilder* _tmp1_; #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7306,7 +7613,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan 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 7277 "GalleryConnector.c" +#line 7584 "GalleryConnector.c" goto __catch12_g_error; } } @@ -7354,7 +7661,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan _g_object_unref0 (builder); #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7324 "GalleryConnector.c" +#line 7631 "GalleryConnector.c" } __finally12: #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7367,83 +7674,88 @@ 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 7337 "GalleryConnector.c" +#line 7644 "GalleryConnector.c" } #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp9_ = self->priv->host; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = url; + _tmp10_ = self->priv->albums; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = username; + _tmp10__length1 = self->priv->albums_length1; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = self->priv->albums; + _tmp11_ = builder; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12__length1 = self->priv->albums_length1; + _tmp12_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = builder; + _tmp13_ = _tmp12_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = publishing_gallery3_gallery_publisher_get_persistent_strip_metadata (self); + _tmp14_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp15_ = _tmp14_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_constraint_id (self); + _tmp16_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp17_ = _tmp16_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_gallery_publisher_get_scaling_pixels (self); -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp12__length1, _tmp13_, *_tmp15_, *_tmp17_, *_tmp19_); + _tmp18_ = publishing_gallery3_publishing_options_pane_new (_tmp9_, url, username, _tmp10_, _tmp10__length1, _tmp11_, *_tmp13_, *_tmp15_, *_tmp17_); #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 = _tmp20_; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp19_); + self->priv->publishing_options_pane = _tmp18_; #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp17_); #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (_tmp15_); +#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" + _g_free0 (_tmp13_); #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = self->priv->publishing_options_pane; + _tmp19_ = self->priv->publishing_options_pane; #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp21_, "publish", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish_publishing_gallery3_publishing_options_pane_publish, self, 0); + g_signal_connect_object (_tmp19_, "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" - _tmp22_ = self->priv->publishing_options_pane; + _tmp20_ = self->priv->publishing_options_pane; #line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp22_, "logout", (GCallback) _publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self, 0); + g_signal_connect_object (_tmp20_, "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" - _tmp23_ = self->priv->host; + _tmp21_ = self->priv->host; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = self->priv->publishing_options_pane; + _tmp22_ = self->priv->publishing_options_pane; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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); + spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, 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 7391 "GalleryConnector.c" +#line 7694 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { +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 7398 "GalleryConnector.c" +#line 7705 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { +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 7405 "GalleryConnector.c" +#line 7715 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { +static void +publishing_gallery3_gallery_publisher_do_create_album (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters) +{ PublishingGallery3GalleryAlbumCreateTransaction* album_trans = NULL; PublishingGallery3Session* _tmp0_; - PublishingGallery3PublishingParameters* _tmp1_; - PublishingGallery3GalleryAlbumCreateTransaction* _tmp2_; + PublishingGallery3GalleryAlbumCreateTransaction* _tmp1_; 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)); @@ -7454,16 +7766,14 @@ static void publishing_gallery3_gallery_publisher_do_create_album (PublishingGal #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = self->priv->session; #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = parameters; + _tmp1_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, parameters); #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = publishing_gallery3_gallery_album_create_transaction_new (_tmp0_, _tmp1_); -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_trans = _tmp2_; + album_trans = _tmp1_; #line 1046 "/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), "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 7433 "GalleryConnector.c" +#line 7743 "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_); @@ -7471,7 +7781,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 7441 "GalleryConnector.c" +#line 7751 "GalleryConnector.c" goto __catch13_spit_publishing_publishing_error; } #line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7482,25 +7792,25 @@ 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 7452 "GalleryConnector.c" +#line 7762 "GalleryConnector.c" } } goto __finally13; __catch13_spit_publishing_publishing_error: { GError* err = NULL; - GError* _tmp3_; + GError* _tmp2_; #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" _inner_error_ = NULL; #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = err; + _tmp2_ = err; #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp3_); + publishing_gallery3_gallery_publisher_on_album_create_error (self, G_TYPE_CHECK_INSTANCE_CAST (album_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp2_); #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 7470 "GalleryConnector.c" +#line 7780 "GalleryConnector.c" } __finally13: #line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7513,71 +7823,79 @@ 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 7483 "GalleryConnector.c" +#line 7793 "GalleryConnector.c" } #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (album_trans); -#line 7487 "GalleryConnector.c" +#line 7797 "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) { +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 7494 "GalleryConnector.c" +#line 7808 "GalleryConnector.c" } -static void _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { +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 7501 "GalleryConnector.c" +#line 7819 "GalleryConnector.c" } -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_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 7508 "GalleryConnector.c" +#line 7830 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { - PublishingGallery3PublishingParameters* _tmp0_; +static void +publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters) +{ + gboolean _tmp0_; gboolean _tmp1_; - gboolean _tmp2_; - gint _tmp3_ = 0; - PublishingGallery3PublishingParameters* _tmp4_; + gint _tmp2_ = 0; + gint _tmp3_; + gint _tmp4_; gint _tmp5_; gint _tmp6_; - PublishingGallery3PublishingParameters* _tmp7_; - gint _tmp8_; + SpitPublishingPluginHost* _tmp7_; + SpitPublishingPluginHost* _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_; + gint _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; + void* _tmp13_; + GDestroyNotify _tmp14_; + SpitPublishingProgressCallback _tmp15_; PublishingGallery3Uploader* uploader = 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_; + PublishingGallery3Session* _tmp16_; + SpitPublishingPluginHost* _tmp17_; + gint _tmp18_; + SpitPublishingPublishable** _tmp19_; + SpitPublishingPublishable** _tmp20_; + gint _tmp20__length1; + PublishingGallery3Uploader* _tmp21_; + PublishingGallery3Uploader* _tmp22_; + PublishingGallery3Uploader* _tmp23_; + PublishingGallery3Uploader* _tmp24_; + PublishingGallery3Uploader* _tmp25_; #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" @@ -7585,59 +7903,49 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1061: ACTION: publishing items"); #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = parameters; -#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp0_); + _tmp0_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters); #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp2_); -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = parameters; + publishing_gallery3_gallery_publisher_set_persistent_strip_metadata (self, _tmp1_); #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp4_); + _tmp3_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters); #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp6_ <= 0) { + if (_tmp4_ <= 0) { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = 0; -#line 7572 "GalleryConnector.c" + _tmp2_ = 0; +#line 7886 "GalleryConnector.c" } else { #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = 1; -#line 7576 "GalleryConnector.c" + _tmp2_ = 1; +#line 7890 "GalleryConnector.c" } #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp3_); + publishing_gallery3_gallery_publisher_set_scaling_constraint_id (self, _tmp2_); #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = parameters; + _tmp5_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters); #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp7_); -#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp9_); + publishing_gallery3_gallery_publisher_set_scaling_pixels (self, _tmp6_); #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = self->priv->host; + _tmp7_ = self->priv->host; #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_set_service_locked (_tmp10_, TRUE); -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = self->priv->host; + spit_publishing_plugin_host_set_service_locked (_tmp7_, TRUE); #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = parameters; + _tmp8_ = self->priv->host; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (_tmp12_); + _tmp9_ = publishing_gallery3_publishing_parameters_get_photo_major_axis_size (parameters); #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = _tmp13_; -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = parameters; + _tmp10_ = _tmp9_; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_publishing_parameters_get_strip_metadata (_tmp15_); + _tmp11_ = publishing_gallery3_publishing_parameters_get_strip_metadata (parameters); #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = _tmp16_; + _tmp12_ = _tmp11_; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = spit_publishing_plugin_host_serialize_publishables (_tmp11_, _tmp14_, _tmp17_, &_tmp18_, &_tmp19_); + _tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp8_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_); #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" (self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL); #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7647,58 +7955,56 @@ static void publishing_gallery3_gallery_publisher_do_publish (PublishingGallery3 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->progress_reporter_target_destroy_notify = NULL; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->progress_reporter = _tmp20_; + self->priv->progress_reporter = _tmp15_; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->progress_reporter_target = _tmp18_; + self->priv->progress_reporter_target = _tmp13_; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->progress_reporter_target_destroy_notify = _tmp19_; + self->priv->progress_reporter_target_destroy_notify = _tmp14_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp21_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7628 "GalleryConnector.c" +#line 7934 "GalleryConnector.c" } #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = self->priv->session; -#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = self->priv->host; + _tmp16_ = self->priv->session; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = spit_publishing_plugin_host_get_publishables (_tmp23_, &_tmp24_); + _tmp17_ = self->priv->host; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = _tmp25_; + _tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_); #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26__length1 = _tmp24_; + _tmp20_ = _tmp19_; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = parameters; + _tmp20__length1 = _tmp18_; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = publishing_gallery3_uploader_new (_tmp22_, _tmp26_, _tmp24_, _tmp27_); + _tmp21_ = publishing_gallery3_uploader_new (_tmp16_, _tmp20_, _tmp18_, parameters); #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = _tmp28_; + _tmp22_ = _tmp21_; #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_object_unref), NULL); + _tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_object_unref), NULL); #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - uploader = _tmp29_; + uploader = _tmp22_; #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = uploader; + _tmp23_ = uploader; #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0); #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = uploader; + _tmp24_ = uploader; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self, 0); #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = uploader; + _tmp25_ = uploader; #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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); + publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, 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 7664 "GalleryConnector.c" +#line 7968 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) { +static void +publishing_gallery3_gallery_publisher_do_show_success_pane (PublishingGallery3GalleryPublisher* self) +{ SpitPublishingPluginHost* _tmp0_; SpitPublishingPluginHost* _tmp1_; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -7713,39 +8019,36 @@ 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 7683 "GalleryConnector.c" +#line 7989 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_service_welcome_login (PublishingGallery3GalleryPublisher* self) +{ #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" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp0_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7697 "GalleryConnector.c" +#line 8002 "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 7703 "GalleryConnector.c" +#line 8008 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, const gchar* url, const gchar* username, const gchar* password) { - gboolean _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; +static void +publishing_gallery3_gallery_publisher_on_credentials_login (PublishingGallery3GalleryPublisher* self, + const gchar* url, + const gchar* username, + const gchar* password) +{ #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" @@ -7755,619 +8058,501 @@ static void publishing_gallery3_gallery_publisher_on_credentials_login (Publishi #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (password != NULL); #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp0_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7729 "GalleryConnector.c" +#line 8030 "GalleryConnector.c" } -#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = username; #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1111: EVENT: user '%s' clicked 'Login' in creden" \ -"tials pane.", _tmp1_); +"tials pane.", username); #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = url; -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_gallery_url (self, _tmp2_); -#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = username; + publishing_gallery3_gallery_publisher_set_gallery_url (self, url); #line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_gallery_username (self, _tmp3_); + publishing_gallery3_gallery_publisher_set_gallery_username (self, username); #line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = url; -#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = username; -#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 7751 "GalleryConnector.c" + publishing_gallery3_gallery_publisher_do_network_login (self, url, username, password); +#line 8040 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) { - gboolean _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_credentials_go_back (PublishingGallery3GalleryPublisher* self) +{ #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" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp0_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7765 "GalleryConnector.c" +#line 8053 "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 7771 "GalleryConnector.c" +#line 8059 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_key_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PublishingRESTSupportTransaction* _tmp10_; - guint _tmp11_; + PublishingGallery3Session* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn)); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = bad_txn; -#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = bad_txn; + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 1132 "/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_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self); -#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7810 "GalleryConnector.c" +#line 8089 "GalleryConnector.c" } #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; + _tmp2_ = self->priv->session; #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp6_) { + if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7820 "GalleryConnector.c" +#line 8097 "GalleryConnector.c" } #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = bad_txn; -#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_); + _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn); #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp9_); + g_debug ("EVENT: network transaction to fetch key for login " "failed; response = '%s'.", _tmp4_); #line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp9_); -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = bad_txn; + _g_free0 (_tmp4_); #line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_); -#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp11_ == ((guint) 403)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 7840 "GalleryConnector.c" +#line 8111 "GalleryConnector.c" } else { - 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" - _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp13_ == ((guint) 400)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 7852 "GalleryConnector.c" +#line 8117 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_; - GError* _tmp15_; + SpitPublishingPluginHost* _tmp5_; #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; + _tmp5_ = self->priv->host; #line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 7862 "GalleryConnector.c" + spit_publishing_plugin_host_post_error (_tmp5_, err); +#line 8124 "GalleryConnector.c" } } } -static void publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_key_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; + PublishingGallery3Session* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = txn; -#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = txn; + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 1167 "/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_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self); -#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_key_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7901 "GalleryConnector.c" +#line 8155 "GalleryConnector.c" } #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; + _tmp2_ = self->priv->session; #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp6_) { + if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 7911 "GalleryConnector.c" +#line 8163 "GalleryConnector.c" } #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = txn; -#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) _tmp7_) : NULL); + _tmp3_ = publishing_gallery3_key_fetch_transaction_get_key (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_KEY_FETCH_TRANSACTION) ? ((PublishingGallery3KeyFetchTransaction*) txn) : NULL); #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->key); #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->key = _tmp8_; + self->priv->key = _tmp3_; #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = self->priv->key; + _tmp4_ = self->priv->key; #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp9_ == NULL) { + if (_tmp4_ == NULL) { #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1178: key doesn\'t exist"); -#line 7927 "GalleryConnector.c" +#line 8177 "GalleryConnector.c" } else { gchar* url = NULL; - gchar* _tmp10_; + gchar* _tmp5_; gchar* username = NULL; - gchar* _tmp11_; - const gchar* _tmp12_; - PublishingGallery3Session* _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp16_; + gchar* _tmp6_; + const gchar* _tmp7_; + PublishingGallery3Session* _tmp8_; + const gchar* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); + _tmp5_ = publishing_gallery3_gallery_publisher_get_gallery_url (self); #line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url = _tmp10_; + url = _tmp5_; #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); + _tmp6_ = publishing_gallery3_gallery_publisher_get_gallery_username (self); #line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - username = _tmp11_; + username = _tmp6_; #line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1183: %s", "EVENT: network transaction to fetch key completed " "successfully."); #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = self->priv->key; + _tmp7_ = self->priv->key; #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_set_api_key (self, _tmp12_); + publishing_gallery3_gallery_publisher_set_api_key (self, _tmp7_); #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = self->priv->session; + _tmp8_ = self->priv->session; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = url; + _tmp9_ = url; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = username; + _tmp10_ = username; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = self->priv->key; + _tmp11_ = self->priv->key; #line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_authenticate (_tmp13_, _tmp14_, _tmp15_, _tmp16_); + publishing_gallery3_session_authenticate (_tmp8_, _tmp9_, _tmp10_, _tmp11_); #line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_fetch_album_urls (self); #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (username); #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 7968 "GalleryConnector.c" +#line 8218 "GalleryConnector.c" } } -static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_urls_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PublishingRESTSupportTransaction* _tmp10_; - guint _tmp11_; + PublishingGallery3Session* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn)); #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = bad_txn; + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); -#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self); -#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = bad_txn; + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1198 "/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_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8008 "GalleryConnector.c" +#line 8249 "GalleryConnector.c" } #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; + _tmp2_ = self->priv->session; #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8018 "GalleryConnector.c" +#line 8257 "GalleryConnector.c" } #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = bad_txn; + _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn); #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_); + _tmp4_ = _tmp3_; #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; -#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp9_); + g_debug ("EVENT: network transaction to fetch album URLs " "failed; response = \'%s\'.", _tmp4_); #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp9_); -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = bad_txn; -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_); + _g_free0 (_tmp4_); #line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp11_ == ((guint) 403)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8038 "GalleryConnector.c" +#line 8271 "GalleryConnector.c" } else { - 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" - _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_); -#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp13_ == ((guint) 400)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8050 "GalleryConnector.c" +#line 8277 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_; - GError* _tmp15_; -#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = self->priv->host; + SpitPublishingPluginHost* _tmp5_; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = err; + _tmp5_ = self->priv->host; #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8060 "GalleryConnector.c" + spit_publishing_plugin_host_post_error (_tmp5_, err); +#line 8284 "GalleryConnector.c" } } } -static void publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; + PublishingGallery3Session* _tmp2_; gchar** album_urls = NULL; - PublishingRESTSupportTransaction* _tmp7_; - gint _tmp8_; - gchar** _tmp9_; + gint _tmp3_; + gchar** _tmp4_; gint album_urls_length1; gint _album_urls_size_; - gchar** _tmp10_; - gint _tmp10__length1; + gchar** _tmp5_; + gint _tmp5__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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = txn; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = txn; + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 1233 "/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_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self); -#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_urls_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8104 "GalleryConnector.c" +#line 8320 "GalleryConnector.c" } #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; -#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); + _tmp2_ = self->priv->session; #line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8114 "GalleryConnector.c" +#line 8328 "GalleryConnector.c" } #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1242: EVENT: retrieving all album URLs."); #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = txn; + _tmp4_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) txn) : NULL, &_tmp3_); #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = publishing_gallery3_get_album_ur_ls_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GET_ALBUM_UR_LS_TRANSACTION) ? ((PublishingGallery3GetAlbumURLsTransaction*) _tmp7_) : NULL, &_tmp8_); + album_urls = _tmp4_; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_urls = _tmp9_; -#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_urls_length1 = _tmp8_; + album_urls_length1 = _tmp3_; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _album_urls_size_ = album_urls_length1; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = album_urls; + _tmp5_ = album_urls; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10__length1 = album_urls_length1; + _tmp5__length1 = album_urls_length1; #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (NULL == _tmp10_) { -#line 8134 "GalleryConnector.c" + if (NULL == _tmp5_) { +#line 8346 "GalleryConnector.c" gchar* url = NULL; - PublishingGallery3Session* _tmp11_; - const gchar* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; + PublishingGallery3Session* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + gchar* _tmp9_; gchar* username = NULL; - PublishingGallery3Session* _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - gchar* _tmp18_; - const gchar* _tmp19_; - const gchar* _tmp20_; + PublishingGallery3Session* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = self->priv->session; + _tmp6_ = self->priv->session; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = publishing_gallery3_session_get_url (_tmp11_); + _tmp7_ = publishing_gallery3_session_get_url (_tmp6_); #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = g_strdup (_tmp13_); + _tmp9_ = g_strdup (_tmp8_); #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url = _tmp14_; + url = _tmp9_; #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = self->priv->session; + _tmp10_ = self->priv->session; #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_session_get_username (_tmp15_); + _tmp11_ = publishing_gallery3_session_get_username (_tmp10_); #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = _tmp16_; + _tmp12_ = _tmp11_; #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp13_ = g_strdup (_tmp12_); #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - username = _tmp18_; + username = _tmp13_; #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = url; + _tmp14_ = url; #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = username; + _tmp15_ = username; #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp19_, _tmp20_); + publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp14_, _tmp15_); #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (username); #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8177 "GalleryConnector.c" +#line 8389 "GalleryConnector.c" } else { - gchar** _tmp21_; - gint _tmp21__length1; + gchar** _tmp16_; + gint _tmp16__length1; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = album_urls; + _tmp16_ = album_urls; #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21__length1 = album_urls_length1; + _tmp16__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 8187 "GalleryConnector.c" + publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp16_, _tmp16__length1, (guint) 0); +#line 8399 "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 8191 "GalleryConnector.c" +#line 8403 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_fetch_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PublishingRESTSupportTransaction* _tmp10_; - guint _tmp11_; + PublishingGallery3Session* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn)); #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = bad_txn; -#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = bad_txn; + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); -#line 1263 "/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_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self); -#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8230 "GalleryConnector.c" +#line 8433 "GalleryConnector.c" } #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; + _tmp2_ = self->priv->session; #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8240 "GalleryConnector.c" +#line 8441 "GalleryConnector.c" } #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = bad_txn; + _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn); #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_); -#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp9_); + g_debug ("EVENT: network transaction to fetch albums " "failed; response = \'%s\'.", _tmp4_); #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp9_); -#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = bad_txn; + _g_free0 (_tmp4_); #line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_); -#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp11_ == ((guint) 403)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8260 "GalleryConnector.c" +#line 8455 "GalleryConnector.c" } else { - 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" - _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp13_ == ((guint) 400)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8272 "GalleryConnector.c" +#line 8461 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_; - GError* _tmp15_; + SpitPublishingPluginHost* _tmp5_; #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; + _tmp5_ = self->priv->host; #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8282 "GalleryConnector.c" + spit_publishing_plugin_host_post_error (_tmp5_, err); +#line 8468 "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 8295 "GalleryConnector.c" +#line 8486 "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 8301 "GalleryConnector.c" +#line 8492 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_fetch_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; PublishingGallery3Album** new_albums = NULL; gint new_albums_length1; gint _new_albums_size_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp23_; - gboolean _tmp24_; - gboolean _tmp25_; + PublishingGallery3Session* _tmp2_; + gboolean _tmp17_; + gboolean _tmp18_; 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)); #line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); #line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = txn; + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self); -#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = txn; + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_complete_publishing_rest_support_transaction_completed, self); #line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1298 "/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_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_fetch_error_publishing_rest_support_transaction_network_error, self); #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" new_albums = NULL; #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8375,55 +8560,48 @@ static void publishing_gallery3_gallery_publisher_on_album_fetch_complete (Publi #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _new_albums_size_ = new_albums_length1; #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1303 "/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 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8350 "GalleryConnector.c" +#line 8533 "GalleryConnector.c" } #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; -#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); + _tmp2_ = self->priv->session; #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1307 "/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 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8362 "GalleryConnector.c" +#line 8543 "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 8366 "GalleryConnector.c" +#line 8547 "GalleryConnector.c" { - PublishingGallery3Album** _tmp7_ = NULL; - 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; + PublishingGallery3Album** _tmp3_ = NULL; + gint _tmp4_; + PublishingGallery3Album** _tmp5_; + gint _tmp3__length1; + gint __tmp3__size_; + PublishingGallery3Album** _tmp6_; + gint _tmp6__length1; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp8_) : NULL, &_tmp9_, &_inner_error_); + _tmp5_ = publishing_gallery3_get_albums_transaction_get_albums (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp4_, &_inner_error_); #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = _tmp10_; + _tmp3_ = _tmp5_; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7__length1 = _tmp9_; + _tmp3__length1 = _tmp4_; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - __tmp7__size_ = _tmp7__length1; + __tmp3__size_ = _tmp3__length1; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 8390 "GalleryConnector.c" +#line 8568 "GalleryConnector.c" goto __catch14_spit_publishing_publishing_error; } #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8434,47 +8612,44 @@ 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 8401 "GalleryConnector.c" +#line 8579 "GalleryConnector.c" } #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = _tmp7_; + _tmp6_ = _tmp3_; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11__length1 = _tmp7__length1; + _tmp6__length1 = _tmp3__length1; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = NULL; + _tmp3_ = NULL; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7__length1 = 0; + _tmp3__length1 = 0; #line 1312 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - new_albums = _tmp11_; + new_albums = _tmp6_; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - new_albums_length1 = _tmp11__length1; + new_albums_length1 = _tmp6__length1; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _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 8421 "GalleryConnector.c" + _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); +#line 8599 "GalleryConnector.c" } goto __finally14; __catch14_spit_publishing_publishing_error: { GError* err = NULL; - PublishingRESTSupportTransaction* _tmp12_; - GError* _tmp13_; + GError* _tmp7_; #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" _inner_error_ = NULL; #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = txn; -#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = err; + _tmp7_ = err; #line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_on_album_fetch_error (self, _tmp12_, _tmp13_); + publishing_gallery3_gallery_publisher_on_album_fetch_error (self, txn, _tmp7_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_error_free0 (err); -#line 8441 "GalleryConnector.c" +#line 8616 "GalleryConnector.c" } __finally14: #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -8487,626 +8662,553 @@ 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 8454 "GalleryConnector.c" +#line 8629 "GalleryConnector.c" } { gint i = 0; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 8460 "GalleryConnector.c" +#line 8635 "GalleryConnector.c" { - gboolean _tmp14_ = FALSE; + gboolean _tmp8_ = FALSE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = TRUE; + _tmp8_ = TRUE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" while (TRUE) { -#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 8642 "GalleryConnector.c" + gint _tmp10_; + PublishingGallery3Album** _tmp11_; + gint _tmp11__length1; + PublishingGallery3Album** _tmp12_; + gint _tmp12__length1; + PublishingGallery3Album** _tmp13_; + gint _tmp13__length1; + gint _tmp14_; + PublishingGallery3Album* _tmp15_; + PublishingGallery3Album* _tmp16_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp14_) { -#line 8480 "GalleryConnector.c" - gint _tmp15_; + if (!_tmp8_) { +#line 8655 "GalleryConnector.c" + gint _tmp9_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = i; + _tmp9_ = i; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - i = _tmp15_ + 1; -#line 8486 "GalleryConnector.c" + i = _tmp9_ + 1; +#line 8661 "GalleryConnector.c" } #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = FALSE; + _tmp8_ = FALSE; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = i; + _tmp10_ = i; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = new_albums; + _tmp11_ = new_albums; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17__length1 = new_albums_length1; + _tmp11__length1 = new_albums_length1; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!(_tmp16_ <= (_tmp17__length1 - 1))) { + if (!(_tmp10_ <= (_tmp11__length1 - 1))) { #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 8500 "GalleryConnector.c" +#line 8675 "GalleryConnector.c" } #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = self->priv->albums; + _tmp12_ = self->priv->albums; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18__length1 = self->priv->albums_length1; + _tmp12__length1 = self->priv->albums_length1; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = new_albums; + _tmp13_ = new_albums; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19__length1 = new_albums_length1; + _tmp13__length1 = new_albums_length1; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = i; + _tmp14_ = i; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = _tmp19_[_tmp20_]; + _tmp15_ = _tmp13_[_tmp14_]; #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _publishing_gallery3_album_ref0 (_tmp21_); + _tmp16_ = _publishing_gallery3_album_ref0 (_tmp15_); #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 8518 "GalleryConnector.c" + _vala_array_add5 (&self->priv->albums, &self->priv->albums_length1, &self->priv->_albums_size_, _tmp16_); +#line 8693 "GalleryConnector.c" } } } #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = txn; + _tmp17_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = publishing_gallery3_get_albums_transaction_get_more_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp23_) : NULL); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = _tmp24_; + _tmp18_ = _tmp17_; #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp25_) { -#line 8530 "GalleryConnector.c" - PublishingRESTSupportTransaction* _tmp26_; - gchar** _tmp27_; - gint _tmp27__length1; - gchar** _tmp28_; - gint _tmp28__length1; - PublishingRESTSupportTransaction* _tmp29_; - guint _tmp30_; - guint _tmp31_; + if (_tmp18_) { +#line 8703 "GalleryConnector.c" + gchar** _tmp19_; + gint _tmp19__length1; + gchar** _tmp20_; + gint _tmp20__length1; + guint _tmp21_; + guint _tmp22_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = txn; + _tmp19_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL, &_tmp19__length1); #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = publishing_gallery3_get_albums_transaction_get_album_urls (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp26_) : NULL, &_tmp27__length1); + _tmp20_ = _tmp19_; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = _tmp27_; + _tmp20__length1 = _tmp19__length1; #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28__length1 = _tmp27__length1; + _tmp21_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) txn) : NULL); #line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = txn; -#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = publishing_gallery3_get_albums_transaction_get_urls_sent (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, PUBLISHING_GALLERY3_TYPE_GET_ALBUMS_TRANSACTION) ? ((PublishingGallery3GetAlbumsTransaction*) _tmp29_) : NULL); -#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = _tmp30_; + _tmp22_ = _tmp21_; #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 8555 "GalleryConnector.c" + publishing_gallery3_gallery_publisher_do_fetch_albums (self, _tmp20_, _tmp20__length1, _tmp22_); +#line 8722 "GalleryConnector.c" } else { gchar* url = NULL; - PublishingGallery3Session* _tmp32_; - const gchar* _tmp33_; - const gchar* _tmp34_; - gchar* _tmp35_; + PublishingGallery3Session* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; gchar* username = NULL; - PublishingGallery3Session* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; - gchar* _tmp39_; - const gchar* _tmp40_; - const gchar* _tmp41_; + PublishingGallery3Session* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + const gchar* _tmp31_; + const gchar* _tmp32_; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = self->priv->session; + _tmp23_ = self->priv->session; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = publishing_gallery3_session_get_url (_tmp32_); + _tmp24_ = publishing_gallery3_session_get_url (_tmp23_); #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = _tmp33_; + _tmp25_ = _tmp24_; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = g_strdup (_tmp34_); + _tmp26_ = g_strdup (_tmp25_); #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - url = _tmp35_; + url = _tmp26_; #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = self->priv->session; + _tmp27_ = self->priv->session; #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = publishing_gallery3_session_get_username (_tmp36_); + _tmp28_ = publishing_gallery3_session_get_username (_tmp27_); #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = _tmp37_; + _tmp29_ = _tmp28_; #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = g_strdup (_tmp38_); + _tmp30_ = g_strdup (_tmp29_); #line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - username = _tmp39_; + username = _tmp30_; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = url; + _tmp31_ = url; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = username; + _tmp32_ = username; #line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp40_, _tmp41_); + publishing_gallery3_gallery_publisher_do_show_publishing_options_pane (self, _tmp31_, _tmp32_); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (username); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (url); -#line 8599 "GalleryConnector.c" +#line 8766 "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 8603 "GalleryConnector.c" +#line 8770 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_create_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* bad_txn, + GError* err) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - PublishingRESTSupportTransaction* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - PublishingRESTSupportTransaction* _tmp10_; - guint _tmp11_; + PublishingGallery3Session* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn)); #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = bad_txn; + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); -#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self); -#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = bad_txn; + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self); #line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1342 "/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_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self); + g_signal_handlers_disconnect_matched (bad_txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self); #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8642 "GalleryConnector.c" +#line 8800 "GalleryConnector.c" } #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; -#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); + _tmp2_ = self->priv->session; #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8652 "GalleryConnector.c" +#line 8808 "GalleryConnector.c" } #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = bad_txn; + _tmp3_ = publishing_rest_support_transaction_get_response (bad_txn); #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_); -#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp9_); + g_debug ("EVENT: network transaction to create an album " "failed; response = \'%s\'.", _tmp4_); #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp9_); -#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = bad_txn; -#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_rest_support_transaction_get_status_code (_tmp10_); + _g_free0 (_tmp4_); #line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp11_ == ((guint) 403)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8672 "GalleryConnector.c" +#line 8822 "GalleryConnector.c" } else { - 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" - _tmp13_ = publishing_rest_support_transaction_get_status_code (_tmp12_); -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp13_ == ((guint) 400)) { + if (publishing_rest_support_transaction_get_status_code (bad_txn) == ((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 8684 "GalleryConnector.c" +#line 8828 "GalleryConnector.c" } else { - SpitPublishingPluginHost* _tmp14_; - GError* _tmp15_; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = self->priv->host; + SpitPublishingPluginHost* _tmp5_; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = err; + _tmp5_ = self->priv->host; #line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_); -#line 8694 "GalleryConnector.c" + spit_publishing_plugin_host_post_error (_tmp5_, err); +#line 8835 "GalleryConnector.c" } } } -static void publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportTransaction* txn) { - PublishingRESTSupportTransaction* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_album_create_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportTransaction* txn) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportTransaction* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; + PublishingGallery3Session* _tmp2_; PublishingGallery3PublishingParameters* new_params = NULL; - PublishingRESTSupportTransaction* _tmp7_; - PublishingGallery3PublishingParameters* _tmp8_; + PublishingGallery3PublishingParameters* _tmp3_; + PublishingGallery3PublishingParameters* _tmp4_; + PublishingGallery3PublishingParameters* _tmp5_; + PublishingGallery3PublishingParameters* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; PublishingGallery3PublishingParameters* _tmp9_; - PublishingGallery3PublishingParameters* _tmp10_; - PublishingGallery3PublishingParameters* _tmp11_; - PublishingRESTSupportTransaction* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - PublishingGallery3PublishingParameters* _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - PublishingGallery3PublishingParameters* _tmp18_; + const gchar* _tmp10_; + const gchar* _tmp11_; + PublishingGallery3PublishingParameters* _tmp12_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); #line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = txn; -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); + g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE); #line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self); -#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = txn; + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_complete_publishing_rest_support_transaction_completed, self); #line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE); #line 1377 "/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_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self); + g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_album_create_error_publishing_rest_support_transaction_network_error, self); #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8743 "GalleryConnector.c" +#line 8875 "GalleryConnector.c" } #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); + _tmp2_ = self->priv->session; #line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8753 "GalleryConnector.c" +#line 8883 "GalleryConnector.c" } #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = txn; + _tmp3_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL); #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_gallery_album_create_transaction_get_parameters (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp7_) : NULL); -#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp4_ = _tmp3_; #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp9_); + _tmp5_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp4_); #line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - new_params = _tmp10_; -#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = new_params; + new_params = _tmp5_; #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = txn; + _tmp6_ = new_params; #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) _tmp12_) : NULL); + _tmp7_ = publishing_gallery3_gallery_album_create_transaction_get_new_album_path (G_TYPE_CHECK_INSTANCE_TYPE (txn, PUBLISHING_GALLERY3_TYPE_GALLERY_ALBUM_CREATE_TRANSACTION) ? ((PublishingGallery3GalleryAlbumCreateTransaction*) txn) : NULL); #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = _tmp13_; + _tmp8_ = _tmp7_; #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_album_path (_tmp11_, _tmp14_); + publishing_gallery3_publishing_parameters_set_album_path (_tmp6_, _tmp8_); #line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp8_); #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = new_params; + _tmp9_ = new_params; #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp15_); + _tmp10_ = publishing_gallery3_publishing_parameters_get_album_path (_tmp9_); #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = _tmp16_; + _tmp11_ = _tmp10_; #line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1391: EVENT: user has created an album at \"%s\"" \ -".", _tmp17_); +".", _tmp11_); #line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = new_params; + _tmp12_ = new_params; #line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_do_publish (self, _tmp18_); + publishing_gallery3_gallery_publisher_do_publish (self, _tmp12_); #line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (new_params); -#line 8791 "GalleryConnector.c" +#line 8917 "GalleryConnector.c" } -static gpointer _publishing_rest_support_batch_uploader_ref0 (gpointer self) { +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 8798 "GalleryConnector.c" +#line 8926 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* _uploader, GError* err) { - gboolean _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_publish_error (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportBatchUploader* _uploader, + GError* err) +{ PublishingGallery3Uploader* uploader = NULL; - PublishingRESTSupportBatchUploader* _tmp1_; - PublishingGallery3Uploader* _tmp2_; + PublishingGallery3Uploader* _tmp0_; GError* g3_err = NULL; - GError* _tmp3_; - GError* _tmp4_; - GError* _tmp5_; - const gchar* _tmp6_; - PublishingGallery3Uploader* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - PublishingGallery3Uploader* _tmp10_; - guint _tmp11_; + GError* _tmp1_; + const gchar* _tmp2_; + PublishingGallery3Uploader* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + PublishingGallery3Uploader* _tmp6_; + guint _tmp7_; + guint _tmp8_; + PublishingGallery3Uploader* _tmp9_; + guint _tmp10_; + PublishingGallery3Uploader* _tmp11_; guint _tmp12_; PublishingGallery3Uploader* _tmp13_; guint _tmp14_; - PublishingGallery3Uploader* _tmp15_; - guint _tmp16_; - PublishingGallery3Uploader* _tmp17_; - guint _tmp18_; - guint _tmp19_; - SpitPublishingPluginHost* _tmp36_; - GError* _tmp37_; + guint _tmp15_; + SpitPublishingPluginHost* _tmp32_; + GError* _tmp33_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (_uploader)); #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp0_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8837 "GalleryConnector.c" +#line 8963 "GalleryConnector.c" } #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _uploader; + _tmp0_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_uploader, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _uploader) : NULL); #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = _publishing_rest_support_batch_uploader_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, PUBLISHING_GALLERY3_TYPE_UPLOADER) ? ((PublishingGallery3Uploader*) _tmp1_) : NULL); -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - uploader = _tmp2_; -#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = err; + uploader = _tmp0_; #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = g_error_copy (_tmp3_); + _tmp1_ = g_error_copy (err); #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g3_err = _tmp4_; + g3_err = _tmp1_; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = err; + _tmp2_ = err->message; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = _tmp5_->message; + _tmp3_ = uploader; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = uploader; + _tmp4_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp3_); #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp7_); + _tmp5_ = _tmp4_; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; -#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = uploader; + _tmp6_ = uploader; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = publishing_gallery3_uploader_get_status_code (_tmp10_); + _tmp7_ = publishing_gallery3_uploader_get_status_code (_tmp6_); #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp6_, _tmp9_, _tmp12_); + g_debug ("EVENT: uploader reports upload error = '%s' " "for file '%s' (code %d)", _tmp2_, _tmp5_, _tmp8_); #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = uploader; + _tmp9_ = uploader; #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp14_, NULL, FALSE); + g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp10_, NULL, FALSE); #line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self); #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = uploader; + _tmp11_ = uploader; #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp16_, NULL, FALSE); + g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp12_, NULL, FALSE); #line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self); + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self); #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = uploader; + _tmp13_ = uploader; #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = publishing_gallery3_uploader_get_status_code (_tmp17_); + _tmp14_ = publishing_gallery3_uploader_get_status_code (_tmp13_); #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp15_ = _tmp14_; #line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp19_ == ((guint) 400)) { -#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_; + if (_tmp15_ == ((guint) 400)) { +#line 9009 "GalleryConnector.c" + GError* _tmp16_; + GError* _tmp17_; + const gchar* _tmp18_; + PublishingGallery3Uploader* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + PublishingGallery3Uploader* _tmp25_; + SpitPublishingPublisherMediaType _tmp26_; + SpitPublishingPublisherMediaType _tmp27_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = g3_err; + _tmp16_ = g3_err; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = g3_err; + _tmp17_ = g3_err; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = _tmp21_->message; + _tmp18_ = _tmp17_->message; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = uploader; + _tmp19_ = uploader; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp23_); + _tmp20_ = publishing_gallery3_uploader_get_current_publishable_name (_tmp19_); #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = _tmp24_; + _tmp21_ = _tmp20_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp25_); + _tmp22_ = g_strdup_printf (PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG, _tmp21_); #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = _tmp26_; + _tmp23_ = _tmp22_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = g_strconcat (_tmp22_, _tmp27_, NULL); + _tmp24_ = g_strconcat (_tmp18_, _tmp23_, NULL); #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp21_->message); + _g_free0 (_tmp17_->message); #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_->message = _tmp28_; + _tmp17_->message = _tmp24_; #line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp23_); #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = uploader; + _tmp25_ = uploader; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp29_); + _tmp26_ = publishing_gallery3_uploader_get_current_publishable_type (_tmp25_); #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp31_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 8934 "GalleryConnector.c" - GError* _tmp32_; - GError* _tmp33_; - const gchar* _tmp34_; - gchar* _tmp35_; + if (_tmp27_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { +#line 9054 "GalleryConnector.c" + GError* _tmp28_; + GError* _tmp29_; + const gchar* _tmp30_; + gchar* _tmp31_; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = g3_err; + _tmp28_ = g3_err; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = g3_err; + _tmp29_ = g3_err; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = _tmp33_->message; + _tmp30_ = _tmp29_->message; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = g_strconcat (_tmp34_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL); + _tmp31_ = g_strconcat (_tmp30_, PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG, NULL); #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp33_->message); + _g_free0 (_tmp29_->message); #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_->message = _tmp35_; -#line 8951 "GalleryConnector.c" + _tmp29_->message = _tmp31_; +#line 9071 "GalleryConnector.c" } } #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = self->priv->host; + _tmp32_ = self->priv->host; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = g3_err; + _tmp33_ = g3_err; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp36_, _tmp37_); + spit_publishing_plugin_host_post_error (_tmp32_, _tmp33_); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _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 8964 "GalleryConnector.c" +#line 9084 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, gint file_number, gdouble completed_fraction) { - gboolean _tmp0_; - gdouble _tmp1_; - SpitPublishingProgressCallback _tmp2_; - void* _tmp2__target; - SpitPublishingProgressCallback _tmp3_; - void* _tmp3__target; - gint _tmp4_; - gdouble _tmp5_; +static void +publishing_gallery3_gallery_publisher_on_upload_status_updated (PublishingGallery3GalleryPublisher* self, + gint file_number, + gdouble completed_fraction) +{ + SpitPublishingProgressCallback _tmp0_; + void* _tmp0__target; + SpitPublishingProgressCallback _tmp1_; + void* _tmp1__target; #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" - _tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp0_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 8985 "GalleryConnector.c" +#line 9103 "GalleryConnector.c" } -#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = completed_fraction; #line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1432: EVENT: uploader reports upload %.2f percen" \ -"t complete.", 100.0 * _tmp1_); +"t complete.", 100.0 * completed_fraction); #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = self->priv->progress_reporter; + _tmp0_ = self->priv->progress_reporter; #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2__target = self->priv->progress_reporter_target; + _tmp0__target = self->priv->progress_reporter_target; #line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (_tmp2_ != NULL, "progress_reporter != null"); -#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = self->priv->progress_reporter; -#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3__target = self->priv->progress_reporter_target; + _vala_assert (_tmp0_ != NULL, "progress_reporter != null"); #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = file_number; + _tmp1_ = self->priv->progress_reporter; #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = completed_fraction; + _tmp1__target = self->priv->progress_reporter_target; #line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 9007 "GalleryConnector.c" + _tmp1_ (file_number, completed_fraction, _tmp1__target); +#line 9119 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) { - PublishingRESTSupportBatchUploader* _tmp0_; +static void +publishing_gallery3_gallery_publisher_on_publish_complete (PublishingGallery3GalleryPublisher* self, + PublishingRESTSupportBatchUploader* uploader, + gint num_published) +{ + guint _tmp0_; guint _tmp1_; - PublishingRESTSupportBatchUploader* _tmp2_; - guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; - gboolean _tmp6_; - gint _tmp7_; + PublishingGallery3Session* _tmp2_; #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" g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader)); #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = uploader; + g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp0_, NULL, FALSE); #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE); -#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self); -#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = uploader; + g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_complete_publishing_rest_support_batch_uploader_upload_complete, self); #line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE); + g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE); #line 1445 "/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_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self); + g_signal_handlers_disconnect_matched (uploader, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_gallery3_gallery_publisher_on_publish_error_publishing_rest_support_batch_uploader_upload_error, self); #line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9042 "GalleryConnector.c" +#line 9147 "GalleryConnector.c" } #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; -#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); + _tmp2_ = self->priv->session; #line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp6_) { + if (!publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) { #line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9052 "GalleryConnector.c" +#line 9155 "GalleryConnector.c" } -#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = num_published; #line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_debug ("GalleryConnector.vala:1454: EVENT: publishing complete; %d items publi" \ -"shed", _tmp7_); +"shed", num_published); #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_success_pane (self); -#line 9060 "GalleryConnector.c" +#line 9161 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) { +static void +publishing_gallery3_gallery_publisher_on_publishing_options_pane_logout (PublishingGallery3GalleryPublisher* self) +{ PublishingGallery3PublishingOptionsPane* _tmp0_; guint _tmp1_; PublishingGallery3PublishingOptionsPane* _tmp2_; guint _tmp3_; - gboolean _tmp4_; - PublishingGallery3Session* _tmp5_; + PublishingGallery3Session* _tmp4_; #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" @@ -9122,33 +9224,31 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_log #line 1464 "/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_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self); #line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9091 "GalleryConnector.c" +#line 9191 "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."); #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->session; + _tmp4_ = self->priv->session; #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_deauthenticate (_tmp5_); + publishing_gallery3_session_deauthenticate (_tmp4_); #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_do_show_service_welcome_pane (self); -#line 9101 "GalleryConnector.c" +#line 9201 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, PublishingGallery3PublishingParameters* parameters) { +static void +publishing_gallery3_gallery_publisher_on_publishing_options_pane_publish (PublishingGallery3GalleryPublisher* self, + PublishingGallery3PublishingParameters* parameters) +{ 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" @@ -9166,63 +9266,52 @@ static void publishing_gallery3_gallery_publisher_on_publishing_options_pane_pub #line 1479 "/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_gallery_publisher_on_publishing_options_pane_logout_publishing_gallery3_publishing_options_pane_logout, self); #line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); -#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (!_tmp4_) { + if (!spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher))) { #line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return; -#line 9135 "GalleryConnector.c" +#line 9233 "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" \ "hing."); #line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = parameters; -#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 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; + if (publishing_gallery3_publishing_parameters_is_to_new_album (parameters)) { +#line 9239 "GalleryConnector.c" + const gchar* _tmp4_; + const gchar* _tmp5_; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = publishing_gallery3_publishing_parameters_get_album_name (_tmp7_); + _tmp4_ = publishing_gallery3_publishing_parameters_get_album_name (parameters); #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = _tmp8_; + _tmp5_ = _tmp4_; #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp9_); -#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = parameters; + g_debug ("GalleryConnector.vala:1488: EVENT: must create new album \"%s\" first.", _tmp5_); #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_gallery_publisher_do_create_album (self, _tmp10_); -#line 9162 "GalleryConnector.c" + publishing_gallery3_gallery_publisher_do_create_album (self, parameters); +#line 9250 "GalleryConnector.c" } else { - 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 9169 "GalleryConnector.c" + publishing_gallery3_gallery_publisher_do_publish (self, parameters); +#line 9254 "GalleryConnector.c" } } -static void publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass) { +static void +publishing_gallery3_gallery_publisher_class_init (PublishingGallery3GalleryPublisherClass * klass) +{ #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_gallery_publisher_parent_class = g_type_class_peek_parent (klass); #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 9181 "GalleryConnector.c" +#line 9268 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) { +static void +publishing_gallery3_gallery_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) +{ #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" @@ -9233,11 +9322,13 @@ static void publishing_gallery3_gallery_publisher_spit_publishing_publisher_inte 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 9196 "GalleryConnector.c" +#line 9285 "GalleryConnector.c" } -static void publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self) { +static void +publishing_gallery3_gallery_publisher_instance_init (PublishingGallery3GalleryPublisher * self) +{ #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_GALLERY_PUBLISHER_GET_PRIVATE (self); #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -9264,11 +9355,13 @@ 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 9227 "GalleryConnector.c" +#line 9318 "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); @@ -9290,11 +9383,13 @@ 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 9253 "GalleryConnector.c" +#line 9346 "GalleryConnector.c" } -GType publishing_gallery3_gallery_publisher_get_type (void) { +GType +publishing_gallery3_gallery_publisher_get_type (void) +{ static volatile gsize publishing_gallery3_gallery_publisher_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_gallery_publisher_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3GalleryPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_gallery_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3GalleryPublisher), 0, (GInstanceInitFunc) publishing_gallery3_gallery_publisher_instance_init, NULL }; @@ -9308,143 +9403,156 @@ GType publishing_gallery3_gallery_publisher_get_type (void) { } -static PublishingGallery3Album** _vala_array_dup3 (PublishingGallery3Album** self, int length) { +static PublishingGallery3Album** +_vala_array_dup3 (PublishingGallery3Album** self, + int length) +{ PublishingGallery3Album** result; int i; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 9278 "GalleryConnector.c" +#line 9376 "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 9284 "GalleryConnector.c" +#line 9382 "GalleryConnector.c" } #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 9288 "GalleryConnector.c" +#line 9386 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +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 9295 "GalleryConnector.c" +#line 9396 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +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 9302 "GalleryConnector.c" +#line 9406 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +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 9309 "GalleryConnector.c" +#line 9416 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { +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 9316 "GalleryConnector.c" +#line 9426 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { +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 9323 "GalleryConnector.c" +#line 9436 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +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 9330 "GalleryConnector.c" +#line 9446 "GalleryConnector.c" } -static void _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +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 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) { +#line 9456 "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_; 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_; + GtkBuilder* _tmp1_; + GSList* _tmp2_; + GSList* _tmp3_; + GObject* _tmp4_; + GtkGrid* _tmp5_; + GObject* _tmp6_; + GtkLabel* _tmp7_; + GObject* _tmp8_; + GtkRadioButton* _tmp9_; + GObject* _tmp10_; + GtkComboBoxText* _tmp11_; + GObject* _tmp12_; + GtkComboBoxText* _tmp13_; GObject* _tmp14_; - GtkLabel* _tmp15_; - GtkBuilder* _tmp16_; - GObject* _tmp17_; - GtkRadioButton* _tmp18_; - GtkBuilder* _tmp19_; - GObject* _tmp20_; - GtkComboBoxText* _tmp21_; - GtkBuilder* _tmp22_; + GtkEntry* _tmp15_; + GObject* _tmp16_; + GtkRadioButton* _tmp17_; + GObject* _tmp18_; + GtkEntry* _tmp19_; + GtkBuilder* _tmp20_; + GObject* _tmp21_; + GtkCheckButton* _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_; + GtkButton* _tmp24_; + GObject* _tmp25_; + GtkButton* _tmp26_; + GtkLabel* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + GtkCheckButton* _tmp30_; + GtkComboBoxText* _tmp31_; + GtkEntry* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + GtkRadioButton* _tmp35_; + GtkRadioButton* _tmp36_; + GtkEntry* _tmp37_; + GtkComboBoxText* _tmp38_; + GtkEntry* _tmp39_; + GtkButton* _tmp40_; + GtkButton* _tmp41_; #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" @@ -9456,430 +9564,382 @@ PublishingGallery3PublishingOptionsPane* publishing_gallery3_publishing_options_ #line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = (PublishingGallery3PublishingOptionsPane*) g_object_new (object_type, NULL); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = albums; + _tmp0_ = (albums != NULL) ? _vala_array_dup3 (albums, albums_length1) : ((gpointer) albums); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0__length1 = albums_length1; -#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1__length1 = _tmp0__length1; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_gallery3_album_unref), NULL); #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->albums = _tmp1_; + self->priv->albums = _tmp0_; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->albums_length1 = _tmp1__length1; + self->priv->albums_length1 = _tmp0__length1; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_albums_size_ = self->priv->albums_length1; #line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = host; -#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->host = _tmp2_; -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = builder; + self->priv->host = host; #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (builder); #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->builder); #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->builder = _tmp4_; + self->priv->builder = _tmp1_; #line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = builder; -#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (NULL != _tmp5_, "null != builder"); -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = builder; + _vala_assert (NULL != builder, "null != builder"); #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = gtk_builder_get_objects (_tmp6_); + _tmp2_ = gtk_builder_get_objects (builder); #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = g_slist_length (_tmp8_); + _tmp3_ = _tmp2_; #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (_tmp9_ > ((guint) 0), "builder.get_objects().length() > 0"); + _vala_assert (g_slist_length (_tmp3_) > ((guint) 0), "builder.get_objects().length() > 0"); #line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_slist_free0 (_tmp8_); -#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = builder; + _g_slist_free0 (_tmp3_); #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = gtk_builder_get_object (_tmp10_, "pane_widget"); + _tmp4_ = gtk_builder_get_object (builder, "pane_widget"); #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp11_) : NULL); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp4_) : NULL); #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->pane_widget); #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->pane_widget = _tmp12_; + self->priv->pane_widget = _tmp5_; #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = builder; + _tmp6_ = gtk_builder_get_object (builder, "title_label"); #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = gtk_builder_get_object (_tmp13_, "title_label"); -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp14_) : NULL); + _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL); #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->title_label); #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->title_label = _tmp15_; -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = builder; + self->priv->title_label = _tmp7_; #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_existing_radio"); + _tmp8_ = gtk_builder_get_object (builder, "publish_to_existing_radio"); #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp17_) : NULL); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp8_) : NULL); #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->use_existing_radio); #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->use_existing_radio = _tmp18_; + self->priv->use_existing_radio = _tmp9_; #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = builder; + _tmp10_ = gtk_builder_get_object (builder, "existing_albums_combo"); #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = gtk_builder_get_object (_tmp19_, "existing_albums_combo"); -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp20_) : NULL); + _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp10_) : NULL); #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->existing_albums_combo); #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->existing_albums_combo = _tmp21_; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = builder; + self->priv->existing_albums_combo = _tmp11_; #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = gtk_builder_get_object (_tmp22_, "scaling_constraint_combo"); + _tmp12_ = gtk_builder_get_object (builder, "scaling_constraint_combo"); #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp23_) : NULL); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp12_) : NULL); #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->scaling_combo); #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->scaling_combo = _tmp24_; + self->priv->scaling_combo = _tmp13_; #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = builder; + _tmp14_ = gtk_builder_get_object (builder, "major_axis_pixels"); #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = gtk_builder_get_object (_tmp25_, "major_axis_pixels"); -#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL); + _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL); #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->pixels); #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->pixels = _tmp27_; -#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = builder; + self->priv->pixels = _tmp15_; #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = gtk_builder_get_object (_tmp28_, "publish_new_radio"); + _tmp16_ = gtk_builder_get_object (builder, "publish_new_radio"); #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp29_) : NULL); + _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL); #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->create_new_radio); #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->create_new_radio = _tmp30_; + self->priv->create_new_radio = _tmp17_; #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = builder; + _tmp18_ = gtk_builder_get_object (builder, "new_album_name"); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = gtk_builder_get_object (_tmp31_, "new_album_name"); -#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL); + _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->new_album_entry); #line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->new_album_entry = _tmp33_; + self->priv->new_album_entry = _tmp19_; #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = self->priv->builder; + _tmp20_ = self->priv->builder; #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = gtk_builder_get_object (_tmp34_, "strip_metadata_check"); + _tmp21_ = gtk_builder_get_object (_tmp20_, "strip_metadata_check"); #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp35_) : NULL); + _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp21_) : NULL); #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->strip_metadata_check); #line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->strip_metadata_check = _tmp36_; -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = builder; + self->priv->strip_metadata_check = _tmp22_; #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = gtk_builder_get_object (_tmp37_, "publish_button"); + _tmp23_ = gtk_builder_get_object (builder, "publish_button"); #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, gtk_button_get_type ()) ? ((GtkButton*) _tmp38_) : NULL); + _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL); #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->publish_button); #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->publish_button = _tmp39_; -#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = builder; + self->priv->publish_button = _tmp24_; #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp41_ = gtk_builder_get_object (_tmp40_, "logout_button"); + _tmp25_ = gtk_builder_get_object (builder, "logout_button"); #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, gtk_button_get_type ()) ? ((GtkButton*) _tmp41_) : NULL); + _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL); #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->logout_button); #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->logout_button = _tmp42_; -#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_ = url; + self->priv->logout_button = _tmp26_; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = username; + _tmp27_ = self->priv->title_label; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = g_strdup_printf (_ ("Publishing to %s as %s."), _tmp44_, _tmp45_); + _tmp28_ = g_strdup_printf (_ ("Publishing to %s as %s."), url, username); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = _tmp46_; + _tmp29_ = _tmp28_; #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_label (_tmp43_, _tmp47_); + gtk_label_set_label (_tmp27_, _tmp29_); #line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp47_); -#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = self->priv->strip_metadata_check; + _g_free0 (_tmp29_); #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = strip_metadata; + _tmp30_ = self->priv->strip_metadata_check; #line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_); + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), strip_metadata); #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp50_ = self->priv->scaling_combo; + _tmp31_ = self->priv->scaling_combo; #line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), _tmp51_); -#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = self->priv->pixels; + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), scaling_id); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = scaling_pixels; + _tmp32_ = self->priv->pixels; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = g_strdup_printf ("%i", _tmp53_); + _tmp33_ = g_strdup_printf ("%i", scaling_pixels); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp55_ = _tmp54_; + _tmp34_ = _tmp33_; #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp52_, _tmp55_); + gtk_entry_set_text (_tmp32_, _tmp34_); #line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp55_); + _g_free0 (_tmp34_); #line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = self->priv->use_existing_radio; + _tmp35_ = 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 (_tmp56_, 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 (_tmp35_, 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" - _tmp57_ = self->priv->create_new_radio; + _tmp36_ = 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 (_tmp57_, 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 (_tmp36_, 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" - _tmp58_ = self->priv->new_album_entry; + _tmp37_ = 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 (_tmp58_, 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 (_tmp37_, gtk_editable_get_type (), 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" - _tmp59_ = self->priv->scaling_combo; + _tmp38_ = 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 (_tmp59_, 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 (_tmp38_, 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" - _tmp60_ = self->priv->pixels; + _tmp39_ = self->priv->pixels; #line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_editable_get_type (), 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" - _tmp61_ = self->priv->logout_button; + _tmp40_ = self->priv->logout_button; #line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp61_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp40_, "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" - _tmp62_ = self->priv->publish_button; + _tmp41_ = self->priv->publish_button; #line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_gallery3_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp41_, "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 9640 "GalleryConnector.c" +#line 9704 "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) { +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 9647 "GalleryConnector.c" +#line 9721 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_publish_clicked (PublishingGallery3PublishingOptionsPane* self) +{ gchar* album_name = NULL; gint _tmp0_ = 0; GtkComboBoxText* _tmp1_; - gint _tmp2_; gint photo_major_axis_size = 0; PublishingGallery3PublishingParameters* param = NULL; - GtkRadioButton* _tmp6_; - gboolean _tmp7_; - PublishingGallery3PublishingParameters* _tmp34_; - gint _tmp35_; - PublishingGallery3PublishingParameters* _tmp36_; - GtkCheckButton* _tmp37_; - gboolean _tmp38_; - PublishingGallery3PublishingParameters* _tmp39_; + GtkRadioButton* _tmp4_; + PublishingGallery3PublishingParameters* _tmp29_; + gint _tmp30_; + PublishingGallery3PublishingParameters* _tmp31_; + GtkCheckButton* _tmp32_; + PublishingGallery3PublishingParameters* _tmp33_; #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" _tmp1_ = self->priv->scaling_combo; #line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 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; + if (gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1) { +#line 9745 "GalleryConnector.c" + GtkEntry* _tmp2_; + const gchar* _tmp3_; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = gtk_entry_get_text (_tmp3_); + _tmp2_ = self->priv->pixels; #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = atoi (_tmp4_); + _tmp3_ = gtk_entry_get_text (_tmp2_); #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = _tmp5_; -#line 9686 "GalleryConnector.c" + _tmp0_ = atoi (_tmp3_); +#line 9754 "GalleryConnector.c" } else { #line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = -1; -#line 9690 "GalleryConnector.c" +#line 9758 "GalleryConnector.c" } #line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" photo_major_axis_size = _tmp0_; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = self->priv->create_new_radio; -#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton)); + _tmp4_ = self->priv->create_new_radio; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp7_) { -#line 9700 "GalleryConnector.c" - GtkEntry* _tmp8_; + if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton))) { +#line 9766 "GalleryConnector.c" + GtkEntry* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + SpitPublishingPluginHost* _tmp8_; const gchar* _tmp9_; - gchar* _tmp10_; - SpitPublishingPluginHost* _tmp11_; + const gchar* _tmp10_; + PublishingGallery3PublishingParameters* _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; + _tmp5_ = self->priv->new_album_entry; #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = gtk_entry_get_text (_tmp8_); + _tmp6_ = gtk_entry_get_text (_tmp5_); #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = g_strdup (_tmp9_); + _tmp7_ = g_strdup (_tmp6_); #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); #line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_name = _tmp10_; + album_name = _tmp7_; #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = self->priv->host; + _tmp8_ = self->priv->host; #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = album_name; + _tmp9_ = album_name; #line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp12_); + spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp9_); #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = album_name; + _tmp10_ = album_name; #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp13_); + _tmp11_ = publishing_gallery3_publishing_parameters_new_to_new_album (_tmp10_); #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (param); #line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - param = _tmp14_; + param = _tmp11_; #line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = album_name; + _tmp12_ = 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 9737 "GalleryConnector.c" + g_debug ("GalleryConnector.vala:1577: Trying to publish to \"%s\"", _tmp12_); +#line 9803 "GalleryConnector.c" } else { - PublishingGallery3Album** _tmp16_; - gint _tmp16__length1; - GtkComboBoxText* _tmp17_; - gint _tmp18_; - PublishingGallery3Album* _tmp19_; + PublishingGallery3Album** _tmp13_; + gint _tmp13__length1; + GtkComboBoxText* _tmp14_; + PublishingGallery3Album* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + SpitPublishingPluginHost* _tmp19_; const gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - SpitPublishingPluginHost* _tmp23_; - const gchar* _tmp24_; gchar* album_path = 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; + PublishingGallery3Album** _tmp21_; + gint _tmp21__length1; + GtkComboBoxText* _tmp22_; + PublishingGallery3Album* _tmp23_; + const gchar* _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + const gchar* _tmp27_; + PublishingGallery3PublishingParameters* _tmp28_; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16__length1 = self->priv->albums_length1; + _tmp13_ = self->priv->albums; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = self->priv->existing_albums_combo; + _tmp13__length1 = self->priv->albums_length1; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp14_ = self->priv->existing_albums_combo; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp16_[_tmp18_]; + _tmp15_ = _tmp13_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox))]; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = publishing_gallery3_album_get_title (_tmp19_); + _tmp16_ = publishing_gallery3_album_get_title (_tmp15_); #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = _tmp20_; + _tmp17_ = _tmp16_; #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = g_strdup (_tmp21_); + _tmp18_ = g_strdup (_tmp17_); #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); #line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_name = _tmp22_; + album_name = _tmp18_; #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = self->priv->host; + _tmp19_ = self->priv->host; #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = album_name; + _tmp20_ = album_name; #line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp24_); + spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LAST_ALBUM_CONFIG_KEY, _tmp20_); #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = self->priv->albums; + _tmp21_ = self->priv->albums; #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25__length1 = self->priv->albums_length1; + _tmp21__length1 = self->priv->albums_length1; #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = self->priv->existing_albums_combo; + _tmp22_ = self->priv->existing_albums_combo; #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox)); + _tmp23_ = _tmp21_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox))]; #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = _tmp25_[_tmp27_]; + _tmp24_ = publishing_gallery3_album_get_path (_tmp23_); #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = publishing_gallery3_album_get_path (_tmp28_); -#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = _tmp29_; + _tmp25_ = _tmp24_; #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = g_strdup (_tmp30_); + _tmp26_ = g_strdup (_tmp25_); #line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - album_path = _tmp31_; + album_path = _tmp26_; #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = album_path; + _tmp27_ = album_path; #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp32_); + _tmp28_ = publishing_gallery3_publishing_parameters_new_to_existing_album (_tmp27_); #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (param); #line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - param = _tmp33_; + param = _tmp28_; #line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_path); -#line 9814 "GalleryConnector.c" +#line 9874 "GalleryConnector.c" } #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = param; + _tmp29_ = param; #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = photo_major_axis_size; + _tmp30_ = photo_major_axis_size; #line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp34_, _tmp35_); + publishing_gallery3_publishing_parameters_set_photo_major_axis_size (_tmp29_, _tmp30_); #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = param; + _tmp31_ = param; #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = self->priv->strip_metadata_check; + _tmp32_ = self->priv->strip_metadata_check; #line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp36_, _tmp38_); + publishing_gallery3_publishing_parameters_set_strip_metadata (_tmp31_, gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_toggle_button_get_type (), GtkToggleButton))); #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = param; + _tmp33_ = param; #line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp39_); + g_signal_emit (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp33_); #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 9838 "GalleryConnector.c" +#line 9896 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_use_existing_radio_clicked (PublishingGallery3PublishingOptionsPane* self) +{ GtkComboBoxText* _tmp0_; GtkEntry* _tmp1_; GtkComboBoxText* _tmp2_; @@ -9899,11 +9959,13 @@ 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 9862 "GalleryConnector.c" +#line 9922 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_create_new_radio_clicked (PublishingGallery3PublishingOptionsPane* self) +{ GtkEntry* _tmp0_; GtkComboBoxText* _tmp1_; GtkEntry* _tmp2_; @@ -9923,43 +9985,49 @@ 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 9886 "GalleryConnector.c" +#line 9948 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_logout_clicked (PublishingGallery3PublishingOptionsPane* self) +{ #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 (self, publishing_gallery3_publishing_options_pane_signals[PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0); -#line 9895 "GalleryConnector.c" +#line 9959 "GalleryConnector.c" } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 9918 "GalleryConnector.c" +#line 9984 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_update_publish_button_sensitivity (PublishingGallery3PublishingOptionsPane* self) +{ gchar* album_name = NULL; GtkEntry* _tmp0_; const gchar* _tmp1_; @@ -9969,7 +10037,7 @@ static void publishing_gallery3_publishing_options_pane_update_publish_button_se gchar* _tmp5_; gchar* _tmp6_; gboolean _tmp7_; - GtkButton* _tmp10_; + GtkButton* _tmp9_; #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" @@ -9992,44 +10060,44 @@ 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 9955 "GalleryConnector.c" +#line 10023 "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 9964 "GalleryConnector.c" + _tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); +#line 10029 "GalleryConnector.c" } else { #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp3_ = FALSE; -#line 9968 "GalleryConnector.c" +#line 10033 "GalleryConnector.c" } #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = self->priv->publish_button; + _tmp9_ = self->priv->publish_button; #line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), !_tmp3_); #line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (album_name); -#line 9976 "GalleryConnector.c" +#line 10041 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_new_album_entry_changed (PublishingGallery3PublishingOptionsPane* self) +{ #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 9985 "GalleryConnector.c" +#line 10052 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_update_pixel_entry_sensitivity (PublishingGallery3PublishingOptionsPane* self) +{ 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" @@ -10037,191 +10105,140 @@ static void publishing_gallery3_publishing_options_pane_update_pixel_entry_sensi #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = self->priv->scaling_combo; #line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _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 10003 "GalleryConnector.c" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)) == 1); +#line 10069 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_scaling_constraint_changed (PublishingGallery3PublishingOptionsPane* self) +{ #line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 10012 "GalleryConnector.c" +#line 10080 "GalleryConnector.c" } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 10035 "GalleryConnector.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 10043 "GalleryConnector.c" +#line 10104 "GalleryConnector.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 10055 "GalleryConnector.c" +#line 10113 "GalleryConnector.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#line 10079 "GalleryConnector.c" - glong _tmp2_; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = len; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = _tmp2_ >= ((glong) 0); -#line 10085 "GalleryConnector.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 10134 "GalleryConnector.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 10089 "GalleryConnector.c" +#line 10138 "GalleryConnector.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 10093 "GalleryConnector.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 10144 "GalleryConnector.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 10154 "GalleryConnector.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 10158 "GalleryConnector.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 10166 "GalleryConnector.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 10173 "GalleryConnector.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 10177 "GalleryConnector.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 10105 "GalleryConnector.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#line 10115 "GalleryConnector.c" - } -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = offset; -#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp8_ < ((glong) 0)) { -#line 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 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 10135 "GalleryConnector.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 10145 "GalleryConnector.c" - } -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = len; -#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp14_ < ((glong) 0)) { -#line 10151 "GalleryConnector.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 10160 "GalleryConnector.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 10183 "GalleryConnector.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 10180 "GalleryConnector.c" +#line 10195 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) { +static void +publishing_gallery3_publishing_options_pane_on_pixels_changed (PublishingGallery3PublishingOptionsPane* self) +{ gchar* orig_text = NULL; GtkEntry* _tmp0_; const gchar* _tmp1_; @@ -10231,10 +10248,9 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi const gchar* _tmp4_; gint _tmp5_; gint _tmp6_; - gchar _tmp7_; - const gchar* _tmp8_; + const gchar* _tmp7_; + gint _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" @@ -10254,62 +10270,59 @@ static void publishing_gallery3_publishing_options_pane_on_pixels_changed (Publi #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = _tmp5_; #line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = string_get (_tmp3_, (glong) (_tmp6_ - 1)); -#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - last_char = _tmp7_; + last_char = string_get (_tmp3_, (glong) (_tmp6_ - 1)); #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = orig_text; + _tmp7_ = orig_text; #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = strlen (_tmp8_); + _tmp8_ = strlen (_tmp7_); #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp10_ > 0) { -#line 10228 "GalleryConnector.c" - gchar _tmp11_; - gboolean _tmp12_; + if (_tmp9_ > 0) { +#line 10242 "GalleryConnector.c" + gchar _tmp10_; #line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = last_char; + _tmp10_ = 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 10237 "GalleryConnector.c" - GtkEntry* _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gint _tmp16_; - gint _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; + if (!g_ascii_isdigit (_tmp10_)) { +#line 10248 "GalleryConnector.c" + GtkEntry* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = self->priv->pixels; + _tmp11_ = self->priv->pixels; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = orig_text; + _tmp12_ = orig_text; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = orig_text; + _tmp13_ = orig_text; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = strlen (_tmp15_); + _tmp14_ = strlen (_tmp13_); #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = _tmp16_; + _tmp15_ = _tmp14_; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = string_substring (_tmp14_, (glong) 0, (glong) (_tmp17_ - 1)); + _tmp16_ = string_substring (_tmp12_, (glong) 0, (glong) (_tmp15_ - 1)); #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _tmp18_; + _tmp17_ = _tmp16_; #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp13_, _tmp19_); + gtk_entry_set_text (_tmp11_, _tmp17_); #line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp19_); -#line 10263 "GalleryConnector.c" + _g_free0 (_tmp17_); +#line 10274 "GalleryConnector.c" } } #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (orig_text); -#line 10268 "GalleryConnector.c" +#line 10279 "GalleryConnector.c" } -void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) { +void +publishing_gallery3_publishing_options_pane_installed (PublishingGallery3PublishingOptionsPane* self) +{ gint default_album_id = 0; gchar* last_album = NULL; SpitPublishingPluginHost* _tmp0_; @@ -10326,19 +10339,19 @@ 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 10289 "GalleryConnector.c" +#line 10302 "GalleryConnector.c" { gint i = 0; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" i = 0; -#line 10294 "GalleryConnector.c" +#line 10307 "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 10301 "GalleryConnector.c" +#line 10314 "GalleryConnector.c" gint _tmp4_; PublishingGallery3Album** _tmp5_; gint _tmp5__length1; @@ -10359,13 +10372,13 @@ void publishing_gallery3_publishing_options_pane_installed (PublishingGallery3Pu const gchar* _tmp18_; #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (!_tmp2_) { -#line 10322 "GalleryConnector.c" +#line 10335 "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 10328 "GalleryConnector.c" +#line 10341 "GalleryConnector.c" } #line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp2_ = FALSE; @@ -10379,7 +10392,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 10342 "GalleryConnector.c" +#line 10355 "GalleryConnector.c" } #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp6_ = self->priv->existing_albums_combo; @@ -10415,7 +10428,7 @@ 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 10378 "GalleryConnector.c" +#line 10391 "GalleryConnector.c" } else { gboolean _tmp19_ = FALSE; PublishingGallery3Album** _tmp20_; @@ -10438,31 +10451,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 10401 "GalleryConnector.c" +#line 10414 "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 10407 "GalleryConnector.c" +#line 10420 "GalleryConnector.c" } else { #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp19_ = FALSE; -#line 10411 "GalleryConnector.c" +#line 10424 "GalleryConnector.c" } #line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp12_ = _tmp19_; -#line 10415 "GalleryConnector.c" +#line 10428 "GalleryConnector.c" } #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (_tmp12_) { -#line 10419 "GalleryConnector.c" +#line 10432 "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 10425 "GalleryConnector.c" +#line 10438 "GalleryConnector.c" } } } @@ -10473,7 +10486,7 @@ 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 10436 "GalleryConnector.c" +#line 10449 "GalleryConnector.c" GtkComboBoxText* _tmp28_; GtkRadioButton* _tmp29_; GtkRadioButton* _tmp30_; @@ -10499,14 +10512,14 @@ 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 10462 "GalleryConnector.c" +#line 10475 "GalleryConnector.c" } else { 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 10469 "GalleryConnector.c" +#line 10482 "GalleryConnector.c" GtkRadioButton* _tmp34_; GtkComboBoxText* _tmp35_; gint _tmp36_; @@ -10525,7 +10538,7 @@ 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 10488 "GalleryConnector.c" +#line 10501 "GalleryConnector.c" } else { GtkRadioButton* _tmp38_; GtkComboBoxText* _tmp39_; @@ -10547,7 +10560,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 10510 "GalleryConnector.c" +#line 10523 "GalleryConnector.c" } } #line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10556,11 +10569,13 @@ 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 10519 "GalleryConnector.c" +#line 10532 "GalleryConnector.c" } -static GtkWidget* publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) { +static GtkWidget* +publishing_gallery3_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) +{ PublishingGallery3PublishingOptionsPane * self; GtkWidget* result = NULL; GtkGrid* _tmp0_; @@ -10575,11 +10590,13 @@ 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 10538 "GalleryConnector.c" +#line 10553 "GalleryConnector.c" } -static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { +static SpitPublishingDialogPaneGeometryOptions +publishing_gallery3_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) +{ PublishingGallery3PublishingOptionsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; #line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10588,29 +10605,40 @@ 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 10551 "GalleryConnector.c" +#line 10568 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { +static void +publishing_gallery3_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) +{ PublishingGallery3PublishingOptionsPane * self; #line 1683 "/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 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_installed (self); -#line 10561 "GalleryConnector.c" +#line 10580 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { +static void +publishing_gallery3_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) +{ 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 10569 "GalleryConnector.c" +#line 10590 "GalleryConnector.c" } -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 +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) +{ typedef void (*GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS) (gpointer data1, gpointer arg_1, gpointer data2); register GMarshalFunc_VOID__PUBLISHING_GALLERY3_PUBLISHING_PARAMETERS callback; register GCClosure * cc; @@ -10625,23 +10653,25 @@ 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 10588 "GalleryConnector.c" +#line 10616 "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 10594 "GalleryConnector.c" +#line 10622 "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 10600 "GalleryConnector.c" +#line 10628 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass) { +static void +publishing_gallery3_publishing_options_pane_class_init (PublishingGallery3PublishingOptionsPaneClass * klass) +{ #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10652,11 +10682,13 @@ static void publishing_gallery3_publishing_options_pane_class_init (PublishingGa 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" 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" +#line 10645 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { +static void +publishing_gallery3_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) +{ #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" @@ -10667,11 +10699,13 @@ static void publishing_gallery3_publishing_options_pane_spit_publishing_dialog_p 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 10630 "GalleryConnector.c" +#line 10662 "GalleryConnector.c" } -static void publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self) { +static void +publishing_gallery3_publishing_options_pane_instance_init (PublishingGallery3PublishingOptionsPane * self) +{ #line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); #line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10698,11 +10732,13 @@ 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 10661 "GalleryConnector.c" +#line 10695 "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); @@ -10734,11 +10770,13 @@ 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 10697 "GalleryConnector.c" +#line 10733 "GalleryConnector.c" } -GType publishing_gallery3_publishing_options_pane_get_type (void) { +GType +publishing_gallery3_publishing_options_pane_get_type (void) +{ static volatile gsize publishing_gallery3_publishing_options_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_publishing_options_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3PublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3PublishingOptionsPane), 0, (GInstanceInitFunc) publishing_gallery3_publishing_options_pane_instance_init, NULL }; @@ -10752,116 +10790,121 @@ GType publishing_gallery3_publishing_options_pane_get_type (void) { } -static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct (GType object_type) { +static PublishingGallery3PublishingParameters* +publishing_gallery3_publishing_parameters_construct (GType object_type) +{ PublishingGallery3PublishingParameters* self = NULL; #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type); #line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10721 "GalleryConnector.c" +#line 10761 "GalleryConnector.c" } -static PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new (void) { +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 10728 "GalleryConnector.c" +#line 10770 "GalleryConnector.c" } -static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) { +static gchar* +string_delimit (const gchar* self, + const gchar* delimiters, + gchar new_delimiter) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; - gchar _tmp3_; -#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1242 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1256 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1243 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1257 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = delimiters; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = new_delimiter; -#line 1244 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1258 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_strdelimit (_tmp1_, delimiters, new_delimiter); +#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1245 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1259 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 10759 "GalleryConnector.c" +#line 10799 "GalleryConnector.c" } -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, const gchar* album_title) { +PublishingGallery3PublishingParameters* +publishing_gallery3_publishing_parameters_construct_to_new_album (GType object_type, + const gchar* album_title) +{ PublishingGallery3PublishingParameters* self = NULL; - const gchar* _tmp0_; + 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" self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = album_title; -#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = string_delimit (_tmp0_, " ", '-'); + _tmp0_ = string_delimit (album_title, " ", '-'); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_album_name (self, _tmp2_); + publishing_gallery3_publishing_parameters_set_album_name (self, _tmp1_); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp2_); -#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = album_title; + _g_free0 (_tmp1_); #line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_album_title (self, _tmp3_); + publishing_gallery3_publishing_parameters_set_album_title (self, album_title); #line 1713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10789 "GalleryConnector.c" +#line 10826 "GalleryConnector.c" } -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_new_album (const gchar* album_title) { +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 10796 "GalleryConnector.c" +#line 10835 "GalleryConnector.c" } -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, const gchar* album_path) { +PublishingGallery3PublishingParameters* +publishing_gallery3_publishing_parameters_construct_to_existing_album (GType object_type, + const gchar* album_path) +{ PublishingGallery3PublishingParameters* self = 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" self = (PublishingGallery3PublishingParameters*) g_type_create_instance (object_type); #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = album_path; -#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_publishing_parameters_set_album_path (self, _tmp0_); + publishing_gallery3_publishing_parameters_set_album_path (self, album_path); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 10813 "GalleryConnector.c" +#line 10852 "GalleryConnector.c" } -PublishingGallery3PublishingParameters* publishing_gallery3_publishing_parameters_new_to_existing_album (const gchar* album_path) { +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 10820 "GalleryConnector.c" +#line 10861 "GalleryConnector.c" } -gboolean publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) { +gboolean +publishing_gallery3_publishing_parameters_is_to_new_album (PublishingGallery3PublishingParameters* self) +{ gboolean result = FALSE; const gchar* _tmp0_; #line 1723 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10872,48 +10915,49 @@ 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 10835 "GalleryConnector.c" +#line 10878 "GalleryConnector.c" } -const gchar* publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) { +const gchar* +publishing_gallery3_publishing_parameters_get_album_title (PublishingGallery3PublishingParameters* self) +{ const gchar* result; - gboolean _tmp0_; - const gchar* _tmp1_; + const gchar* _tmp0_; #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" - _tmp0_ = publishing_gallery3_publishing_parameters_is_to_new_album (self); -#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (_tmp0_, "is_to_new_album()"); + _vala_assert (publishing_gallery3_publishing_parameters_is_to_new_album (self), "is_to_new_album()"); #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = self->priv->_album_title; + _tmp0_ = self->priv->_album_title; #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp1_; + result = _tmp0_; #line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 10855 "GalleryConnector.c" +#line 10897 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_publishing_parameters_set_album_title (PublishingGallery3PublishingParameters* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_album_title); #line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_album_title = _tmp1_; -#line 10872 "GalleryConnector.c" + self->priv->_album_title = _tmp0_; +#line 10914 "GalleryConnector.c" } -const gchar* publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) { +const gchar* +publishing_gallery3_publishing_parameters_get_album_name (PublishingGallery3PublishingParameters* self) +{ const gchar* result; const gchar* _tmp0_; #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10924,28 +10968,30 @@ 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 10887 "GalleryConnector.c" +#line 10931 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_publishing_parameters_set_album_name (PublishingGallery3PublishingParameters* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_album_name); #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_album_name = _tmp1_; -#line 10904 "GalleryConnector.c" + self->priv->_album_name = _tmp0_; +#line 10948 "GalleryConnector.c" } -const gchar* publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) { +const gchar* +publishing_gallery3_publishing_parameters_get_album_path (PublishingGallery3PublishingParameters* self) +{ const gchar* result; const gchar* _tmp0_; #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10956,28 +11002,30 @@ 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 10919 "GalleryConnector.c" +#line 10965 "GalleryConnector.c" } -void publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +void +publishing_gallery3_publishing_parameters_set_album_path (PublishingGallery3PublishingParameters* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_album_path); #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_album_path = _tmp1_; -#line 10936 "GalleryConnector.c" + self->priv->_album_path = _tmp0_; +#line 10982 "GalleryConnector.c" } -const gchar* publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) { +const gchar* +publishing_gallery3_publishing_parameters_get_entity_title (PublishingGallery3PublishingParameters* self) +{ const gchar* result; const gchar* _tmp0_; #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -10988,28 +11036,30 @@ 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 10951 "GalleryConnector.c" +#line 10999 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_publishing_parameters_set_entity_title (PublishingGallery3PublishingParameters* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_entity_title); #line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_entity_title = _tmp1_; -#line 10968 "GalleryConnector.c" + self->priv->_entity_title = _tmp0_; +#line 11016 "GalleryConnector.c" } -gint publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) { +gint +publishing_gallery3_publishing_parameters_get_photo_major_axis_size (PublishingGallery3PublishingParameters* self) +{ gint result; gint _tmp0_; #line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11020,23 +11070,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 10983 "GalleryConnector.c" +#line 11033 "GalleryConnector.c" } -void publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, gint value) { - gint _tmp0_; +void +publishing_gallery3_publishing_parameters_set_photo_major_axis_size (PublishingGallery3PublishingParameters* self, + gint value) +{ #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 10995 "GalleryConnector.c" + self->priv->_photo_major_axis_size = value; +#line 11045 "GalleryConnector.c" } -gboolean publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) { +gboolean +publishing_gallery3_publishing_parameters_get_strip_metadata (PublishingGallery3PublishingParameters* self) +{ gboolean result; gboolean _tmp0_; #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11047,120 +11099,145 @@ 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 11010 "GalleryConnector.c" +#line 11062 "GalleryConnector.c" } -void publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, gboolean value) { - gboolean _tmp0_; +void +publishing_gallery3_publishing_parameters_set_strip_metadata (PublishingGallery3PublishingParameters* self, + gboolean value) +{ #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 11022 "GalleryConnector.c" + self->priv->_strip_metadata = value; +#line 11074 "GalleryConnector.c" } -static void publishing_gallery3_value_publishing_parameters_init (GValue* value) { +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 11029 "GalleryConnector.c" +#line 11083 "GalleryConnector.c" } -static void publishing_gallery3_value_publishing_parameters_free_value (GValue* value) { +static void +publishing_gallery3_value_publishing_parameters_free_value (GValue* value) +{ #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" publishing_gallery3_publishing_parameters_unref (value->data[0].v_pointer); -#line 11038 "GalleryConnector.c" +#line 11094 "GalleryConnector.c" } } -static void publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) { +static void +publishing_gallery3_value_publishing_parameters_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 11048 "GalleryConnector.c" +#line 11107 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" dest_value->data[0].v_pointer = NULL; -#line 11052 "GalleryConnector.c" +#line 11111 "GalleryConnector.c" } } -static gpointer publishing_gallery3_value_publishing_parameters_peek_pointer (const GValue* value) { +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 11060 "GalleryConnector.c" +#line 11121 "GalleryConnector.c" } -static gchar* publishing_gallery3_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 11067 "GalleryConnector.c" +#line 11133 "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 11074 "GalleryConnector.c" +#line 11140 "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 11078 "GalleryConnector.c" +#line 11144 "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 11082 "GalleryConnector.c" +#line 11148 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11086 "GalleryConnector.c" +#line 11152 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11090 "GalleryConnector.c" +#line 11156 "GalleryConnector.c" } -static gchar* publishing_gallery3_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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; 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 11101 "GalleryConnector.c" +#line 11172 "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 11107 "GalleryConnector.c" +#line 11178 "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 11111 "GalleryConnector.c" +#line 11182 "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 11115 "GalleryConnector.c" +#line 11186 "GalleryConnector.c" } #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return NULL; -#line 11119 "GalleryConnector.c" +#line 11190 "GalleryConnector.c" } -GParamSpec* publishing_gallery3_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +publishing_gallery3_param_spec_publishing_parameters (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ PublishingGallery3ParamSpecPublishingParameters* spec; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_GALLERY3_TYPE_PUBLISHING_PARAMETERS), NULL); @@ -11170,20 +11247,25 @@ 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 11133 "GalleryConnector.c" +#line 11210 "GalleryConnector.c" } -gpointer publishing_gallery3_value_get_publishing_parameters (const GValue* value) { +gpointer +publishing_gallery3_value_get_publishing_parameters (const GValue* value) +{ #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 11142 "GalleryConnector.c" +#line 11221 "GalleryConnector.c" } -void publishing_gallery3_value_set_publishing_parameters (GValue* value, gpointer v_object) { +void +publishing_gallery3_value_set_publishing_parameters (GValue* value, + gpointer v_object) +{ 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)); @@ -11199,22 +11281,25 @@ 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 11162 "GalleryConnector.c" +#line 11244 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11166 "GalleryConnector.c" +#line 11248 "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 11172 "GalleryConnector.c" +#line 11254 "GalleryConnector.c" } } -void publishing_gallery3_value_take_publishing_parameters (GValue* value, gpointer v_object) { +void +publishing_gallery3_value_take_publishing_parameters (GValue* value, + gpointer v_object) +{ 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)); @@ -11228,33 +11313,37 @@ 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 11191 "GalleryConnector.c" +#line 11276 "GalleryConnector.c" } else { #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" value->data[0].v_pointer = NULL; -#line 11195 "GalleryConnector.c" +#line 11280 "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 11201 "GalleryConnector.c" +#line 11286 "GalleryConnector.c" } } -static void publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass) { +static void +publishing_gallery3_publishing_parameters_class_init (PublishingGallery3PublishingParametersClass * klass) +{ #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" ((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 11213 "GalleryConnector.c" +#line 11300 "GalleryConnector.c" } -static void publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) { +static void +publishing_gallery3_publishing_parameters_instance_init (PublishingGallery3PublishingParameters * self) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -11283,11 +11372,13 @@ 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 11246 "GalleryConnector.c" +#line 11335 "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); @@ -11301,11 +11392,13 @@ 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 11264 "GalleryConnector.c" +#line 11355 "GalleryConnector.c" } -GType publishing_gallery3_publishing_parameters_get_type (void) { +GType +publishing_gallery3_publishing_parameters_get_type (void) +{ static volatile gsize publishing_gallery3_publishing_parameters_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_publishing_parameters_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { publishing_gallery3_value_publishing_parameters_init, publishing_gallery3_value_publishing_parameters_free_value, publishing_gallery3_value_publishing_parameters_copy_value, publishing_gallery3_value_publishing_parameters_peek_pointer, "p", publishing_gallery3_value_publishing_parameters_collect_value, "p", publishing_gallery3_value_publishing_parameters_lcopy_value }; @@ -11319,18 +11412,22 @@ GType publishing_gallery3_publishing_parameters_get_type (void) { } -gpointer publishing_gallery3_publishing_parameters_ref (gpointer instance) { +gpointer +publishing_gallery3_publishing_parameters_ref (gpointer instance) +{ 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 11289 "GalleryConnector.c" +#line 11384 "GalleryConnector.c" } -void publishing_gallery3_publishing_parameters_unref (gpointer instance) { +void +publishing_gallery3_publishing_parameters_unref (gpointer instance) +{ PublishingGallery3PublishingParameters * self; self = instance; #line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11339,18 +11436,20 @@ 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 11302 "GalleryConnector.c" +#line 11399 "GalleryConnector.c" } } -gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self) { +gchar* +publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3CredentialsPaneMode self) +{ gchar* result = NULL; #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" switch (self) { #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11313 "GalleryConnector.c" +#line 11412 "GalleryConnector.c" { gchar* _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11359,11 +11458,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr result = _tmp0_; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11322 "GalleryConnector.c" +#line 11421 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11326 "GalleryConnector.c" +#line 11425 "GalleryConnector.c" { gchar* _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11372,11 +11471,11 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr result = _tmp1_; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11335 "GalleryConnector.c" +#line 11434 "GalleryConnector.c" } #line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11339 "GalleryConnector.c" +#line 11438 "GalleryConnector.c" { gchar* _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11385,20 +11484,22 @@ gchar* publishing_gallery3_credentials_pane_mode_to_string (PublishingGallery3Cr result = _tmp2_; #line 1743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 11348 "GalleryConnector.c" +#line 11447 "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 11354 "GalleryConnector.c" +#line 11453 "GalleryConnector.c" } } } -GType publishing_gallery3_credentials_pane_mode_get_type (void) { +GType +publishing_gallery3_credentials_pane_mode_get_type (void) +{ static volatile gsize publishing_gallery3_credentials_pane_mode_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_credentials_pane_mode_type_id__volatile)) { static const GEnumValue values[] = {{PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO", "intro"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY", "failed-retry"}, {PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL, "PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL", "not-gallery-url"}, {0, NULL, NULL}}; @@ -11410,21 +11511,23 @@ 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* +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_; - 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_; + GtkBuilder* _tmp8_; + PublishingGallery3CredentialsGrid* _tmp9_; + PublishingGallery3CredentialsGrid* _tmp10_; + GtkGrid* _tmp11_; + GtkGrid* _tmp12_; + GtkWidget* _tmp13_; 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); @@ -11434,7 +11537,7 @@ 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 11396 "GalleryConnector.c" +#line 11499 "GalleryConnector.c" { GtkBuilder* _tmp1_; #line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11443,7 +11546,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc 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 11405 "GalleryConnector.c" +#line 11508 "GalleryConnector.c" goto __catch15_g_error; } } @@ -11453,11 +11556,10 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc GError* e = NULL; GError* _tmp2_; const gchar* _tmp3_; - SpitPublishingPluginHost* _tmp4_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; + GError* _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" @@ -11469,29 +11571,27 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc #line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_warning ("GalleryConnector.vala:1770: Could not parse UI file! Error: %s.", _tmp3_); #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_ = g_strdup_printf (_ ("A file required for publishing is unavailable. Publishing to %s can’t " \ + _tmp4_ = 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" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_); + _tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - spit_publishing_plugin_host_post_error (_tmp4_, _tmp8_); + spit_publishing_plugin_host_post_error (host, _tmp7_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_error_free0 (_tmp8_); + _g_error_free0 (_tmp7_); #line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #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 11452 "GalleryConnector.c" +#line 11552 "GalleryConnector.c" } __finally15: #line 1765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11504,67 +11604,67 @@ 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 11465 "GalleryConnector.c" +#line 11565 "GalleryConnector.c" } #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = host; -#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = mode; -#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = url; -#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = username; + _tmp8_ = builder; #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = key; -#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = builder; -#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = publishing_gallery3_credentials_grid_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, _tmp13_, _tmp14_); + _tmp9_ = publishing_gallery3_credentials_grid_new (host, mode, url, username, key, _tmp8_); #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 = _tmp15_; + self->priv->frame = _tmp9_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = self->priv->frame; + _tmp10_ = self->priv->frame; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp16_); + _tmp11_ = publishing_gallery3_credentials_grid_get_pane_widget (_tmp10_); #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _tmp17_; + _tmp12_ = _tmp11_; #line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp18_) : NULL); + _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp12_) : 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 = _tmp19_; + self->priv->grid_widget = _tmp13_; #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 11501 "GalleryConnector.c" +#line 11591 "GalleryConnector.c" } -PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key) { +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 11508 "GalleryConnector.c" +#line 11604 "GalleryConnector.c" } -void publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self) { +void +publishing_gallery3_credentials_pane_notify_go_back (PublishingGallery3CredentialsPane* self) +{ #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 (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_GO_BACK_SIGNAL], 0); -#line 11517 "GalleryConnector.c" +#line 11615 "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_; - const gchar* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; +void +publishing_gallery3_credentials_pane_notify_login (PublishingGallery3CredentialsPane* self, + const gchar* url, + const gchar* uname, + const gchar* password, + const gchar* key) +{ #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" @@ -11576,20 +11676,14 @@ void publishing_gallery3_credentials_pane_notify_login (PublishingGallery3Creden #line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (key != NULL); #line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = url; -#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = uname; -#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = password; -#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 (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, _tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 11546 "GalleryConnector.c" + g_signal_emit (self, publishing_gallery3_credentials_pane_signals[PUBLISHING_GALLERY3_CREDENTIALS_PANE_LOGIN_SIGNAL], 0, url, uname, password, key); +#line 11638 "GalleryConnector.c" } -static GtkWidget* publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) { +static GtkWidget* +publishing_gallery3_credentials_pane_real_get_widget (SpitPublishingDialogPane* base) +{ PublishingGallery3CredentialsPane * self; GtkWidget* result = NULL; GtkWidget* _tmp0_; @@ -11609,11 +11703,13 @@ 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 11570 "GalleryConnector.c" +#line 11664 "GalleryConnector.c" } -static SpitPublishingDialogPaneGeometryOptions publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { +static SpitPublishingDialogPaneGeometryOptions +publishing_gallery3_credentials_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) +{ PublishingGallery3CredentialsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; #line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11622,25 +11718,37 @@ 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 11583 "GalleryConnector.c" +#line 11679 "GalleryConnector.c" } -static void _publishing_gallery3_credentials_pane_notify_go_back_publishing_gallery3_credentials_grid_go_back (PublishingGallery3CredentialsGrid* _sender, gpointer self) { +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 11590 "GalleryConnector.c" +#line 11689 "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) { +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 11597 "GalleryConnector.c" +#line 11703 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { +static void +publishing_gallery3_credentials_pane_real_on_pane_installed (SpitPublishingDialogPane* base) +{ PublishingGallery3CredentialsPane * self; PublishingGallery3CredentialsGrid* _tmp0_; PublishingGallery3CredentialsGrid* _tmp1_; @@ -11659,11 +11767,13 @@ 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 11620 "GalleryConnector.c" +#line 11728 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { +static void +publishing_gallery3_credentials_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) +{ PublishingGallery3CredentialsPane * self; PublishingGallery3CredentialsGrid* _tmp0_; guint _tmp1_; @@ -11683,11 +11793,18 @@ 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 11644 "GalleryConnector.c" +#line 11754 "GalleryConnector.c" } -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 +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) +{ typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, const char* arg_3, const char* arg_4, gpointer data2); register GMarshalFunc_VOID__STRING_STRING_STRING_STRING callback; register GCClosure * cc; @@ -11702,23 +11819,25 @@ 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 11663 "GalleryConnector.c" +#line 11780 "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 11669 "GalleryConnector.c" +#line 11786 "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 11675 "GalleryConnector.c" +#line 11792 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass) { +static void +publishing_gallery3_credentials_pane_class_init (PublishingGallery3CredentialsPaneClass * klass) +{ #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_pane_parent_class = g_type_class_peek_parent (klass); #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -11729,11 +11848,13 @@ static void publishing_gallery3_credentials_pane_class_init (PublishingGallery3C 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" 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" +#line 11809 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { +static void +publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) +{ #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" @@ -11744,22 +11865,26 @@ static void publishing_gallery3_credentials_pane_spit_publishing_dialog_pane_int 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 11705 "GalleryConnector.c" +#line 11826 "GalleryConnector.c" } -static void publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self) { +static void +publishing_gallery3_credentials_pane_instance_init (PublishingGallery3CredentialsPane * self) +{ #line 1728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_CREDENTIALS_PANE_GET_PRIVATE (self); #line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->frame = NULL; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->grid_widget = NULL; -#line 11716 "GalleryConnector.c" +#line 11839 "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); @@ -11769,11 +11894,13 @@ 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 11730 "GalleryConnector.c" +#line 11855 "GalleryConnector.c" } -GType publishing_gallery3_credentials_pane_get_type (void) { +GType +publishing_gallery3_credentials_pane_get_type (void) +{ static volatile gsize publishing_gallery3_credentials_pane_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_credentials_pane_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsPane), 0, (GInstanceInitFunc) publishing_gallery3_credentials_pane_instance_init, NULL }; @@ -11787,78 +11914,74 @@ 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) { +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 11751 "GalleryConnector.c" +#line 11881 "GalleryConnector.c" } -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_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 11758 "GalleryConnector.c" +#line 11891 "GalleryConnector.c" } -static void _publishing_gallery3_credentials_grid_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { +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 11765 "GalleryConnector.c" +#line 11901 "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* +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_; - const gchar* _tmp1_; + gchar* _tmp0_; + 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_; + GtkBuilder* _tmp3_; + GSList* _tmp4_; + GSList* _tmp5_; + GObject* _tmp6_; + GObject* _tmp7_; + GtkLabel* _tmp8_; + GObject* _tmp9_; + GtkEntry* _tmp10_; + GObject* _tmp11_; + GtkEntry* _tmp12_; + GObject* _tmp13_; + GtkEntry* _tmp14_; GObject* _tmp15_; - GtkBuilder* _tmp16_; + GtkEntry* _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_; + GtkButton* _tmp18_; + GObject* _tmp19_; + GtkButton* _tmp20_; 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_; + GtkEntry* _tmp33_; + GtkEntry* _tmp36_; + GtkButton* _tmp37_; + GtkButton* _tmp38_; + gboolean _tmp39_ = FALSE; + GtkButton* _tmp40_; #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" @@ -11866,313 +11989,267 @@ PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_construc #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self = (PublishingGallery3CredentialsGrid*) g_object_new (object_type, NULL); #line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = host; -#line 1845 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->host = _tmp0_; -#line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = url; + self->priv->host = host; #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp0_ = g_strdup (url); #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->url); #line 1846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->url = _tmp2_; -#line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = key; + self->priv->url = _tmp0_; #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = g_strdup (_tmp3_); + _tmp1_ = g_strdup (key); #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->key); #line 1847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->key = _tmp4_; -#line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = username; + self->priv->key = _tmp1_; #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = g_strdup (_tmp5_); + _tmp2_ = g_strdup (username); #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->username); #line 1848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->username = _tmp6_; + self->priv->username = _tmp2_; #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = builder; -#line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _g_object_ref0 (_tmp7_); + _tmp3_ = _g_object_ref0 (builder); #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->builder); #line 1850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->builder = _tmp8_; -#line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp9_ = builder; + self->priv->builder = _tmp3_; #line 1851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (_tmp9_ != NULL, "builder != null"); -#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp10_ = builder; -#line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp11_ = gtk_builder_get_objects (_tmp10_); + _vala_assert (builder != NULL, "builder != null"); #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp12_ = _tmp11_; + _tmp4_ = gtk_builder_get_objects (builder); #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp13_ = g_slist_length (_tmp12_); + _tmp5_ = _tmp4_; #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _vala_assert (_tmp13_ > ((guint) 0), "builder.get_objects().length() > 0"); + _vala_assert (g_slist_length (_tmp5_) > ((guint) 0), "builder.get_objects().length() > 0"); #line 1852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_slist_free0 (_tmp12_); -#line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp14_ = builder; + _g_slist_free0 (_tmp5_); #line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp15_ = gtk_builder_get_object (_tmp14_, "gallery3_auth_pane_widget"); + _tmp6_ = gtk_builder_get_object (builder, "gallery3_auth_pane_widget"); #line 1855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp15_) : NULL); + publishing_gallery3_credentials_grid_set_pane_widget (self, G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_grid_get_type ()) ? ((GtkGrid*) _tmp6_) : NULL); #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp16_ = builder; + _tmp7_ = gtk_builder_get_object (builder, "intro_message_label"); #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp17_ = gtk_builder_get_object (_tmp16_, "intro_message_label"); -#line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp17_) : NULL); + _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp7_) : NULL); #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->intro_message_label); #line 1856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->intro_message_label = _tmp18_; -#line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp19_ = builder; + self->priv->intro_message_label = _tmp8_; #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp20_ = gtk_builder_get_object (_tmp19_, "url_entry"); + _tmp9_ = gtk_builder_get_object (builder, "url_entry"); #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp20_) : NULL); + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp9_) : NULL); #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->url_entry); #line 1857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->url_entry = _tmp21_; + self->priv->url_entry = _tmp10_; #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp22_ = builder; + _tmp11_ = gtk_builder_get_object (builder, "username_entry"); #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp23_ = gtk_builder_get_object (_tmp22_, "username_entry"); -#line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp23_) : NULL); + _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp11_) : NULL); #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->username_entry); #line 1858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->username_entry = _tmp24_; -#line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp25_ = builder; + self->priv->username_entry = _tmp12_; #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp26_ = gtk_builder_get_object (_tmp25_, "key_entry"); + _tmp13_ = gtk_builder_get_object (builder, "key_entry"); #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL); + _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL); #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->key_entry); #line 1859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->key_entry = _tmp27_; + self->priv->key_entry = _tmp14_; #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp28_ = builder; + _tmp15_ = gtk_builder_get_object (builder, "password_entry"); #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp29_ = gtk_builder_get_object (_tmp28_, "password_entry"); -#line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp29_) : NULL); + _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp15_) : NULL); #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->password_entry); #line 1860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->password_entry = _tmp30_; -#line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp31_ = builder; + self->priv->password_entry = _tmp16_; #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp32_ = gtk_builder_get_object (_tmp31_, "go_back_button"); + _tmp17_ = gtk_builder_get_object (builder, "go_back_button"); #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_button_get_type ()) ? ((GtkButton*) _tmp32_) : NULL); + _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL); #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->go_back_button); #line 1861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->go_back_button = _tmp33_; + self->priv->go_back_button = _tmp18_; #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp34_ = builder; + _tmp19_ = gtk_builder_get_object (builder, "login_button"); #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp35_ = gtk_builder_get_object (_tmp34_, "login_button"); -#line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, gtk_button_get_type ()) ? ((GtkButton*) _tmp35_) : NULL); + _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_button_get_type ()) ? ((GtkButton*) _tmp19_) : NULL); #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->login_button); #line 1862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->login_button = _tmp36_; -#line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp37_ = mode; + self->priv->login_button = _tmp20_; #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - switch (_tmp37_) { + switch (mode) { #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_INTRO: -#line 11960 "GalleryConnector.c" +#line 12049 "GalleryConnector.c" { - GtkLabel* _tmp38_; + GtkLabel* _tmp21_; #line 1867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp38_ = self->priv->intro_message_label; + _tmp21_ = 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); + gtk_label_set_markup (_tmp21_, PUBLISHING_GALLERY3_CREDENTIALS_GRID_INTRO_MESSAGE); #line 1868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11969 "GalleryConnector.c" +#line 12058 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_FAILED_RETRY: -#line 11973 "GalleryConnector.c" +#line 12062 "GalleryConnector.c" { - GtkLabel* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + GtkLabel* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp39_ = self->priv->intro_message_label; + _tmp22_ = self->priv->intro_message_label; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp40_ = g_strdup_printf ("%s\n\n%s", _ ("Unrecognized User"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_FAILED_RETRY_MESSAGE); + _tmp23_ = g_strdup_printf ("%s\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_ = _tmp40_; + _tmp24_ = _tmp23_; #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp39_, _tmp41_); + gtk_label_set_markup (_tmp22_, _tmp24_); #line 1871 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp41_); + _g_free0 (_tmp24_); #line 1873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 11990 "GalleryConnector.c" +#line 12079 "GalleryConnector.c" } #line 1865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" case PUBLISHING_GALLERY3_CREDENTIALS_PANE_MODE_NOT_GALLERY_URL: -#line 11994 "GalleryConnector.c" +#line 12083 "GalleryConnector.c" { - GtkLabel* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; + GtkLabel* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp42_ = self->priv->intro_message_label; + _tmp25_ = self->priv->intro_message_label; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp43_ = g_strdup_printf ("%s\n\n%s", _ (PUBLISHING_GALLERY3_SERVICE_NAME " Site Not Found"), PUBLISHING_GALLERY3_CREDENTIALS_GRID_NOT_GALLERY_URL_MESSAGE); + _tmp26_ = g_strdup_printf ("%s\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" - _tmp44_ = _tmp43_; + _tmp27_ = _tmp26_; #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_label_set_markup (_tmp42_, _tmp44_); + gtk_label_set_markup (_tmp25_, _tmp27_); #line 1876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _g_free0 (_tmp44_); + _g_free0 (_tmp27_); #line 1879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" break; -#line 12011 "GalleryConnector.c" +#line 12100 "GalleryConnector.c" } default: { #line 1882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_error ("GalleryConnector.vala:1882: Invalid CredentialsPane mode"); -#line 12017 "GalleryConnector.c" +#line 12106 "GalleryConnector.c" } } #line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp45_ = url; -#line 1886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - if (_tmp45_ != NULL) { -#line 12024 "GalleryConnector.c" - GtkEntry* _tmp46_; - const gchar* _tmp47_; - GtkEntry* _tmp48_; + if (url != NULL) { +#line 12111 "GalleryConnector.c" + GtkEntry* _tmp28_; + GtkEntry* _tmp29_; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp46_ = self->priv->url_entry; + _tmp28_ = self->priv->url_entry; #line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp47_ = url; -#line 1887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp46_, _tmp47_); + gtk_entry_set_text (_tmp28_, url); #line 1888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp48_ = self->priv->username_entry; + _tmp29_ = 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 (_tmp48_, gtk_widget_get_type (), GtkWidget)); -#line 12038 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget)); +#line 12122 "GalleryConnector.c" } #line 1890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp49_ = self->priv->url_entry; + _tmp30_ = 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 (_tmp49_, 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 (_tmp30_, gtk_editable_get_type (), 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" - _tmp50_ = username; -#line 1892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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" - _tmp51_ = self->priv->username_entry; + if (username != NULL) { +#line 12130 "GalleryConnector.c" + GtkEntry* _tmp31_; + GtkEntry* _tmp32_; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp52_ = username; + _tmp31_ = self->priv->username_entry; #line 1893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp51_, _tmp52_); + gtk_entry_set_text (_tmp31_, username); #line 1894 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp53_ = self->priv->password_entry; + _tmp32_ = 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 (_tmp53_, gtk_widget_get_type (), GtkWidget)); -#line 12062 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); +#line 12141 "GalleryConnector.c" } #line 1896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp54_ = self->priv->username_entry; + _tmp33_ = 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 (_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" - _tmp55_ = key; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_editable_get_type (), 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" - if (_tmp55_ != NULL) { -#line 12072 "GalleryConnector.c" - GtkEntry* _tmp56_; - const gchar* _tmp57_; - GtkEntry* _tmp58_; + if (key != NULL) { +#line 12149 "GalleryConnector.c" + GtkEntry* _tmp34_; + GtkEntry* _tmp35_; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp56_ = self->priv->key_entry; + _tmp34_ = self->priv->key_entry; #line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp57_ = key; -#line 1900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - gtk_entry_set_text (_tmp56_, _tmp57_); + gtk_entry_set_text (_tmp34_, key); #line 1901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp58_ = self->priv->key_entry; + _tmp35_ = 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 (_tmp58_, gtk_widget_get_type (), GtkWidget)); -#line 12086 "GalleryConnector.c" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget)); +#line 12160 "GalleryConnector.c" } #line 1903 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp59_ = self->priv->key_entry; + _tmp36_ = 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 (_tmp59_, 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 (_tmp36_, gtk_editable_get_type (), 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" - _tmp60_ = self->priv->go_back_button; + _tmp37_ = self->priv->go_back_button; #line 1906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_signal_connect_object (_tmp60_, "clicked", (GCallback) _publishing_gallery3_credentials_grid_on_go_back_button_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp37_, "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" - _tmp61_ = self->priv->login_button; + _tmp38_ = self->priv->login_button; #line 1907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - 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" - _tmp63_ = url; + g_signal_connect_object (_tmp38_, "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" - if (_tmp63_ != NULL) { -#line 12104 "GalleryConnector.c" - const gchar* _tmp64_; + if (url != NULL) { #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp64_ = username; -#line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = _tmp64_ != NULL; -#line 12110 "GalleryConnector.c" + _tmp39_ = username != NULL; +#line 12178 "GalleryConnector.c" } else { #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp62_ = FALSE; -#line 12114 "GalleryConnector.c" + _tmp39_ = FALSE; +#line 12182 "GalleryConnector.c" } #line 1908 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp65_ = self->priv->login_button; + _tmp40_ = 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 (_tmp65_, gtk_widget_get_type (), GtkWidget), _tmp62_); + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp39_); #line 1840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12122 "GalleryConnector.c" +#line 12190 "GalleryConnector.c" } -PublishingGallery3CredentialsGrid* publishing_gallery3_credentials_grid_new (SpitPublishingPluginHost* host, PublishingGallery3CredentialsPaneMode mode, const gchar* url, const gchar* username, const gchar* key, GtkBuilder* builder) { +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 12129 "GalleryConnector.c" +#line 12204 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) { +static void +publishing_gallery3_credentials_grid_on_login_button_clicked (PublishingGallery3CredentialsGrid* self) +{ GtkEntry* _tmp0_; const gchar* _tmp1_; GtkEntry* _tmp2_; @@ -12201,20 +12278,24 @@ static void publishing_gallery3_credentials_grid_on_login_button_clicked (Publis _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_signal_emit (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_, _tmp5_, _tmp7_); -#line 12162 "GalleryConnector.c" +#line 12239 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self) { +static void +publishing_gallery3_credentials_grid_on_go_back_button_clicked (PublishingGallery3CredentialsGrid* self) +{ #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 (self, publishing_gallery3_credentials_grid_signals[PUBLISHING_GALLERY3_CREDENTIALS_GRID_GO_BACK_SIGNAL], 0); -#line 12171 "GalleryConnector.c" +#line 12250 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) { +static void +publishing_gallery3_credentials_grid_on_url_or_username_changed (PublishingGallery3CredentialsGrid* self) +{ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GtkEntry* _tmp2_; @@ -12228,7 +12309,7 @@ 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 12189 "GalleryConnector.c" +#line 12270 "GalleryConnector.c" GtkEntry* _tmp4_; const gchar* _tmp5_; #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12237,17 +12318,17 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub _tmp5_ = gtk_entry_get_text (_tmp4_); #line 1923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = g_strcmp0 (_tmp5_, "") != 0; -#line 12198 "GalleryConnector.c" +#line 12279 "GalleryConnector.c" } else { #line 1922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp1_ = FALSE; -#line 12202 "GalleryConnector.c" +#line 12283 "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 12208 "GalleryConnector.c" +#line 12289 "GalleryConnector.c" } else { GtkEntry* _tmp6_; const gchar* _tmp7_; @@ -12257,17 +12338,19 @@ static void publishing_gallery3_credentials_grid_on_url_or_username_changed (Pub _tmp7_ = gtk_entry_get_text (_tmp6_); #line 1924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _tmp0_ = g_strcmp0 (_tmp7_, "") != 0; -#line 12218 "GalleryConnector.c" +#line 12299 "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 12224 "GalleryConnector.c" +#line 12305 "GalleryConnector.c" } -void publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) { +void +publishing_gallery3_credentials_grid_installed (PublishingGallery3CredentialsGrid* self) +{ SpitPublishingPluginHost* _tmp0_; SpitPublishingPluginHost* _tmp1_; GtkButton* _tmp2_; @@ -12283,11 +12366,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 12244 "GalleryConnector.c" +#line 12327 "GalleryConnector.c" } -GtkGrid* publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) { +GtkGrid* +publishing_gallery3_credentials_grid_get_pane_widget (PublishingGallery3CredentialsGrid* self) +{ GtkGrid* result; GtkGrid* _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12298,34 +12383,36 @@ 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 12259 "GalleryConnector.c" +#line 12344 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, GtkGrid* value) { +static void +publishing_gallery3_credentials_grid_set_pane_widget (PublishingGallery3CredentialsGrid* self, + GtkGrid* value) +{ #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" if (publishing_gallery3_credentials_grid_get_pane_widget (self) != value) { -#line 12268 "GalleryConnector.c" +#line 12356 "GalleryConnector.c" GtkGrid* _tmp0_; - GtkGrid* _tmp1_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = value; -#line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (value); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (self->priv->_pane_widget); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_pane_widget = _tmp1_; + self->priv->_pane_widget = _tmp0_; #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_object_notify ((GObject *) self, "pane-widget"); -#line 12281 "GalleryConnector.c" + g_object_notify_by_pspec ((GObject *) self, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY]); +#line 12366 "GalleryConnector.c" } } -static void publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass) { +static void +publishing_gallery3_credentials_grid_class_init (PublishingGallery3CredentialsGridClass * klass) +{ #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_credentials_grid_parent_class = g_type_class_peek_parent (klass); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12337,16 +12424,18 @@ 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_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)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY, publishing_gallery3_credentials_grid_properties[PUBLISHING_GALLERY3_CREDENTIALS_GRID_PANE_WIDGET_PROPERTY] = g_param_spec_object ("pane-widget", "pane-widget", "pane-widget", gtk_grid_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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" 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" +#line 12390 "GalleryConnector.c" } -static void publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self) { +static void +publishing_gallery3_credentials_grid_instance_init (PublishingGallery3CredentialsGrid * self) +{ #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_CREDENTIALS_GRID_GET_PRIVATE (self); #line 1821 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12375,11 +12464,13 @@ 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 12336 "GalleryConnector.c" +#line 12425 "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); @@ -12409,11 +12500,13 @@ 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 12370 "GalleryConnector.c" +#line 12461 "GalleryConnector.c" } -GType publishing_gallery3_credentials_grid_get_type (void) { +GType +publishing_gallery3_credentials_grid_get_type (void) +{ static volatile gsize publishing_gallery3_credentials_grid_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_credentials_grid_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3CredentialsGridClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_credentials_grid_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3CredentialsGrid), 0, (GInstanceInitFunc) publishing_gallery3_credentials_grid_instance_init, NULL }; @@ -12425,7 +12518,12 @@ GType publishing_gallery3_credentials_grid_get_type (void) { } -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_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ PublishingGallery3CredentialsGrid * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12436,18 +12534,23 @@ static void _vala_publishing_gallery3_credentials_grid_get_property (GObject * o 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 12397 "GalleryConnector.c" +#line 12495 "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 12403 "GalleryConnector.c" +#line 12501 "GalleryConnector.c" } } -static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { +static void +_vala_publishing_gallery3_credentials_grid_set_property (GObject * object, + guint property_id, + const GValue * value, + GParamSpec * pspec) +{ PublishingGallery3CredentialsGrid * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_GALLERY3_TYPE_CREDENTIALS_GRID, PublishingGallery3CredentialsGrid); #line 1816 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12458,35 +12561,41 @@ static void _vala_publishing_gallery3_credentials_grid_set_property (GObject * o 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 12419 "GalleryConnector.c" +#line 12522 "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 12425 "GalleryConnector.c" +#line 12528 "GalleryConnector.c" } } -PublishingGallery3Session* publishing_gallery3_session_construct (GType object_type) { +PublishingGallery3Session* +publishing_gallery3_session_construct (GType object_type) +{ PublishingGallery3Session* self = NULL; #line 1942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" 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 12436 "GalleryConnector.c" +#line 12541 "GalleryConnector.c" } -PublishingGallery3Session* publishing_gallery3_session_new (void) { +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 12443 "GalleryConnector.c" +#line 12550 "GalleryConnector.c" } -static gboolean publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) { +static gboolean +publishing_gallery3_session_real_is_authenticated (PublishingRESTSupportSession* base) +{ PublishingGallery3Session * self; gboolean result = FALSE; const gchar* _tmp0_; @@ -12498,14 +12607,16 @@ 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 12459 "GalleryConnector.c" +#line 12568 "GalleryConnector.c" } -void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, const gchar* gallery_url, const gchar* username, const gchar* key) { - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; +void +publishing_gallery3_session_authenticate (PublishingGallery3Session* self, + const gchar* gallery_url, + const gchar* username, + const gchar* key) +{ #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" @@ -12515,24 +12626,20 @@ void publishing_gallery3_session_authenticate (PublishingGallery3Session* self, #line 1949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (key != NULL); #line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = gallery_url; -#line 1950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_set_url (self, _tmp0_); -#line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = username; + publishing_gallery3_session_set_url (self, gallery_url); #line 1951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_set_username (self, _tmp1_); + publishing_gallery3_session_set_username (self, username); #line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = key; -#line 1952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - publishing_gallery3_session_set_key (self, _tmp2_); + publishing_gallery3_session_set_key (self, key); #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 12489 "GalleryConnector.c" +#line 12594 "GalleryConnector.c" } -void publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self) { +void +publishing_gallery3_session_deauthenticate (PublishingGallery3Session* self) +{ #line 1957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" g_return_if_fail (PUBLISHING_GALLERY3_IS_SESSION (self)); #line 1958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12541,11 +12648,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 12502 "GalleryConnector.c" +#line 12609 "GalleryConnector.c" } -const gchar* publishing_gallery3_session_get_url (PublishingGallery3Session* self) { +const gchar* +publishing_gallery3_session_get_url (PublishingGallery3Session* self) +{ const gchar* result; const gchar* _tmp0_; #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12556,28 +12665,30 @@ 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 12517 "GalleryConnector.c" +#line 12626 "GalleryConnector.c" } -static void publishing_gallery3_session_set_url (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_session_set_url (PublishingGallery3Session* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_url); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_url = _tmp1_; -#line 12534 "GalleryConnector.c" + self->priv->_url = _tmp0_; +#line 12643 "GalleryConnector.c" } -const gchar* publishing_gallery3_session_get_username (PublishingGallery3Session* self) { +const gchar* +publishing_gallery3_session_get_username (PublishingGallery3Session* self) +{ const gchar* result; const gchar* _tmp0_; #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12588,28 +12699,30 @@ 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 12549 "GalleryConnector.c" +#line 12660 "GalleryConnector.c" } -static void publishing_gallery3_session_set_username (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_session_set_username (PublishingGallery3Session* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_username); #line 1939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_username = _tmp1_; -#line 12566 "GalleryConnector.c" + self->priv->_username = _tmp0_; +#line 12677 "GalleryConnector.c" } -const gchar* publishing_gallery3_session_get_key (PublishingGallery3Session* self) { +const gchar* +publishing_gallery3_session_get_key (PublishingGallery3Session* self) +{ const gchar* result; const gchar* _tmp0_; #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12620,28 +12733,30 @@ 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 12581 "GalleryConnector.c" +#line 12694 "GalleryConnector.c" } -static void publishing_gallery3_session_set_key (PublishingGallery3Session* self, const gchar* value) { - const gchar* _tmp0_; - gchar* _tmp1_; +static void +publishing_gallery3_session_set_key (PublishingGallery3Session* self, + const gchar* value) +{ + gchar* _tmp0_; #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" - _tmp0_ = value; -#line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_free0 (self->priv->_key); #line 1940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_key = _tmp1_; -#line 12598 "GalleryConnector.c" + self->priv->_key = _tmp0_; +#line 12711 "GalleryConnector.c" } -static void publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass) { +static void +publishing_gallery3_session_class_init (PublishingGallery3SessionClass * klass) +{ #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_session_parent_class = g_type_class_peek_parent (klass); #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12650,11 +12765,13 @@ static void publishing_gallery3_session_class_init (PublishingGallery3SessionCla 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 12611 "GalleryConnector.c" +#line 12726 "GalleryConnector.c" } -static void publishing_gallery3_session_instance_init (PublishingGallery3Session * self) { +static void +publishing_gallery3_session_instance_init (PublishingGallery3Session * self) +{ #line 1935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv = PUBLISHING_GALLERY3_SESSION_GET_PRIVATE (self); #line 1938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12663,11 +12780,13 @@ 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 12624 "GalleryConnector.c" +#line 12741 "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); @@ -12679,11 +12798,13 @@ 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 12640 "GalleryConnector.c" +#line 12759 "GalleryConnector.c" } -GType publishing_gallery3_session_get_type (void) { +GType +publishing_gallery3_session_get_type (void) +{ static volatile gsize publishing_gallery3_session_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_session_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Session), 0, (GInstanceInitFunc) publishing_gallery3_session_instance_init, NULL }; @@ -12695,66 +12816,69 @@ 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* +publishing_gallery3_uploader_construct (GType object_type, + PublishingGallery3Session* session, + SpitPublishingPublishable** publishables, + int publishables_length1, + PublishingGallery3PublishingParameters* parameters) +{ PublishingGallery3Uploader* self = NULL; - PublishingGallery3Session* _tmp0_; - SpitPublishingPublishable** _tmp1_; - gint _tmp1__length1; - PublishingGallery3PublishingParameters* _tmp2_; - PublishingGallery3PublishingParameters* _tmp3_; + PublishingGallery3PublishingParameters* _tmp0_; #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" g_return_val_if_fail (PUBLISHING_GALLERY3_IS_PUBLISHING_PARAMETERS (parameters), NULL); #line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp0_ = session; -#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishables; -#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1__length1 = publishables_length1; -#line 1994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1); + self = (PublishingGallery3Uploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (session, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), publishables, publishables_length1); #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = parameters; -#line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = _publishing_gallery3_publishing_parameters_ref0 (_tmp2_); + _tmp0_ = _publishing_gallery3_publishing_parameters_ref0 (parameters); #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_gallery3_publishing_parameters_unref0 (self->priv->parameters); #line 1996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->parameters = _tmp3_; + self->priv->parameters = _tmp0_; #line 1990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return self; -#line 12685 "GalleryConnector.c" +#line 12800 "GalleryConnector.c" } -PublishingGallery3Uploader* publishing_gallery3_uploader_new (PublishingGallery3Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingGallery3PublishingParameters* parameters) { +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 12692 "GalleryConnector.c" +#line 12812 "GalleryConnector.c" } -static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { +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 12699 "GalleryConnector.c" +#line 12821 "GalleryConnector.c" } -static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) { +static PublishingRESTSupportTransaction* +publishing_gallery3_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, + SpitPublishingPublishable* publishable) +{ PublishingGallery3Uploader * self; PublishingRESTSupportTransaction* result = NULL; SpitPublishingPublishable* p = NULL; SpitPublishingPublishable* _tmp0_; gchar* _tmp1_; - SpitPublishingPublisherMediaType _tmp2_; - PublishingRESTSupportSession* _tmp3_; - PublishingGallery3Session* _tmp4_; - PublishingGallery3PublishingParameters* _tmp5_; - PublishingGallery3GalleryUploadTransaction* _tmp6_; + PublishingRESTSupportSession* _tmp2_; + PublishingGallery3Session* _tmp3_; + PublishingGallery3PublishingParameters* _tmp4_; + PublishingGallery3GalleryUploadTransaction* _tmp5_; + PublishingRESTSupportTransaction* _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" @@ -12770,38 +12894,38 @@ static PublishingRESTSupportTransaction* publishing_gallery3_uploader_real_creat #line 2004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" self->priv->_current_publishable_name = _tmp1_; #line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = spit_publishing_publishable_get_media_type (p); -#line 2006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_current_media_type = _tmp2_; + self->priv->_current_media_type = spit_publishing_publishable_get_media_type (p); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp3_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); + _tmp2_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); + _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_GALLERY3_TYPE_SESSION, PublishingGallery3Session); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = self->priv->parameters; + _tmp4_ = self->priv->parameters; #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = publishing_gallery3_gallery_upload_transaction_new (_tmp4_, _tmp5_, p); + _tmp5_ = publishing_gallery3_gallery_upload_transaction_new (_tmp3_, _tmp4_, p); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _publishing_rest_support_transaction_unref0 (self->priv->_current_transaction); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); + self->priv->_current_transaction = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); #line 2008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _publishing_rest_support_session_unref0 (_tmp4_); + _publishing_rest_support_session_unref0 (_tmp3_); #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = self->priv->_current_transaction; + _tmp6_ = self->priv->_current_transaction; #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp8_ = _publishing_rest_support_transaction_ref0 (_tmp7_); + _tmp7_ = _publishing_rest_support_transaction_ref0 (_tmp6_); #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp8_; + result = _tmp7_; #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" _g_object_unref0 (p); #line 2011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12758 "GalleryConnector.c" +#line 12880 "GalleryConnector.c" } -const gchar* publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) { +const gchar* +publishing_gallery3_uploader_get_current_publishable_name (PublishingGallery3Uploader* self) +{ const gchar* result; const gchar* _tmp0_; #line 1974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12812,29 +12936,30 @@ 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 12773 "GalleryConnector.c" +#line 12897 "GalleryConnector.c" } -guint publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) { +guint +publishing_gallery3_uploader_get_status_code (PublishingGallery3Uploader* self) +{ guint result; 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" _tmp0_ = self->priv->_current_transaction; #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = publishing_rest_support_transaction_get_status_code (_tmp0_); -#line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp1_; + result = publishing_rest_support_transaction_get_status_code (_tmp0_); #line 1980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12791 "GalleryConnector.c" +#line 12914 "GalleryConnector.c" } -SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) { +SpitPublishingPublisherMediaType +publishing_gallery3_uploader_get_current_publishable_type (PublishingGallery3Uploader* self) +{ SpitPublishingPublisherMediaType result; SpitPublishingPublisherMediaType _tmp0_; #line 1985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12845,11 +12970,13 @@ SpitPublishingPublisherMediaType publishing_gallery3_uploader_get_current_publis result = _tmp0_; #line 1986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12806 "GalleryConnector.c" +#line 12931 "GalleryConnector.c" } -static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass) { +static void +publishing_gallery3_uploader_class_init (PublishingGallery3UploaderClass * klass) +{ #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" publishing_gallery3_uploader_parent_class = g_type_class_peek_parent (klass); #line 1965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" @@ -12858,18 +12985,22 @@ static void publishing_gallery3_uploader_class_init (PublishingGallery3UploaderC 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 12819 "GalleryConnector.c" +#line 12946 "GalleryConnector.c" } -static void publishing_gallery3_uploader_instance_init (PublishingGallery3Uploader * self) { +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 12826 "GalleryConnector.c" +#line 12955 "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); @@ -12881,11 +13012,13 @@ 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 12842 "GalleryConnector.c" +#line 12973 "GalleryConnector.c" } -GType publishing_gallery3_uploader_get_type (void) { +GType +publishing_gallery3_uploader_get_type (void) +{ static volatile gsize publishing_gallery3_uploader_type_id__volatile = 0; if (g_once_init_enter (&publishing_gallery3_uploader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PublishingGallery3UploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_gallery3_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingGallery3Uploader), 0, (GInstanceInitFunc) publishing_gallery3_uploader_instance_init, NULL }; @@ -12897,97 +13030,85 @@ GType publishing_gallery3_uploader_get_type (void) { } -static gint string_last_index_of (const gchar* self, const gchar* needle, gint start_index) { +static gint +string_last_index_of (const gchar* self, + const gchar* needle, + gint start_index) +{ gint result = 0; gchar* _result_ = NULL; - gint _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gchar* _tmp1_; +#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1021 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1035 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = start_index; -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = needle; -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 1022 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _result_ = _tmp2_; -#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = _result_; -#line 1024 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ != NULL) { -#line 12881 "GalleryConnector.c" - gchar* _tmp4_; -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = _result_; -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1025 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strrstr (((gchar*) self) + start_index, (gchar*) needle); +#line 1036 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _result_ = _tmp0_; +#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = _result_; +#line 1038 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ != NULL) { +#line 13012 "GalleryConnector.c" + gchar* _tmp2_; +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _result_; +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (gint) (_tmp2_ - ((gchar*) self)); +#line 1039 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 12889 "GalleryConnector.c" +#line 13020 "GalleryConnector.c" } else { -#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = -1; -#line 1027 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1041 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 12895 "GalleryConnector.c" +#line 13026 "GalleryConnector.c" } } -gchar* publishing_gallery3_strip_session_url (const gchar* url) { +gchar* +publishing_gallery3_strip_session_url (const gchar* url) +{ gchar* result = NULL; - const gchar* _tmp0_; gint item_loc = 0; - const gchar* _tmp1_; - gint _tmp2_; - const gchar* _tmp4_; - gint _tmp5_; - gint _tmp6_; - gchar* _tmp7_; + gint _tmp0_; + gint _tmp1_; + gchar* _tmp2_; #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" - _tmp0_ = url; -#line 2020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, _tmp0_); -#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp1_ = url; + g_debug ("GalleryConnector.vala:2020: Searching for \"%s\" in \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url); #line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp2_ = string_last_index_of (_tmp1_, PUBLISHING_GALLERY3_REST_PATH, 0); -#line 2022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - item_loc = _tmp2_; + item_loc = string_last_index_of (url, PUBLISHING_GALLERY3_REST_PATH, 0); #line 2025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" if (-1 == item_loc) { -#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 12930 "GalleryConnector.c" + g_error ("Did not find \"%s\" in the base of the new item " "URL \"%s\"", PUBLISHING_GALLERY3_REST_PATH, url); +#line 13049 "GalleryConnector.c" } #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp4_ = url; -#line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp5_ = strlen (PUBLISHING_GALLERY3_REST_PATH); + _tmp0_ = strlen (PUBLISHING_GALLERY3_REST_PATH); #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp6_ = _tmp5_; + _tmp1_ = _tmp0_; #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - _tmp7_ = string_substring (_tmp4_, (glong) (item_loc + _tmp6_), (glong) -1); + _tmp2_ = string_substring (url, (glong) (item_loc + _tmp1_), (glong) -1); #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" - result = _tmp7_; + result = _tmp2_; #line 2029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala" return result; -#line 12944 "GalleryConnector.c" +#line 13061 "GalleryConnector.c" } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -12999,7 +13120,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -- cgit v1.2.3