Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 176 insertions, 110 deletions

diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index 2d42463..a9568e0 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -1,7 +1,8 @@
-/* ShotwellAuthenticatorFactory.c generated by valac 0.36.6, the Vala compiler
+/* ShotwellAuthenticatorFactory.c generated by valac 0.40.4, the Vala compiler
  * generated from ShotwellAuthenticatorFactory.vala, do not modify */
 
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -21,8 +22,23 @@
 typedef struct _PublishingAuthenticatorFactory PublishingAuthenticatorFactory;
 typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFactoryClass;
 typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
+enum  {
+	PUBLISHING_AUTHENTICATOR_FACTORY_0_PROPERTY,
+	PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES
+};
+static GParamSpec* publishing_authenticator_factory_properties[PUBLISHING_AUTHENTICATOR_FACTORY_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+
+typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
+
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr))
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrClass))
@@ -53,6 +69,16 @@ typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingA
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
 
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR (publishing_authenticator_shotwell_tumblr_tumblr_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblr PublishingAuthenticatorShotwellTumblrTumblr;
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblrClass PublishingAuthenticatorShotwellTumblrTumblrClass;
+
 struct _PublishingAuthenticatorFactory {
 	GObject parent_instance;
 	PublishingAuthenticatorFactoryPrivate * priv;
@@ -69,34 +95,49 @@ static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance
 static SpitPublishingAuthenticatorFactoryIface * publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
 
 GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_FACTORY_DUMMY_PROPERTY
-};
 PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void);
 PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void);
 PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type);
 static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base);
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host);
+static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+                                                                           const gchar* provider,
+                                                                           SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type,
+                                                                                                                SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
-PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope,
+                                                                                                  const gchar* welcome_message,
+                                                                                                  SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type,
+                                                                                                        const gchar* scope,
+                                                                                                        const gchar* welcome_message,
+                                                                                                        SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type,
+                                                                                                        SpitPublishingPluginHost* host);
+GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
 static void publishing_authenticator_factory_finalize (GObject * obj);
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 96 "ShotwellAuthenticatorFactory.c"
+#line 135 "ShotwellAuthenticatorFactory.c"
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_get_instance (void)
+{
 	PublishingAuthenticatorFactory* result = NULL;
 	PublishingAuthenticatorFactory* _tmp0_;
 	PublishingAuthenticatorFactory* _tmp2_;
@@ -105,7 +146,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	_tmp0_ = publishing_authenticator_factory_instance;
 #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	if (_tmp0_ == NULL) {
-#line 109 "ShotwellAuthenticatorFactory.c"
+#line 150 "ShotwellAuthenticatorFactory.c"
 		PublishingAuthenticatorFactory* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		_tmp1_ = publishing_authenticator_factory_new ();
@@ -113,7 +154,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 		_g_object_unref0 (publishing_authenticator_factory_instance);
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		publishing_authenticator_factory_instance = _tmp1_;
-#line 117 "ShotwellAuthenticatorFactory.c"
+#line 158 "ShotwellAuthenticatorFactory.c"
 	}
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp2_ = publishing_authenticator_factory_instance;
@@ -123,11 +164,13 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	result = _tmp3_;
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 127 "ShotwellAuthenticatorFactory.c"
+#line 168 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base) {
+static GeeList*
+publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base)
+{
 	PublishingAuthenticatorFactory * self;
 	GeeList* result = NULL;
 	GeeArrayList* list = NULL;
@@ -146,194 +189,217 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "picasa");
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "youtube");
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "tumblr");
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 154 "ShotwellAuthenticatorFactory.c"
+#line 199 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) {
+static SpitPublishingAuthenticator*
+publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base,
+                                              const gchar* provider,
+                                              SpitPublishingPluginHost* host)
+{
 	PublishingAuthenticatorFactory * self;
 	SpitPublishingAuthenticator* result = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	GQuark _tmp3_ = 0U;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label0 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label1 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label2 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	static GQuark _tmp2_label3 = 0;
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	GQuark _tmp2_ = 0U;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp1_label0 = 0;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp1_label1 = 0;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp1_label2 = 0;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp1_label3 = 0;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp1_label4 = 0;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	g_return_val_if_fail (provider != NULL, NULL);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp0_ = provider;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	_tmp1_ = _tmp0_;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("flickr")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_);
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("flickr")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 188 "ShotwellAuthenticatorFactory.c"
+#line 236 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp4_;
-				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_;
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp4_ = host;
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_new (_tmp4_);
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				PublishingAuthenticatorShotwellFlickrFlickr* _tmp3_;
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp3_ = publishing_authenticator_shotwell_flickr_flickr_new (host);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 201 "ShotwellAuthenticatorFactory.c"
+#line 246 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("facebook")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	} else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("facebook")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 207 "ShotwellAuthenticatorFactory.c"
+#line 252 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp6_;
-				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp6_ = host;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp7_ = publishing_authenticator_shotwell_facebook_facebook_new (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				PublishingAuthenticatorShotwellFacebookFacebook* _tmp4_;
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp4_ = publishing_authenticator_shotwell_facebook_facebook_new (host);
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 220 "ShotwellAuthenticatorFactory.c"
+#line 262 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("picasa")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	} else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("picasa")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 226 "ShotwellAuthenticatorFactory.c"
+#line 268 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp8_;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp8_ = host;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp9_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp5_;
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp5_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
 "\n" \
 "Click Log in to log into Picasa Web Albums in your Web browser. You wi" \
 "ll have to authorize Shotwell Connect to link to your Picasa Web Album" \
-"s account."), _tmp8_);
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+"s account."), host);
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 239 "ShotwellAuthenticatorFactory.c"
+#line 278 "ShotwellAuthenticatorFactory.c"
 			}
 		}
