Merge branch 'feature/upstream' into develop

1 files changed, 160 insertions, 166 deletions

diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c
index e8e7b90..37d3f6d 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.c
+++ b/plugins/shotwell-transitions/shotwell-transitions.c
@@ -1,4 +1,4 @@
-/* shotwell-transitions.c generated by valac 0.34.7, the Vala compiler
+/* shotwell-transitions.c generated by valac 0.36.6, the Vala compiler
  * generated from shotwell-transitions.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -171,15 +171,15 @@ struct _ShotwellTransitionDescriptorClass {
 
 
 static gpointer shotwell_transitions_parent_class = NULL;
-static SpitModuleIface* shotwell_transitions_spit_module_parent_iface = NULL;
+static SpitModuleIface * shotwell_transitions_spit_module_parent_iface = NULL;
 static gpointer shotwell_transition_descriptor_parent_class = NULL;
 static GdkPixbuf** shotwell_transition_descriptor_icon_pixbuf_set;
 static gint shotwell_transition_descriptor_icon_pixbuf_set_length1;
 static GdkPixbuf** shotwell_transition_descriptor_icon_pixbuf_set = NULL;
 static gint shotwell_transition_descriptor_icon_pixbuf_set_length1 = 0;
 static gint _shotwell_transition_descriptor_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* shotwell_transition_descriptor_spit_pluggable_parent_iface = NULL;
-static SpitTransitionsDescriptorIface* shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL;
+static SpitPluggableIface * shotwell_transition_descriptor_spit_pluggable_parent_iface = NULL;
+static SpitTransitionsDescriptorIface * shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = NULL;
 
 GType shotwell_transitions_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_TRANSITIONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitionsPrivate))
@@ -192,48 +192,48 @@ FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory);
 FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType fade_effect_descriptor_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);
 SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory);
 SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType slide_effect_descriptor_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);
 CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory);
 CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType crumble_effect_descriptor_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);
 BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory);
 BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType blinds_effect_descriptor_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);
 CircleEffectDescriptor* circle_effect_descriptor_new (GFile* resource_directory);
 CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType circle_effect_descriptor_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);
 CirclesEffectDescriptor* circles_effect_descriptor_new (GFile* resource_directory);
 CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType circles_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory);
 ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 SquaresEffectDescriptor* squares_effect_descriptor_new (GFile* resource_directory);
 SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType squares_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 ChessEffectDescriptor* chess_effect_descriptor_new (GFile* resource_directory);
 ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType chess_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 StripesEffectDescriptor* stripes_effect_descriptor_new (GFile* resource_directory);
 StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory);
 GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST;
-static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_transitions_real_get_version (SpitModule* base);
 static const gchar* shotwell_transitions_real_get_id (SpitModule* base);
 static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1);
-static void shotwell_transitions_finalize (GObject* obj);
+static void shotwell_transitions_finalize (GObject * obj);
 SpitModule* spit_entry_point (SpitEntryPointParams* params);
 enum  {
 	SHOTWELL_TRANSITION_DESCRIPTOR_DUMMY_PROPERTY
@@ -250,12 +250,12 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
 static void shotwell_transition_descriptor_real_activation (SpitPluggable* base, gboolean enabled);
 SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host);
 static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (ShotwellTransitionDescriptor* self, SpitHostInterface* host);
-static void shotwell_transition_descriptor_finalize (GObject* obj);
+static void shotwell_transition_descriptor_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -272,7 +272,7 @@ static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-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 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -289,7 +289,7 @@ static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-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 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -306,7 +306,7 @@ static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-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 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -323,7 +323,7 @@ static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-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 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -340,7 +340,7 @@ static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -357,7 +357,7 @@ static void _vala_array_add6 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -374,7 +374,7 @@ static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add8 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -391,7 +391,7 @@ static void _vala_array_add8 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add9 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -408,7 +408,7 @@ static void _vala_array_add9 (SpitPluggable*** array, int* length, int* size, Sp
 }
 
 
-static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add10 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if ((*length) == (*size)) {
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -428,38 +428,38 @@ static void _vala_array_add10 (SpitPluggable*** array, int* length, int* size, S
 ShotwellTransitions* shotwell_transitions_construct (GType object_type, GFile* module_file) {
 	ShotwellTransitions * self = NULL;
 	GFile* resource_directory = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	FadeEffectDescriptor* _tmp3_ = NULL;
-	SpitPluggable** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	SlideEffectDescriptor* _tmp5_ = NULL;
-	SpitPluggable** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	CrumbleEffectDescriptor* _tmp7_ = NULL;
-	SpitPluggable** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	BlindsEffectDescriptor* _tmp9_ = NULL;
-	SpitPluggable** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	CircleEffectDescriptor* _tmp11_ = NULL;
-	SpitPluggable** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	CirclesEffectDescriptor* _tmp13_ = NULL;
-	SpitPluggable** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	ClockEffectDescriptor* _tmp15_ = NULL;
-	SpitPluggable** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	SquaresEffectDescriptor* _tmp17_ = NULL;
-	SpitPluggable** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	ChessEffectDescriptor* _tmp19_ = NULL;
-	SpitPluggable** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	StripesEffectDescriptor* _tmp21_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	SpitPluggable** _tmp2_;
+	gint _tmp2__length1;
+	FadeEffectDescriptor* _tmp3_;
+	SpitPluggable** _tmp4_;
+	gint _tmp4__length1;
+	SlideEffectDescriptor* _tmp5_;
+	SpitPluggable** _tmp6_;
+	gint _tmp6__length1;
+	CrumbleEffectDescriptor* _tmp7_;
+	SpitPluggable** _tmp8_;
+	gint _tmp8__length1;
+	BlindsEffectDescriptor* _tmp9_;
+	SpitPluggable** _tmp10_;
+	gint _tmp10__length1;
+	CircleEffectDescriptor* _tmp11_;
+	SpitPluggable** _tmp12_;
+	gint _tmp12__length1;
+	CirclesEffectDescriptor* _tmp13_;
+	SpitPluggable** _tmp14_;
+	gint _tmp14__length1;
+	ClockEffectDescriptor* _tmp15_;
+	SpitPluggable** _tmp16_;
+	gint _tmp16__length1;
+	SquaresEffectDescriptor* _tmp17_;
+	SpitPluggable** _tmp18_;
+	gint _tmp18__length1;
+	ChessEffectDescriptor* _tmp19_;
+	SpitPluggable** _tmp20_;
+	gint _tmp20__length1;
+	StripesEffectDescriptor* _tmp21_;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -568,16 +568,13 @@ ShotwellTransitions* shotwell_transitions_new (GFile* module_file) {
 static const gchar* shotwell_transitions_real_get_module_name (SpitModule* base) {
 	ShotwellTransitions * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp0_ = _ ("Core Slideshow Transitions");
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	result = _tmp0_;
+	result = _ ("Core Slideshow Transitions");
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 581 "shotwell-transitions.c"
+#line 578 "shotwell-transitions.c"
 }
 
 
@@ -590,7 +587,7 @@ static const gchar* shotwell_transitions_real_get_version (SpitModule* base) {
 	result = _VERSION;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 594 "shotwell-transitions.c"
+#line 591 "shotwell-transitions.c"
 }
 
 
@@ -603,17 +600,17 @@ static const gchar* shotwell_transitions_real_get_id (SpitModule* base) {
 	result = "org.yorba.shotwell.transitions";
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 607 "shotwell-transitions.c"
+#line 604 "shotwell-transitions.c"
 }
 
 
 static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* base, int* result_length1) {
 	ShotwellTransitions * self;
 	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPluggable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPluggable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -628,13 +625,13 @@ static SpitPluggable** shotwell_transitions_real_get_pluggables (SpitModule* bas
 	if (result_length1) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		*result_length1 = _tmp1__length1;
-#line 632 "shotwell-transitions.c"
+#line 629 "shotwell-transitions.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	result = _tmp1_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 638 "shotwell-transitions.c"
+#line 635 "shotwell-transitions.c"
 }
 
 
@@ -645,7 +642,7 @@ static void shotwell_transitions_class_init (ShotwellTransitionsClass * klass) {
 	g_type_class_add_private (klass, sizeof (ShotwellTransitionsPrivate));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_transitions_finalize;
-#line 649 "shotwell-transitions.c"
+#line 646 "shotwell-transitions.c"
 }
 
 
@@ -653,19 +650,19 @@ static void shotwell_transitions_spit_module_interface_init (SpitModuleIface * i
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	shotwell_transitions_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_module_name;
+	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_module_name;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_version;
+	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_version;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_transitions_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_transitions_real_get_id;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_transitions_real_get_pluggables;
-#line 664 "shotwell-transitions.c"
+	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_transitions_real_get_pluggables;
+#line 661 "shotwell-transitions.c"
 }
 
 
 static void shotwell_transitions_instance_init (ShotwellTransitions * self) {
-	SpitPluggable** _tmp0_ = NULL;
+	SpitPluggable** _tmp0_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self->priv = SHOTWELL_TRANSITIONS_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -676,11 +673,11 @@ static void shotwell_transitions_instance_init (ShotwellTransitions * self) {
 	self->priv->pluggables_length1 = 0;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 680 "shotwell-transitions.c"
+#line 677 "shotwell-transitions.c"
 }
 
 
-static void shotwell_transitions_finalize (GObject* obj) {
+static void shotwell_transitions_finalize (GObject * obj) {
 	ShotwellTransitions * self;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITIONS, ShotwellTransitions);
@@ -688,7 +685,7 @@ static void shotwell_transitions_finalize (GObject* obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	G_OBJECT_CLASS (shotwell_transitions_parent_class)->finalize (obj);
-#line 692 "shotwell-transitions.c"
+#line 689 "shotwell-transitions.c"
 }
 
 
@@ -708,14 +705,14 @@ GType shotwell_transitions_get_type (void) {
 
 SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SpitEntryPointParams* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	SpitEntryPointParams* _tmp0_;
+	gint _tmp1_;
+	SpitEntryPointParams* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	ShotwellTransitions* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	SpitEntryPointParams* _tmp6_;
+	gint _tmp7_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_tmp0_ = params;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -734,10 +731,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	_tmp7_ = (*_tmp6_).module_spit_interface;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 738 "shotwell-transitions.c"
-		SpitEntryPointParams* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		ShotwellTransitions* _tmp10_ = NULL;
+#line 735 "shotwell-transitions.c"
+		SpitEntryPointParams* _tmp8_;
+		GFile* _tmp9_;
+		ShotwellTransitions* _tmp10_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_tmp8_ = params;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -748,26 +745,26 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 		_g_object_unref0 (_tmp5_);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_tmp5_ = _tmp10_;
-#line 752 "shotwell-transitions.c"
+#line 749 "shotwell-transitions.c"
 	} else {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_g_object_unref0 (_tmp5_);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_tmp5_ = NULL;
-#line 758 "shotwell-transitions.c"
+#line 755 "shotwell-transitions.c"
 	}
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 764 "shotwell-transitions.c"
+#line 761 "shotwell-transitions.c"
 }
 
 
 ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory) {
 	ShotwellTransitionDescriptor * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -778,9 +775,9 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob
 	_tmp0__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	if (_tmp0_ == NULL) {
-#line 782 "shotwell-transitions.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 779 "shotwell-transitions.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" SHOTWELL_TRANSITION_DESCRIPTOR_ICON_FILENAME, &_tmp1_);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -791,20 +788,20 @@ ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType ob
 		shotwell_transition_descriptor_icon_pixbuf_set_length1 = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_shotwell_transition_descriptor_icon_pixbuf_set_size_ = shotwell_transition_descriptor_icon_pixbuf_set_length1;
-#line 795 "shotwell-transitions.c"
+#line 792 "shotwell-transitions.c"
 	}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return self;
-#line 799 "shotwell-transitions.c"
+#line 796 "shotwell-transitions.c"
 }
 
 
 static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	ShotwellTransitionDescriptor * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -817,7 +814,7 @@ static gint shotwell_transition_descriptor_real_get_pluggable_interface (SpitPlu
 	result = _tmp2_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 821 "shotwell-transitions.c"
+#line 818 "shotwell-transitions.c"
 }
 
 
@@ -826,7 +823,7 @@ static const gchar* shotwell_transition_descriptor_real_get_id (ShotwellTransiti
 	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return NULL;
-#line 830 "shotwell-transitions.c"
+#line 827 "shotwell-transitions.c"
 }
 
 
@@ -835,7 +832,7 @@ const gchar* shotwell_transition_descriptor_get_id (ShotwellTransitionDescriptor
 	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_id (self);
-#line 839 "shotwell-transitions.c"
+#line 836 "shotwell-transitions.c"
 }
 
 
@@ -844,7 +841,7 @@ static const gchar* shotwell_transition_descriptor_real_get_pluggable_name (Shot
 	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_get_pluggable_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return NULL;
-#line 848 "shotwell-transitions.c"
+#line 845 "shotwell-transitions.c"
 }
 
 
@@ -853,14 +850,14 @@ const gchar* shotwell_transition_descriptor_get_pluggable_name (ShotwellTransiti
 	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->get_pluggable_name (self);
-#line 857 "shotwell-transitions.c"
+#line 854 "shotwell-transitions.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 864 "shotwell-transitions.c"
+#line 861 "shotwell-transitions.c"
 }
 
 
@@ -871,34 +868,33 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	for (i = 0; i < length; i++) {
-#line 875 "shotwell-transitions.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 872 "shotwell-transitions.c"
+		GdkPixbuf* _tmp0_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 		result[i] = _tmp0_;
-#line 881 "shotwell-transitions.c"
+#line 878 "shotwell-transitions.c"
 	}
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return result;
-#line 885 "shotwell-transitions.c"
+#line 882 "shotwell-transitions.c"
 }
 
 
 static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	ShotwellTransitionDescriptor * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
@@ -910,61 +906,59 @@ static void shotwell_transition_descriptor_real_get_info (SpitPluggable* base, S
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	(*info).authors = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp1_ = _ ("Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conser" \
-"vancy Inc.");
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conser" \
+"vancy Inc."));
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).copyright);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).translators);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).version);
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).website_name);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).website_url);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	_g_free0 ((*info).license);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp8_ = shotwell_transition_descriptor_icon_pixbuf_set;
+	_tmp7_ = shotwell_transition_descriptor_icon_pixbuf_set;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp8__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1;
+	_tmp7__length1 = shotwell_transition_descriptor_icon_pixbuf_set_length1;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 967 "shotwell-transitions.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 961 "shotwell-transitions.c"
 }
 
 
@@ -972,7 +966,7 @@ static void shotwell_transition_descriptor_real_activation (SpitPluggable* base,
 	ShotwellTransitionDescriptor * self;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
-#line 975 "shotwell-transitions.c"
+#line 969 "shotwell-transitions.c"
 }
 
 
@@ -981,7 +975,7 @@ static SpitTransitionsEffect* shotwell_transition_descriptor_real_create (Shotwe
 	g_critical ("Type `%s' does not implement abstract method `shotwell_transition_descriptor_create'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return NULL;
-#line 984 "shotwell-transitions.c"
+#line 978 "shotwell-transitions.c"
 }
 
 
@@ -990,7 +984,7 @@ SpitTransitionsEffect* shotwell_transition_descriptor_create (ShotwellTransition
 	g_return_val_if_fail (IS_SHOTWELL_TRANSITION_DESCRIPTOR (self), NULL);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	return SHOTWELL_TRANSITION_DESCRIPTOR_GET_CLASS (self)->create (self, host);
-#line 993 "shotwell-transitions.c"
+#line 987 "shotwell-transitions.c"
 }
 
 
@@ -998,14 +992,14 @@ static void shotwell_transition_descriptor_class_init (ShotwellTransitionDescrip
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	shotwell_transition_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) shotwell_transition_descriptor_real_get_id;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) shotwell_transition_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) shotwell_transition_descriptor_real_get_pluggable_name;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) shotwell_transition_descriptor_real_create;
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_real_create;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_transition_descriptor_finalize;
-#line 1008 "shotwell-transitions.c"
+#line 1002 "shotwell-transitions.c"
 }
 
 
@@ -1013,16 +1007,16 @@ static void shotwell_transition_descriptor_spit_pluggable_interface_init (SpitPl
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	shotwell_transition_descriptor_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) shotwell_transition_descriptor_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) shotwell_transition_descriptor_real_get_pluggable_interface;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) shotwell_transition_descriptor_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) shotwell_transition_descriptor_get_id;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) shotwell_transition_descriptor_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) shotwell_transition_descriptor_get_pluggable_name;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) shotwell_transition_descriptor_real_get_info;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) shotwell_transition_descriptor_real_activation;
-#line 1025 "shotwell-transitions.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) shotwell_transition_descriptor_real_activation;
+#line 1019 "shotwell-transitions.c"
 }
 
 
@@ -1030,8 +1024,8 @@ static void shotwell_transition_descriptor_spit_transitions_descriptor_interface
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	shotwell_transition_descriptor_spit_transitions_descriptor_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
-	iface->create = (SpitTransitionsEffect* (*)(SpitTransitionsDescriptor*, SpitHostInterface*)) shotwell_transition_descriptor_create;
-#line 1034 "shotwell-transitions.c"
+	iface->create = (SpitTransitionsEffect* (*) (SpitTransitionsDescriptor *, SpitHostInterface*)) shotwell_transition_descriptor_create;
+#line 1028 "shotwell-transitions.c"
 }
 
 
@@ -1039,13 +1033,13 @@ static void shotwell_transition_descriptor_instance_init (ShotwellTransitionDesc
 }
 
 
-static void shotwell_transition_descriptor_finalize (GObject* obj) {
+static void shotwell_transition_descriptor_finalize (GObject * obj) {
 	ShotwellTransitionDescriptor * self;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_TRANSITION_DESCRIPTOR, ShotwellTransitionDescriptor);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/shotwell-transitions.vala"
 	G_OBJECT_CLASS (shotwell_transition_descriptor_parent_class)->finalize (obj);
-#line 1048 "shotwell-transitions.c"
+#line 1042 "shotwell-transitions.c"
 }