Merge branch 'feature/upstream' into develop

1 files changed, 205 insertions, 72 deletions

diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index a4e0d62..f1561a0 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -1,4 +1,4 @@
-/* shotwell-plugin-common.h generated by valac 0.36.6, the Vala compiler, do not modify */
+/* shotwell-plugin-common.h generated by valac 0.40.4, the Vala compiler, do not modify */
 
 
 #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__
@@ -345,100 +345,193 @@ struct _ShotwellPluginsCommonBuilderPaneClass {
 };
 
 
-gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key,
+                                          const gchar* message);
 gpointer publishing_rest_support_session_ref (gpointer instance);
 void publishing_rest_support_session_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name,
+                                                        const gchar* nick,
+                                                        const gchar* blurb,
+                                                        GType object_type,
+                                                        GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value,
+                                                gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value,
+                                                 gpointer v_object);
 gpointer publishing_rest_support_value_get_session (const GValue* value);
 GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
-void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type,
+                                                                         const gchar* endpoint_url);
+void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self,
+                                                                   SoupMessage* message);
 void publishing_rest_support_session_notify_authenticated (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err);
+void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self,
+                                                                   GError* err);
 gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
 gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self);
 void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
 gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
-void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
+void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self,
+                                                        SoupMessage* message);
 void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
 GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
 PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
 gpointer publishing_rest_support_argument_ref (gpointer instance);
 void publishing_rest_support_argument_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name,
+                                                         const gchar* nick,
+                                                         const gchar* blurb,
+                                                         GType object_type,
+                                                         GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value,
+                                                 gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value,
+                                                  gpointer v_object);
 gpointer publishing_rest_support_value_get_argument (const GValue* value);
 GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
-PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
-gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
-gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
-PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key,
+                                                                     const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type,
+                                                                           const gchar* key,
+                                                                           const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args,
+                                                        int args_length1,
+                                                        gboolean escape,
+                                                        const gchar* separator);
+gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1,
+                                               PublishingRESTSupportArgument* arg2);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray,
+                                                                       int inputArray_length1,
+                                                                       int* result_length1);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self,
+                                                   gboolean escape);
 gpointer publishing_rest_support_transaction_ref (gpointer instance);
 void publishing_rest_support_transaction_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name,
+                                                            const gchar* nick,
+                                                            const gchar* blurb,
+                                                            GType object_type,
+                                                            GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value,
+                                                    gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value,
+                                                     gpointer v_object);
 gpointer publishing_rest_support_value_get_transaction (const GValue* value);
 GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert);
-void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
-void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed);
-void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session,
+                                                                           PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type,
+                                                                                 PublishingRESTSupportSession* parent_session,
+                                                                                 PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session,
+                                                                                             const gchar* endpoint_url,
+                                                                                             PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type,
+                                                                                                   PublishingRESTSupportSession* parent_session,
+                                                                                                   const gchar* endpoint_url,
+                                                                                                   PublishingRESTSupportHttpMethod method);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self,
+                                                                          GTlsCertificate* * cert);
+void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self,
+                                                         SoupMessage* message,
+                                                         GError** error);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self,
+                                                                                   int* result_length1);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self,
+                                                                                          int* result_length1);
+void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self,
+                                                          gboolean is_executed);
+void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self,
+                                               GError** error);
 PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
-void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length);
-void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self,
+                                                     const gchar* key,
+                                                     const gchar* value);
+void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self,
+                                                             const gchar* custom_payload,
+                                                             const gchar* payload_content_type,
+                                                             gulong payload_length);
+void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self,
+                                                      SoupMessage* message);
 gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self);
 guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self,
+                                                  GError** error);
 gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
 SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self);
 SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self);
-void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self,
+                                                       const gchar* name,
+                                                       const gchar* value);
 gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
 PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
 GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
-void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session,
+                                                                                        SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type,
+                                                                                              PublishingRESTSupportSession* session,
+                                                                                              SpitPublishingPublishable* publishable);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session,
+                                                                                                          SpitPublishingPublishable* publishable,
+                                                                                                          const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type,
+                                                                                                                PublishingRESTSupportSession* session,
+                                                                                                                SpitPublishingPublishable* publishable,
+                                                                                                                const gchar* endpoint_url);
+void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self,
+                                                                              GHashTable* new_disp_table);
 gpointer publishing_rest_support_xml_document_ref (gpointer instance);
 void publishing_rest_support_xml_document_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
+                                                             const gchar* nick,
+                                                             const gchar* blurb,
+                                                             GType object_type,
+                                                             GParamFlags flags);
+void publishing_rest_support_value_set_xml_document (GValue* value,
+                                                     gpointer v_object);
+void publishing_rest_support_value_take_xml_document (GValue* value,
+                                                      gpointer v_object);
 gpointer publishing_rest_support_value_get_xml_document (const GValue* value);
 GType publishing_rest_support_xml_document_get_type (void) G_GNUC_CONST;
 xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self);
-xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error);
-gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error);
-PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error);
+xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self,
+                                                               xmlNode* parent,
+                                                               const gchar* child_name,
+                                                               GError** error);
+gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self,
+                                                                xmlNode* node,
+                                                                const gchar* property_key,
+                                                                GError** error);
+PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string,
+                                                                                     PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response,
+                                                                                     void* check_for_error_response_target,
+                                                                                     GError** error);
 gchar* publishing_rest_support_decimal_entity_encode (const gchar* source);
 gpointer publishing_rest_support_batch_uploader_ref (gpointer instance);
 void publishing_rest_support_batch_uploader_unref (gpointer instance);
-GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object);
-void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object);
+GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name,
+                                                               const gchar* nick,
+                                                               const gchar* blurb,
+                                                               GType object_type,
+                                                               GParamFlags flags);
+void publishing_rest_support_value_set_batch_uploader (GValue* value,
+                                                       gpointer v_object);
+void publishing_rest_support_value_take_batch_uploader (GValue* value,
+                                                        gpointer v_object);
 gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value);
 GType publishing_rest_support_batch_uploader_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
+PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type,
+                                                                                      PublishingRESTSupportSession* session,
+                                                                                      SpitPublishingPublishable** publishables,
+                                                                                      int publishables_length1);
 PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self);
 SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self);
-PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
-void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
+PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self,
+                                                                                             SpitPublishingPublishable* publishable);
+void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self,
+                                                    SpitPublishingProgressCallback status_updated,
+                                                    void* status_updated_target);
 gchar* publishing_rest_support_asciify_string (const gchar* s);
 GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self);
@@ -446,7 +539,10 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
 GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
+PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type,
+                                                                                          SpitPublishingService* service,
+                                                                                          SpitPublishingPluginHost* host,
+                                                                                          const gchar* scope);
 SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
@@ -456,17 +552,36 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
 void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self);
 void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self);
 GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session,
+                                                                                                                                      const gchar* endpoint_url,
+                                                                                                                                      PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type,
+                                                                                                                                            PublishingRESTSupportGoogleSession* session,
+                                                                                                                                            const gchar* endpoint_url,
+                                                                                                                                            PublishingRESTSupportHttpMethod method);
 GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
 PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri);
-void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type,
+                                                                                      const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self,
+                                                                                      const gchar* token,
+                                                                                      const gchar* secret,
+                                                                                      const gchar* username);
 void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
-void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret);
-gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1);
-void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret);
-void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self,
+                                                                 const gchar* consumer_key,
+                                                                 const gchar* consumer_secret);
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self,
+                                                                PublishingRESTSupportTransaction* txn,
+                                                                PublishingRESTSupportArgument** extra_arguments,
+                                                                int extra_arguments_length1);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+                                                                           const gchar* token,
+                                                                           const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self,
+                                                                          const gchar* token,
+                                                                          const gchar* secret,
+                                                                          const gchar* username);
 gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
 gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
 gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
@@ -476,14 +591,29 @@ gboolean publishing_rest_support_oauth1_session_has_access_phase_token (Publishi
 gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self);
 gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self);
 GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                        PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type,
+                                                                                              PublishingRESTSupportOAuth1Session* session,
+                                                                                              PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session,
+                                                                                                 const gchar* uri,
+                                                                                                 PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type,
+                                                                                                       PublishingRESTSupportOAuth1Session* session,
+                                                                                                       const gchar* uri,
+                                                                                                       PublishingRESTSupportHttpMethod method);
 GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
-void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session,
+                                                                                                     SpitPublishingPublishable* publishable,
+                                                                                                     const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type,
+                                                                                                           PublishingRESTSupportOAuth1Session* session,
+                                                                                                           SpitPublishingPublishable* publishable,
+                                                                                                           const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self,
+                                                                                       const gchar* key,
+                                                                                       const gchar* value);
 gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
 void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
 #define RESOURCES_WEBSITE_NAME _ ("Visit the Shotwell home page")
@@ -511,11 +641,14 @@ void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingREST
 "c., \n" \
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 #define RESOURCES_TRANSLATORS _ ("translator-credits")
-GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
+GdkPixbuf** resources_load_icon_set (GFile* icon_file,
+                                     int* result_length1);
+GdkPixbuf** resources_load_from_resource (const gchar* resource_path,
+                                          int* result_length1);
 GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
 void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
-void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self,
+                                                                 GdkCursorType type);
 WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
 ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
 SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);