-	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	} else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("youtube")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 245 "ShotwellAuthenticatorFactory.c"
+#line 284 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-				SpitPublishingPluginHost* _tmp10_;
-				PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp10_ = host;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				_tmp11_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp6_;
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp6_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
 "\n" \
 "You must have already signed up for a Google account and set it up for" \
 " use with YouTube to continue. You can set up most accounts by using y" \
-"our browser to log into the YouTube site at least once."), _tmp10_);
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
-				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+"our browser to log into the YouTube site at least once."), host);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 258 "ShotwellAuthenticatorFactory.c"
+#line 294 "ShotwellAuthenticatorFactory.c"
+			}
+		}
+	} else if (_tmp2_ == ((0 != _tmp1_label4) ? _tmp1_label4 : (_tmp1_label4 = g_quark_from_static_string ("tumblr")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+		switch (0) {
+#line 300 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				PublishingAuthenticatorShotwellTumblrTumblr* _tmp7_;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp7_ = publishing_authenticator_shotwell_tumblr_tumblr_new (host);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 310 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 264 "ShotwellAuthenticatorFactory.c"
+#line 316 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = NULL;
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 271 "ShotwellAuthenticatorFactory.c"
+#line 323 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	}
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_construct (GType object_type)
+{
 	PublishingAuthenticatorFactory * self = NULL;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self;
-#line 284 "ShotwellAuthenticatorFactory.c"
+#line 338 "ShotwellAuthenticatorFactory.c"
 }
 
 
-PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void) {
+PublishingAuthenticatorFactory*
+publishing_authenticator_factory_new (void)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return publishing_authenticator_factory_construct (PUBLISHING_AUTHENTICATOR_TYPE_FACTORY);
-#line 291 "ShotwellAuthenticatorFactory.c"
+#line 347 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass) {
+static void
+publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	publishing_authenticator_factory_parent_class = g_type_class_peek_parent (klass);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_factory_finalize;
-#line 300 "ShotwellAuthenticatorFactory.c"
+#line 358 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+static void
+publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface)
+{
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = g_type_interface_peek_parent (iface);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	iface->get_available_authenticators = (GeeList* (*) (SpitPublishingAuthenticatorFactory *)) publishing_authenticator_factory_real_get_available_authenticators;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create;
-#line 311 "ShotwellAuthenticatorFactory.c"
+#line 371 "ShotwellAuthenticatorFactory.c"
 }
 
 
-static void publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self) {
+static void
+publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self)
+{
 }
 
 
-static void publishing_authenticator_factory_finalize (GObject * obj) {
+static void
+publishing_authenticator_factory_finalize (GObject * obj)
+{
 	PublishingAuthenticatorFactory * self;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (publishing_authenticator_factory_parent_class)->finalize (obj);
-#line 325 "ShotwellAuthenticatorFactory.c"
+#line 389 "ShotwellAuthenticatorFactory.c"
 }
 
 
-GType publishing_authenticator_factory_get_type (void) {
+GType
+publishing_authenticator_factory_get_type (void)
+{
 	static volatile gsize publishing_authenticator_factory_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_factory_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorFactoryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_factory_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorFactory), 0, (GInstanceInitFunc) publishing_authenticator_factory_instance_init, NULL };