Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

6 files changed, 12 insertions, 12 deletions

diff --git a/plugins/authenticator/shotwell-authenticator.h b/plugins/authenticator/shotwell-authenticator.h
index c2e469c..d73d0d0 100644
--- a/plugins/authenticator/shotwell-authenticator.h
+++ b/plugins/authenticator/shotwell-authenticator.h
@@ -1,4 +1,4 @@
-/* shotwell-authenticator.h generated by valac 0.34.4, the Vala compiler, do not modify */
+/* shotwell-authenticator.h generated by valac 0.34.7, the Vala compiler, do not modify */
 
 
 #ifndef __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__
diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi
index a978f84..3271694 100644
--- a/plugins/authenticator/shotwell-authenticator.vapi
+++ b/plugins/authenticator/shotwell-authenticator.vapi
@@ -1,4 +1,4 @@
-/* shotwell-authenticator.vapi generated by valac 0.34.4, do not modify. */
+/* shotwell-authenticator.vapi generated by valac 0.34.7, do not modify. */
 
 namespace Publishing {
 	namespace Authenticator {
diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
index 8db6ac0..967e976 100644
--- a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FacebookPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler
+/* FacebookPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler
  * generated from FacebookPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1345,7 +1345,7 @@ static void publishing_authenticator_shotwell_facebook_web_authentication_pane_c
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize;
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index 033eb84..d0d74d4 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -1,4 +1,4 @@
-/* FlickrPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler
+/* FlickrPublishingAuthenticator.c generated by valac 0.34.7, the Vala compiler
  * generated from FlickrPublishingAuthenticator.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -462,7 +462,7 @@ static void publishing_authenticator_shotwell_flickr_transaction_class_init (Pub
 #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_authenticator_shotwell_flickr_transaction_real_execute;
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
 #line 464 "FlickrPublishingAuthenticator.c"
 }
 
@@ -1499,7 +1499,7 @@ static void publishing_authenticator_shotwell_flickr_session_class_init (Publish
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate));
 #line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
 #line 1497 "FlickrPublishingAuthenticator.c"
 }
 
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 938d8c4..400d4f1 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1,4 +1,4 @@
-/* GoogleAuthenticator.c generated by valac 0.34.4, the Vala compiler
+/* GoogleAuthenticator.c generated by valac 0.34.7, the Vala compiler
  * generated from GoogleAuthenticator.vala, do not modify */
 
 
@@ -586,7 +586,7 @@ static void publishing_authenticator_shotwell_google_web_authentication_pane_cla
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
 #line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -677,7 +677,7 @@ static void publishing_authenticator_shotwell_google_session_class_init (Publish
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize;
 #line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_authenticator_shotwell_google_session_real_is_authenticated;
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
 #line 681 "GoogleAuthenticator.c"
 }
 
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index fe03b0e..248c757 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -1,4 +1,4 @@
-/* ShotwellAuthenticatorFactory.c generated by valac 0.34.4, the Vala compiler
+/* ShotwellAuthenticatorFactory.c generated by valac 0.34.7, the Vala compiler
  * generated from ShotwellAuthenticatorFactory.vala, do not modify */
 
 
@@ -135,7 +135,7 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 #line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	list = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"