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

1 files changed, 343 insertions, 226 deletions

diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 8d7d080..0a2cf42 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -1,4 +1,4 @@
-/* shotwell-publishing.c generated by valac 0.36.6, the Vala compiler
+/* shotwell-publishing.c generated by valac 0.40.4, the Vala compiler
  * generated from shotwell-publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -28,6 +29,11 @@
 typedef struct _ShotwellPublishingCoreServices ShotwellPublishingCoreServices;
 typedef struct _ShotwellPublishingCoreServicesClass ShotwellPublishingCoreServicesClass;
 typedef struct _ShotwellPublishingCoreServicesPrivate ShotwellPublishingCoreServicesPrivate;
+enum  {
+	SHOTWELL_PUBLISHING_CORE_SERVICES_0_PROPERTY,
+	SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES
+};
+static GParamSpec* shotwell_publishing_core_services_properties[SHOTWELL_PUBLISHING_CORE_SERVICES_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_FACEBOOK_SERVICE (facebook_service_get_type ())
@@ -79,6 +85,16 @@ typedef struct _YouTubeServiceClass YouTubeServiceClass;
 
 typedef struct _PiwigoService PiwigoService;
 typedef struct _PiwigoServiceClass PiwigoServiceClass;
+
+#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
+#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
+#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
+#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
+#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+
+typedef struct _TumblrService TumblrService;
+typedef struct _TumblrServiceClass TumblrServiceClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _ShotwellPublishingCoreServices {
@@ -102,294 +118,379 @@ static SpitModuleIface * shotwell_publishing_core_services_spit_module_parent_if
 
 GType shotwell_publishing_core_services_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServicesPrivate))
-enum  {
-	SHOTWELL_PUBLISHING_CORE_SERVICES_DUMMY_PROPERTY
-};
 ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file);
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file);
+ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type,
+                                                                             GFile* module_file);
 FacebookService* facebook_service_new (GFile* resource_directory);
-FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory);
+FacebookService* facebook_service_construct (GType object_type,
+                                             GFile* resource_directory);
 GType facebook_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);
 PicasaService* picasa_service_new (GFile* resource_directory);
-PicasaService* picasa_service_construct (GType object_type, GFile* resource_directory);
+PicasaService* picasa_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType picasa_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add2 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 FlickrService* flickr_service_new (GFile* resource_directory);
-FlickrService* flickr_service_construct (GType object_type, GFile* resource_directory);
+FlickrService* flickr_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType flickr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add3 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 YouTubeService* you_tube_service_new (GFile* resource_directory);
-YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_directory);
+YouTubeService* you_tube_service_construct (GType object_type,
+                                            GFile* resource_directory);
 GType you_tube_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add4 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 PiwigoService* piwigo_service_new (GFile* resource_directory);
-PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
+PiwigoService* piwigo_service_construct (GType object_type,
+                                         GFile* resource_directory);
 GType piwigo_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add5 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
+TumblrService* tumblr_service_new (GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type,
+                                         GFile* resource_directory);
+GType tumblr_service_get_type (void) G_GNUC_CONST;
+static void _vala_array_add6 (SpitPluggable** * array,
+                       int* length,
+                       int* size,
+                       SpitPluggable* value);
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
+static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+                                                                       int* result_length1);
 static void shotwell_publishing_core_services_finalize (GObject * obj);
 SpitModule* spit_entry_point (SpitEntryPointParams* params);
-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 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 148 "shotwell-publishing.c"
+#line 200 "shotwell-publishing.c"
 	}
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 154 "shotwell-publishing.c"
+#line 206 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add2 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 165 "shotwell-publishing.c"
+#line 222 "shotwell-publishing.c"
 	}
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 171 "shotwell-publishing.c"
+#line 228 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add3 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 182 "shotwell-publishing.c"
+#line 244 "shotwell-publishing.c"
 	}
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 188 "shotwell-publishing.c"
+#line 250 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add4 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 199 "shotwell-publishing.c"
+#line 266 "shotwell-publishing.c"
 	}
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 205 "shotwell-publishing.c"
+#line 272 "shotwell-publishing.c"
 }
 
 
-static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+static void
+_vala_array_add5 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 216 "shotwell-publishing.c"
+#line 288 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 222 "shotwell-publishing.c"
+#line 294 "shotwell-publishing.c"
 }
 
 
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GType object_type, GFile* module_file) {
+static void
+_vala_array_add6 (SpitPluggable** * array,
+                  int* length,
+                  int* size,
+                  SpitPluggable* value)
+{
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if ((*length) == (*size)) {
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
+#line 310 "shotwell-publishing.c"
+	}
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[(*length)++] = value;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[*length] = NULL;
+#line 316 "shotwell-publishing.c"
+}
+
+
+ShotwellPublishingCoreServices*
+shotwell_publishing_core_services_construct (GType object_type,
+                                             GFile* module_file)
+{
 	ShotwellPublishingCoreServices * self = NULL;
 	GFile* resource_directory = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
 	PublishingAuthenticatorFactory* factory = NULL;
-	PublishingAuthenticatorFactory* _tmp2_;
+	PublishingAuthenticatorFactory* _tmp1_;
 	GeeList* authenicators = NULL;
-	PublishingAuthenticatorFactory* _tmp3_;
-	GeeList* _tmp4_;
-	GFile* _tmp5_;
+	PublishingAuthenticatorFactory* _tmp2_;
+	GeeList* _tmp3_;
+	GFile* _tmp4_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
-	gchar* _tmp7_;
-	GeeList* _tmp8_;
+	GeeList* _tmp7_;
+	gint _tmp8_;
 	gint _tmp9_;
-	gint _tmp10_;
-	GeeList* _tmp11_;
-	gboolean _tmp12_;
-	GeeList* _tmp16_;
-	gboolean _tmp17_;
-	GeeList* _tmp21_;
-	gboolean _tmp22_;
-	GeeList* _tmp26_;
-	gboolean _tmp27_;
-	SpitPluggable** _tmp31_;
-	gint _tmp31__length1;
-	GFile* _tmp32_;
-	PiwigoService* _tmp33_;
+	GeeList* _tmp10_;
+	GeeList* _tmp14_;
+	GeeList* _tmp18_;
+	GeeList* _tmp22_;
+	SpitPluggable** _tmp26_;
+	gint _tmp26__length1;
+	GFile* _tmp27_;
+	PiwigoService* _tmp28_;
+	SpitPluggable** _tmp29_;
+	gint _tmp29__length1;
+	GFile* _tmp30_;
+	GFile* _tmp31_;
+	TumblrService* _tmp32_;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = (ShotwellPublishingCoreServices*) g_object_new (object_type, NULL);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp0_ = module_file;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp1_ = g_file_get_parent (_tmp0_);
+	_tmp0_ = g_file_get_parent (module_file);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	resource_directory = _tmp1_;
+	resource_directory = _tmp0_;
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = publishing_authenticator_factory_get_instance ();
+	_tmp1_ = publishing_authenticator_factory_get_instance ();
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	factory = _tmp2_;
+	factory = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = factory;
+	_tmp2_ = factory;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
+	_tmp3_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	authenicators = _tmp4_;
+	authenicators = _tmp3_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp5_ = resource_directory;
+	_tmp4_ = resource_directory;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = g_file_get_path (_tmp5_);
+	_tmp5_ = g_file_get_path (_tmp4_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp7_);
+	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp6_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8_ = authenicators;
+	_tmp7_ = authenicators;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp10_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp11_ = authenicators;
+	g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp9_);
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), "facebook");
+	_tmp10_ = authenicators;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp12_) {
-#line 298 "shotwell-publishing.c"
-		SpitPluggable** _tmp13_;
-		gint _tmp13__length1;
-		GFile* _tmp14_;
-		FacebookService* _tmp15_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), "facebook")) {
+#line 391 "shotwell-publishing.c"
+		SpitPluggable** _tmp11_;
+		gint _tmp11__length1;
+		GFile* _tmp12_;
+		FacebookService* _tmp13_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp13_ = self->priv->pluggables;
+		_tmp11_ = self->priv->pluggables;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp13__length1 = self->priv->pluggables_length1;
+		_tmp11__length1 = self->priv->pluggables_length1;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp14_ = resource_directory;
+		_tmp12_ = resource_directory;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp15_ = facebook_service_new (_tmp14_);
+		_tmp13_ = facebook_service_new (_tmp12_);
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 313 "shotwell-publishing.c"
+		_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 406 "shotwell-publishing.c"
 	}
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp16_ = authenicators;
+	_tmp14_ = authenicators;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp17_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), "picasa");
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp17_) {
-#line 321 "shotwell-publishing.c"
-		SpitPluggable** _tmp18_;
-		gint _tmp18__length1;
-		GFile* _tmp19_;
-		PicasaService* _tmp20_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), "picasa")) {
+#line 412 "shotwell-publishing.c"
+		SpitPluggable** _tmp15_;
+		gint _tmp15__length1;
+		GFile* _tmp16_;
+		PicasaService* _tmp17_;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp18_ = self->priv->pluggables;
+		_tmp15_ = self->priv->pluggables;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp18__length1 = self->priv->pluggables_length1;
+		_tmp15__length1 = self->priv->pluggables_length1;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp19_ = resource_directory;
+		_tmp16_ = resource_directory;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp20_ = picasa_service_new (_tmp19_);
+		_tmp17_ = picasa_service_new (_tmp16_);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 336 "shotwell-publishing.c"
+		_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 427 "shotwell-publishing.c"
 	}
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp21_ = authenicators;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp22_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), "flickr");
+	_tmp18_ = authenicators;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp22_) {
-#line 344 "shotwell-publishing.c"
-		SpitPluggable** _tmp23_;
-		gint _tmp23__length1;
-		GFile* _tmp24_;
-		FlickrService* _tmp25_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), "flickr")) {
+#line 433 "shotwell-publishing.c"
+		SpitPluggable** _tmp19_;
+		gint _tmp19__length1;
+		GFile* _tmp20_;
+		FlickrService* _tmp21_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp23_ = self->priv->pluggables;
+		_tmp19_ = self->priv->pluggables;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp23__length1 = self->priv->pluggables_length1;
+		_tmp19__length1 = self->priv->pluggables_length1;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp24_ = resource_directory;
+		_tmp20_ = resource_directory;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp25_ = flickr_service_new (_tmp24_);
+		_tmp21_ = flickr_service_new (_tmp20_);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 359 "shotwell-publishing.c"
+		_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 448 "shotwell-publishing.c"
 	}
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp26_ = authenicators;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp27_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), "youtube");
+	_tmp22_ = authenicators;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp27_) {
-#line 367 "shotwell-publishing.c"
-		SpitPluggable** _tmp28_;
-		gint _tmp28__length1;
-		GFile* _tmp29_;
-		YouTubeService* _tmp30_;
+	if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), "youtube")) {
+#line 454 "shotwell-publishing.c"
+		SpitPluggable** _tmp23_;
+		gint _tmp23__length1;
+		GFile* _tmp24_;
+		YouTubeService* _tmp25_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp28_ = self->priv->pluggables;
+		_tmp23_ = self->priv->pluggables;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp28__length1 = self->priv->pluggables_length1;
+		_tmp23__length1 = self->priv->pluggables_length1;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp29_ = resource_directory;
+		_tmp24_ = resource_directory;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp30_ = you_tube_service_new (_tmp29_);
+		_tmp25_ = you_tube_service_new (_tmp24_);
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 382 "shotwell-publishing.c"
+		_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 469 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp31_ = self->priv->pluggables;
+	_tmp26_ = self->priv->pluggables;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp31__length1 = self->priv->pluggables_length1;
+	_tmp26__length1 = self->priv->pluggables_length1;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp32_ = resource_directory;
+	_tmp27_ = resource_directory;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp33_ = piwigo_service_new (_tmp32_);
+	_tmp28_ = piwigo_service_new (_tmp27_);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp29_ = self->priv->pluggables;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp29__length1 = self->priv->pluggables_length1;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp30_ = g_file_get_parent (module_file);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31_ = _tmp30_;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp32_ = tumblr_service_new (_tmp31_);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_object_unref0 (_tmp31_);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_g_object_unref0 (authenicators);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -398,99 +499,114 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_g_object_unref0 (resource_directory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return self;
-#line 402 "shotwell-publishing.c"
+#line 503 "shotwell-publishing.c"
 }
 
 
-ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file) {
+ShotwellPublishingCoreServices*
+shotwell_publishing_core_services_new (GFile* module_file)
+{
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return shotwell_publishing_core_services_construct (TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, module_file);
-#line 409 "shotwell-publishing.c"
+#line 512 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_module_name (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _ ("Core Publishing Services");
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 422 "shotwell-publishing.c"
+#line 527 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_version (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _VERSION;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 435 "shotwell-publishing.c"
+#line 542 "shotwell-publishing.c"
 }
 
 
-static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
+static const gchar*
+shotwell_publishing_core_services_real_get_id (SpitModule* base)
+{
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = "org.yorba.shotwell.publishing.core_services";
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 448 "shotwell-publishing.c"
+#line 557 "shotwell-publishing.c"
 }
 
 
-static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
+static SpitPluggable**
+shotwell_publishing_core_services_real_get_pluggables (SpitModule* base,
+                                                       int* result_length1)
+{
 	ShotwellPublishingCoreServices * self;
 	SpitPluggable** result = NULL;
 	SpitPluggable** _tmp0_;
 	gint _tmp0__length1;
 	SpitPluggable** _tmp1_;
 	gint _tmp1__length1;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = _tmp0_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (result_length1) {
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 473 "shotwell-publishing.c"
+#line 585 "shotwell-publishing.c"
 	}
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 479 "shotwell-publishing.c"
+#line 591 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass) {
+static void
+shotwell_publishing_core_services_class_init (ShotwellPublishingCoreServicesClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	shotwell_publishing_core_services_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate));
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize;
-#line 490 "shotwell-publishing.c"
+#line 604 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface) {
+static void
+shotwell_publishing_core_services_spit_module_interface_init (SpitModuleIface * iface)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	shotwell_publishing_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -501,11 +617,13 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo
 	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables;
-#line 505 "shotwell-publishing.c"
+#line 621 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self) {
+static void
+shotwell_publishing_core_services_instance_init (ShotwellPublishingCoreServices * self)
+{
 	SpitPluggable** _tmp0_;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv = SHOTWELL_PUBLISHING_CORE_SERVICES_GET_PRIVATE (self);
@@ -517,11 +635,13 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC
 	self->priv->pluggables_length1 = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 521 "shotwell-publishing.c"
+#line 639 "shotwell-publishing.c"
 }
 
 
-static void shotwell_publishing_core_services_finalize (GObject * obj) {
+static void
+shotwell_publishing_core_services_finalize (GObject * obj)
+{
 	ShotwellPublishingCoreServices * self;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
@@ -529,11 +649,13 @@ static void shotwell_publishing_core_services_finalize (GObject * obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj);
-#line 533 "shotwell-publishing.c"
+#line 653 "shotwell-publishing.c"
 }
 
 
-GType shotwell_publishing_core_services_get_type (void) {
+GType
+shotwell_publishing_core_services_get_type (void)
+{
 	static volatile gsize shotwell_publishing_core_services_type_id__volatile = 0;
 	if (g_once_init_enter (&shotwell_publishing_core_services_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPublishingCoreServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_publishing_core_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPublishingCoreServices), 0, (GInstanceInitFunc) shotwell_publishing_core_services_instance_init, NULL };
@@ -547,65 +669,56 @@ GType shotwell_publishing_core_services_get_type (void) {
 }
 
 
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
+SpitModule*
+spit_entry_point (SpitEntryPointParams* params)
+{
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	SpitEntryPointParams* _tmp2_;
+	ShotwellPublishingCoreServices* _tmp2_ = NULL;
 	gint _tmp3_;
-	gint _tmp4_;
-	ShotwellPublishingCoreServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_;
-	gint _tmp7_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp0_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	(*params).module_spit_interface = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = params;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 579 "shotwell-publishing.c"
-		SpitEntryPointParams* _tmp8_;
-		GFile* _tmp9_;
-		ShotwellPublishingCoreServices* _tmp10_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp8_ = params;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp9_ = (*_tmp8_).module_file;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
+	_tmp0_ = (*params).host_min_spit_interface;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_g_object_unref0 (_tmp5_);
+	_tmp1_ = (*params).host_max_spit_interface;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp5_ = _tmp10_;
-#line 593 "shotwell-publishing.c"
+	(*params).module_spit_interface = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_CURRENT_INTERFACE);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp3_ = (*params).module_spit_interface;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if (_tmp3_ != SPIT_UNSUPPORTED_INTERFACE) {
+#line 691 "shotwell-publishing.c"
+		GFile* _tmp4_;
+		ShotwellPublishingCoreServices* _tmp5_;
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp4_ = (*params).module_file;
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp5_ = shotwell_publishing_core_services_new (_tmp4_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp2_ = _tmp5_;
+#line 702 "shotwell-publishing.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_g_object_unref0 (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-		_tmp5_ = NULL;
-#line 599 "shotwell-publishing.c"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp2_ = NULL;
+#line 708 "shotwell-publishing.c"
 	}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_MODULE, SpitModule);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 605 "shotwell-publishing.c"
+#line 714 "shotwell-publishing.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) {
@@ -617,7 +730,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);
 }