Merge branch 'release/0.26.4-1'0.26.4-1

11 files changed, 1241 insertions, 1277 deletions

diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c
index 516eefc..20733f9 100644
--- a/plugins/shotwell-transitions/BlindsEffect.c
+++ b/plugins/shotwell-transitions/BlindsEffect.c
@@ -1,4 +1,4 @@
-/* BlindsEffect.c generated by valac 0.34.7, the Vala compiler
+/* BlindsEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from BlindsEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -98,7 +98,7 @@ struct _BlindsEffectPrivate {
 
 static gpointer blinds_effect_descriptor_parent_class = NULL;
 static gpointer blinds_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* blinds_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * blinds_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -127,14 +127,14 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
 static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
 static void blinds_effect_real_cancel (SpitTransitionsEffect* base);
-static void blinds_effect_finalize (GObject* obj);
+static void blinds_effect_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);
 
 
 BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	BlindsEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -170,23 +170,20 @@ static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDesc
 static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	BlindsEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT_DESCRIPTOR, BlindsEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp0_ = _ ("Blinds");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	result = _tmp0_;
+	result = _ ("Blinds");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 183 "BlindsEffect.c"
+#line 180 "BlindsEffect.c"
 }
 
 
 static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	BlindsEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	BlindsEffect* _tmp0_ = NULL;
+	BlindsEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT_DESCRIPTOR, BlindsEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -197,7 +194,7 @@ static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTran
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 201 "BlindsEffect.c"
+#line 198 "BlindsEffect.c"
 }
 
 
@@ -205,12 +202,12 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) blinds_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) blinds_effect_descriptor_real_create;
-#line 214 "BlindsEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) blinds_effect_descriptor_real_create;
+#line 211 "BlindsEffect.c"
 }
 
 
@@ -236,14 +233,14 @@ BlindsEffect* blinds_effect_construct (GType object_type) {
 	self = (BlindsEffect*) g_object_new (object_type, NULL);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return self;
-#line 240 "BlindsEffect.c"
+#line 237 "BlindsEffect.c"
 }
 
 
 BlindsEffect* blinds_effect_new (void) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return blinds_effect_construct (TYPE_BLINDS_EFFECT);
-#line 247 "BlindsEffect.c"
+#line 244 "BlindsEffect.c"
 }
 
 
@@ -261,13 +258,13 @@ static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
 	if (desired_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 265 "BlindsEffect.c"
+#line 262 "BlindsEffect.c"
 	}
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	if (min_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 271 "BlindsEffect.c"
+#line 268 "BlindsEffect.c"
 	}
 }
 
@@ -281,15 +278,15 @@ static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect
 	result = TRUE;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 285 "BlindsEffect.c"
+#line 282 "BlindsEffect.c"
 }
 
 
 static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
 	BlindsEffect * self;
-	SpitTransitionsVisuals* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
+	SpitTransitionsVisuals* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp2_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -304,21 +301,21 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 	_tmp2_ = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	if (_tmp2_ != NULL) {
-#line 308 "BlindsEffect.c"
-		SpitTransitionsVisuals* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-		SpitTransitionsVisuals* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gdouble _tmp14_ = 0.0;
-		gint _tmp15_ = 0;
-		cairo_surface_t** _tmp16_ = NULL;
+#line 305 "BlindsEffect.c"
+		SpitTransitionsVisuals* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		SpitTransitionsVisuals* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gdouble _tmp14_;
+		gint _tmp15_;
+		cairo_surface_t** _tmp16_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		_tmp3_ = visuals;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -359,54 +356,54 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 		self->priv->to_blinds_length1 = _tmp15_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		self->priv->_to_blinds_size_ = self->priv->to_blinds_length1;
-#line 363 "BlindsEffect.c"
+#line 360 "BlindsEffect.c"
 		{
 			gint i = 0;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 			i = 0;
-#line 368 "BlindsEffect.c"
+#line 365 "BlindsEffect.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				_tmp17_ = TRUE;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				while (TRUE) {
-#line 375 "BlindsEffect.c"
-					gint _tmp19_ = 0;
-					gint _tmp20_ = 0;
-					cairo_surface_t** _tmp21_ = NULL;
-					gint _tmp21__length1 = 0;
-					gint _tmp22_ = 0;
-					gint _tmp23_ = 0;
-					SpitTransitionsVisuals* _tmp24_ = NULL;
-					GdkPixbuf* _tmp25_ = NULL;
-					GdkPixbuf* _tmp26_ = NULL;
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
-					cairo_surface_t* _tmp29_ = NULL;
-					cairo_surface_t* _tmp30_ = NULL;
+#line 372 "BlindsEffect.c"
+					gint _tmp19_;
+					gint _tmp20_;
+					cairo_surface_t** _tmp21_;
+					gint _tmp21__length1;
+					gint _tmp22_;
+					gint _tmp23_;
+					SpitTransitionsVisuals* _tmp24_;
+					GdkPixbuf* _tmp25_;
+					GdkPixbuf* _tmp26_;
+					gint _tmp27_;
+					gint _tmp28_;
+					cairo_surface_t* _tmp29_;
+					cairo_surface_t* _tmp30_;
 					cairo_t* ctx = NULL;
-					cairo_surface_t** _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					gint _tmp32_ = 0;
-					cairo_surface_t* _tmp33_ = NULL;
-					cairo_t* _tmp34_ = NULL;
-					cairo_t* _tmp35_ = NULL;
-					SpitTransitionsVisuals* _tmp36_ = NULL;
-					GdkPixbuf* _tmp37_ = NULL;
-					GdkPixbuf* _tmp38_ = NULL;
-					gint _tmp39_ = 0;
-					gint _tmp40_ = 0;
-					cairo_t* _tmp41_ = NULL;
+					cairo_surface_t** _tmp31_;
+					gint _tmp31__length1;
+					gint _tmp32_;
+					cairo_surface_t* _tmp33_;
+					cairo_t* _tmp34_;
+					cairo_t* _tmp35_;
+					SpitTransitionsVisuals* _tmp36_;
+					GdkPixbuf* _tmp37_;
+					GdkPixbuf* _tmp38_;
+					gint _tmp39_;
+					gint _tmp40_;
+					cairo_t* _tmp41_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					if (!_tmp17_) {
-#line 404 "BlindsEffect.c"
-						gint _tmp18_ = 0;
+#line 401 "BlindsEffect.c"
+						gint _tmp18_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 						_tmp18_ = i;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 						i = _tmp18_ + 1;
-#line 410 "BlindsEffect.c"
+#line 407 "BlindsEffect.c"
 					}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					_tmp17_ = FALSE;
@@ -418,7 +415,7 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 					if (!(_tmp19_ < _tmp20_)) {
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 						break;
-#line 422 "BlindsEffect.c"
+#line 419 "BlindsEffect.c"
 					}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					_tmp21_ = self->priv->to_blinds;
@@ -478,7 +475,7 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 					cairo_paint (_tmp41_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					_cairo_destroy0 (ctx);
-#line 482 "BlindsEffect.c"
+#line 479 "BlindsEffect.c"
 				}
 			}
 		}
@@ -489,24 +486,24 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	BlindsEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gint y = 0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
+	SpitTransitionsVisuals* _tmp3_;
 	GdkRectangle _tmp4_ = {0};
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
 	gint x = 0;
-	SpitTransitionsVisuals* _tmp7_ = NULL;
+	SpitTransitionsVisuals* _tmp7_;
 	GdkRectangle _tmp8_ = {0};
-	GdkRectangle _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	SpitTransitionsVisuals* _tmp11_ = NULL;
-	GdkPixbuf* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	cairo_t* _tmp53_ = NULL;
-	cairo_t* _tmp54_ = NULL;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	SpitTransitionsVisuals* _tmp11_;
+	GdkPixbuf* _tmp12_;
+	GdkPixbuf* _tmp13_;
+	cairo_t* _tmp53_;
+	cairo_t* _tmp54_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -551,21 +548,21 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp13_ = _tmp12_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	if (_tmp13_ != NULL) {
-#line 555 "BlindsEffect.c"
-		cairo_t* _tmp14_ = NULL;
-		SpitTransitionsVisuals* _tmp15_ = NULL;
-		GdkPixbuf* _tmp16_ = NULL;
-		GdkPixbuf* _tmp17_ = NULL;
-		SpitTransitionsVisuals* _tmp18_ = NULL;
+#line 552 "BlindsEffect.c"
+		cairo_t* _tmp14_;
+		SpitTransitionsVisuals* _tmp15_;
+		GdkPixbuf* _tmp16_;
+		GdkPixbuf* _tmp17_;
+		SpitTransitionsVisuals* _tmp18_;
 		GdkRectangle _tmp19_ = {0};
-		GdkRectangle _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		SpitTransitionsVisuals* _tmp22_ = NULL;
+		GdkRectangle _tmp20_;
+		gint _tmp21_;
+		SpitTransitionsVisuals* _tmp22_;
 		GdkRectangle _tmp23_ = {0};
-		GdkRectangle _tmp24_ = {0};
-		gint _tmp25_ = 0;
-		cairo_t* _tmp26_ = NULL;
-		gdouble _tmp27_ = 0.0;
+		GdkRectangle _tmp24_;
+		gint _tmp25_;
+		cairo_t* _tmp26_;
+		gdouble _tmp27_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		_tmp14_ = ctx;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -598,53 +595,53 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 		_tmp27_ = alpha;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		cairo_paint_with_alpha (_tmp26_, 1 - (_tmp27_ * 2));
-#line 602 "BlindsEffect.c"
+#line 599 "BlindsEffect.c"
 	}
 	{
 		gint i = 0;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		i = 0;
-#line 608 "BlindsEffect.c"
+#line 605 "BlindsEffect.c"
 		{
 			gboolean _tmp28_ = FALSE;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 			_tmp28_ = TRUE;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 			while (TRUE) {
-#line 615 "BlindsEffect.c"
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
-				cairo_t* _tmp32_ = NULL;
-				cairo_surface_t** _tmp33_ = NULL;
-				gint _tmp33__length1 = 0;
-				gint _tmp34_ = 0;
-				cairo_surface_t* _tmp35_ = NULL;
-				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
-				gint _tmp39_ = 0;
-				cairo_t* _tmp40_ = NULL;
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
-				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-				gdouble _tmp46_ = 0.0;
-				SpitTransitionsVisuals* _tmp47_ = NULL;
-				GdkPixbuf* _tmp48_ = NULL;
-				GdkPixbuf* _tmp49_ = NULL;
-				gint _tmp50_ = 0;
-				gint _tmp51_ = 0;
-				cairo_t* _tmp52_ = NULL;
+#line 612 "BlindsEffect.c"
+				gint _tmp30_;
+				gint _tmp31_;
+				cairo_t* _tmp32_;
+				cairo_surface_t** _tmp33_;
+				gint _tmp33__length1;
+				gint _tmp34_;
+				cairo_surface_t* _tmp35_;
+				gint _tmp36_;
+				gint _tmp37_;
+				gint _tmp38_;
+				gint _tmp39_;
+				cairo_t* _tmp40_;
+				gint _tmp41_;
+				gint _tmp42_;
+				gint _tmp43_;
+				gint _tmp44_;
+				gint _tmp45_;
+				gdouble _tmp46_;
+				SpitTransitionsVisuals* _tmp47_;
+				GdkPixbuf* _tmp48_;
+				GdkPixbuf* _tmp49_;
+				gint _tmp50_;
+				gint _tmp51_;
+				cairo_t* _tmp52_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				if (!_tmp28_) {
-#line 642 "BlindsEffect.c"
-					gint _tmp29_ = 0;
+#line 639 "BlindsEffect.c"
+					gint _tmp29_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					_tmp29_ = i;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					i = _tmp29_ + 1;
-#line 648 "BlindsEffect.c"
+#line 645 "BlindsEffect.c"
 				}
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				_tmp28_ = FALSE;
@@ -656,7 +653,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 				if (!(_tmp30_ < _tmp31_)) {
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					break;
-#line 660 "BlindsEffect.c"
+#line 657 "BlindsEffect.c"
 				}
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				_tmp32_ = ctx;
@@ -708,7 +705,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 				_tmp52_ = ctx;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				cairo_fill (_tmp52_);
-#line 712 "BlindsEffect.c"
+#line 709 "BlindsEffect.c"
 			}
 		}
 	}
@@ -720,7 +717,7 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp54_ = ctx;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	cairo_paint (_tmp54_);
-#line 724 "BlindsEffect.c"
+#line 721 "BlindsEffect.c"
 }
 
 
@@ -732,7 +729,7 @@ static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 736 "BlindsEffect.c"
+#line 733 "BlindsEffect.c"
 }
 
 
@@ -740,7 +737,7 @@ static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {
 	BlindsEffect * self;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
-#line 744 "BlindsEffect.c"
+#line 741 "BlindsEffect.c"
 }
 
 
@@ -751,7 +748,7 @@ static void blinds_effect_class_init (BlindsEffectClass * klass) {
 	g_type_class_add_private (klass, sizeof (BlindsEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = blinds_effect_finalize;
-#line 755 "BlindsEffect.c"
+#line 752 "BlindsEffect.c"
 }
 
 
@@ -759,29 +756,29 @@ static void blinds_effect_spit_transitions_effect_interface_init (SpitTransition
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	blinds_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) blinds_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) blinds_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) blinds_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) blinds_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) blinds_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) blinds_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) blinds_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) blinds_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) blinds_effect_real_cancel;
-#line 774 "BlindsEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) blinds_effect_real_cancel;
+#line 771 "BlindsEffect.c"
 }
 
 
 static void blinds_effect_instance_init (BlindsEffect * self) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self->priv = BLINDS_EFFECT_GET_PRIVATE (self);
-#line 781 "BlindsEffect.c"
+#line 778 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_finalize (GObject* obj) {
+static void blinds_effect_finalize (GObject * obj) {
 	BlindsEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -789,7 +786,7 @@ static void blinds_effect_finalize (GObject* obj) {
 	self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	G_OBJECT_CLASS (blinds_effect_parent_class)->finalize (obj);
-#line 793 "BlindsEffect.c"
+#line 790 "BlindsEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c
index 712d938..e0e3b30 100644
--- a/plugins/shotwell-transitions/ChessEffect.c
+++ b/plugins/shotwell-transitions/ChessEffect.c
@@ -1,4 +1,4 @@
-/* ChessEffect.c generated by valac 0.34.7, the Vala compiler
+/* ChessEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from ChessEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -92,7 +92,7 @@ struct _ChessEffectPrivate {
 
 static gpointer chess_effect_descriptor_parent_class = NULL;
 static gpointer chess_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* chess_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * chess_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType chess_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -121,12 +121,12 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect*
 static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
 static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
 static void chess_effect_real_cancel (SpitTransitionsEffect* base);
-static void chess_effect_finalize (GObject* obj);
+static void chess_effect_finalize (GObject * obj);
 
 
 ChessEffectDescriptor* chess_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	ChessEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -162,23 +162,20 @@ static const gchar* chess_effect_descriptor_real_get_id (ShotwellTransitionDescr
 static const gchar* chess_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	ChessEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT_DESCRIPTOR, ChessEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	_tmp0_ = _ ("Chess");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	result = _tmp0_;
+	result = _ ("Chess");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	return result;
-#line 175 "ChessEffect.c"
+#line 172 "ChessEffect.c"
 }
 
 
 static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	ChessEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	ChessEffect* _tmp0_ = NULL;
+	ChessEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT_DESCRIPTOR, ChessEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -189,7 +186,7 @@ static SpitTransitionsEffect* chess_effect_descriptor_real_create (ShotwellTrans
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	return result;
-#line 193 "ChessEffect.c"
+#line 190 "ChessEffect.c"
 }
 
 
@@ -197,12 +194,12 @@ static void chess_effect_descriptor_class_init (ChessEffectDescriptorClass * kla
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	chess_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) chess_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) chess_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) chess_effect_descriptor_real_create;
-#line 206 "ChessEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) chess_effect_descriptor_real_create;
+#line 203 "ChessEffect.c"
 }
 
 
@@ -228,14 +225,14 @@ ChessEffect* chess_effect_construct (GType object_type) {
 	self = (ChessEffect*) g_object_new (object_type, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	return self;
-#line 232 "ChessEffect.c"
+#line 229 "ChessEffect.c"
 }
 
 
 ChessEffect* chess_effect_new (void) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	return chess_effect_construct (TYPE_CHESS_EFFECT);
-#line 239 "ChessEffect.c"
+#line 236 "ChessEffect.c"
 }
 
 
@@ -253,27 +250,27 @@ static void chess_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
 	if (desired_fps) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 257 "ChessEffect.c"
+#line 254 "ChessEffect.c"
 	}
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	if (min_fps) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 263 "ChessEffect.c"
+#line 260 "ChessEffect.c"
 	}
 }
 
 
 static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
 	ChessEffect * self;
-	SpitTransitionsVisuals* _tmp0_ = NULL;
+	SpitTransitionsVisuals* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	SpitTransitionsVisuals* _tmp4_ = NULL;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	SpitTransitionsVisuals* _tmp4_;
 	GdkRectangle _tmp5_ = {0};
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -300,7 +297,7 @@ static void chess_effect_real_start (SpitTransitionsEffect* base, SpitTransition
 	_tmp7_ = _tmp6_.width;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self->priv->square_count_x = (gdouble) ((_tmp7_ / CHESS_EFFECT_SQUARE_SIZE) + 2);
-#line 304 "ChessEffect.c"
+#line 301 "ChessEffect.c"
 }
 
 
@@ -313,24 +310,24 @@ static gboolean chess_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	return result;
-#line 317 "ChessEffect.c"
+#line 314 "ChessEffect.c"
 }
 
 
 static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	ChessEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gdouble size = 0.0;
-	gdouble _tmp3_ = 0.0;
-	SpitTransitionsVisuals* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	SpitTransitionsVisuals* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
+	gdouble _tmp3_;
+	SpitTransitionsVisuals* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
+	SpitTransitionsVisuals* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	GdkPixbuf* _tmp23_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -359,21 +356,21 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp6_ = _tmp5_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	if (_tmp6_ != NULL) {
-#line 363 "ChessEffect.c"
-		cairo_t* _tmp7_ = NULL;
-		SpitTransitionsVisuals* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		SpitTransitionsVisuals* _tmp11_ = NULL;
+#line 360 "ChessEffect.c"
+		cairo_t* _tmp7_;
+		SpitTransitionsVisuals* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
+		SpitTransitionsVisuals* _tmp11_;
 		GdkRectangle _tmp12_ = {0};
-		GdkRectangle _tmp13_ = {0};
-		gint _tmp14_ = 0;
-		SpitTransitionsVisuals* _tmp15_ = NULL;
+		GdkRectangle _tmp13_;
+		gint _tmp14_;
+		SpitTransitionsVisuals* _tmp15_;
 		GdkRectangle _tmp16_ = {0};
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		cairo_t* _tmp19_ = NULL;
-		gdouble _tmp20_ = 0.0;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		cairo_t* _tmp19_;
+		gdouble _tmp20_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		_tmp7_ = ctx;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -406,7 +403,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp20_ = alpha;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		cairo_paint_with_alpha (_tmp19_, 1 - _tmp20_);
-#line 410 "ChessEffect.c"
+#line 407 "ChessEffect.c"
 	}
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	_tmp21_ = visuals;
@@ -416,22 +413,22 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp23_ = _tmp22_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	if (_tmp23_ != NULL) {
-#line 420 "ChessEffect.c"
-		cairo_t* _tmp24_ = NULL;
-		SpitTransitionsVisuals* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		GdkPixbuf* _tmp27_ = NULL;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
+#line 417 "ChessEffect.c"
+		cairo_t* _tmp24_;
+		SpitTransitionsVisuals* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		GdkPixbuf* _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
 		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		SpitTransitionsVisuals* _tmp32_ = NULL;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		SpitTransitionsVisuals* _tmp32_;
 		GdkRectangle _tmp33_ = {0};
-		GdkRectangle _tmp34_ = {0};
-		gint _tmp35_ = 0;
-		cairo_t* _tmp81_ = NULL;
-		cairo_t* _tmp82_ = NULL;
-		gdouble _tmp83_ = 0.0;
+		GdkRectangle _tmp34_;
+		gint _tmp35_;
+		cairo_t* _tmp81_;
+		cairo_t* _tmp82_;
+		gdouble _tmp83_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		_tmp24_ = ctx;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -458,30 +455,30 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp35_ = _tmp34_.y;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		gdk_cairo_set_source_pixbuf (_tmp24_, _tmp27_, (gdouble) _tmp31_, (gdouble) _tmp35_);
-#line 462 "ChessEffect.c"
+#line 459 "ChessEffect.c"
 		{
 			gdouble y = 0.0;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 			y = (gdouble) 0;
-#line 467 "ChessEffect.c"
+#line 464 "ChessEffect.c"
 			{
 				gboolean _tmp36_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 				_tmp36_ = TRUE;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 				while (TRUE) {
-#line 474 "ChessEffect.c"
-					gdouble _tmp38_ = 0.0;
-					gdouble _tmp39_ = 0.0;
+#line 471 "ChessEffect.c"
+					gdouble _tmp38_;
+					gdouble _tmp39_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 					if (!_tmp36_) {
-#line 479 "ChessEffect.c"
-						gdouble _tmp37_ = 0.0;
+#line 476 "ChessEffect.c"
+						gdouble _tmp37_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 						_tmp37_ = y;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 						y = _tmp37_ + 1;
-#line 485 "ChessEffect.c"
+#line 482 "ChessEffect.c"
 					}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 					_tmp36_ = FALSE;
@@ -493,38 +490,38 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 					if (!(_tmp38_ <= _tmp39_)) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 						break;
-#line 497 "ChessEffect.c"
+#line 494 "ChessEffect.c"
 					}
 					{
 						gdouble x = 0.0;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 						x = (gdouble) 0;
-#line 503 "ChessEffect.c"
+#line 500 "ChessEffect.c"
 						{
 							gboolean _tmp40_ = FALSE;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 							_tmp40_ = TRUE;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 							while (TRUE) {
-#line 510 "ChessEffect.c"
-								gdouble _tmp42_ = 0.0;
-								gdouble _tmp43_ = 0.0;
+#line 507 "ChessEffect.c"
+								gdouble _tmp42_;
+								gdouble _tmp43_;
 								gdouble _tmp44_ = 0.0;
-								gdouble _tmp45_ = 0.0;
-								gdouble _tmp46_ = 0.0;
+								gdouble _tmp45_;
+								gdouble _tmp46_;
 								gdouble translation = 0.0;
-								SpitTransitionsMotion* _tmp47_ = NULL;
-								SpitTransitionsDirection _tmp48_ = 0;
-								SpitTransitionsDirection _tmp49_ = 0;
+								SpitTransitionsMotion* _tmp47_;
+								SpitTransitionsDirection _tmp48_;
+								SpitTransitionsDirection _tmp49_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 								if (!_tmp40_) {
-#line 522 "ChessEffect.c"
-									gdouble _tmp41_ = 0.0;
+#line 519 "ChessEffect.c"
+									gdouble _tmp41_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									_tmp41_ = x;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									x = _tmp41_ + 1;
-#line 528 "ChessEffect.c"
+#line 525 "ChessEffect.c"
 								}
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 								_tmp40_ = FALSE;
@@ -536,7 +533,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 								if (!(_tmp42_ <= _tmp43_)) {
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									break;
-#line 540 "ChessEffect.c"
+#line 537 "ChessEffect.c"
 								}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 								_tmp45_ = x;
@@ -546,11 +543,11 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 								if (fmod (_tmp45_ + _tmp46_, 2) == ((gdouble) 0)) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									_tmp44_ = (-1.5) * CHESS_EFFECT_SQUARE_SIZE;
-#line 550 "ChessEffect.c"
+#line 547 "ChessEffect.c"
 								} else {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									_tmp44_ = 1.5 * CHESS_EFFECT_SQUARE_SIZE;
-#line 554 "ChessEffect.c"
+#line 551 "ChessEffect.c"
 								}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 								translation = _tmp44_;
@@ -562,20 +559,20 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 								_tmp49_ = _tmp48_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 								if (_tmp49_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 566 "ChessEffect.c"
-									cairo_t* _tmp50_ = NULL;
-									SpitTransitionsVisuals* _tmp51_ = NULL;
+#line 563 "ChessEffect.c"
+									cairo_t* _tmp50_;
+									SpitTransitionsVisuals* _tmp51_;
 									GdkRectangle _tmp52_ = {0};
-									GdkRectangle _tmp53_ = {0};
-									gint _tmp54_ = 0;
-									gdouble _tmp55_ = 0.0;
-									gdouble _tmp56_ = 0.0;
-									SpitTransitionsVisuals* _tmp57_ = NULL;
+									GdkRectangle _tmp53_;
+									gint _tmp54_;
+									gdouble _tmp55_;
+									gdouble _tmp56_;
+									SpitTransitionsVisuals* _tmp57_;
 									GdkRectangle _tmp58_ = {0};
-									GdkRectangle _tmp59_ = {0};
-									gint _tmp60_ = 0;
-									gdouble _tmp61_ = 0.0;
-									gdouble _tmp62_ = 0.0;
+									GdkRectangle _tmp59_;
+									gint _tmp60_;
+									gdouble _tmp61_;
+									gdouble _tmp62_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									_tmp50_ = ctx;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -604,26 +601,26 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 									_tmp62_ = size;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									cairo_rectangle (_tmp50_, (_tmp54_ + _tmp55_) + (_tmp56_ * CHESS_EFFECT_SQUARE_SIZE), _tmp60_ + (_tmp61_ * CHESS_EFFECT_SQUARE_SIZE), _tmp62_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
-#line 608 "ChessEffect.c"
+#line 605 "ChessEffect.c"
 								} else {
-									cairo_t* _tmp63_ = NULL;
-									SpitTransitionsVisuals* _tmp64_ = NULL;
+									cairo_t* _tmp63_;
+									SpitTransitionsVisuals* _tmp64_;
 									GdkRectangle _tmp65_ = {0};
-									GdkRectangle _tmp66_ = {0};
-									gint _tmp67_ = 0;
-									SpitTransitionsVisuals* _tmp68_ = NULL;
+									GdkRectangle _tmp66_;
+									gint _tmp67_;
+									SpitTransitionsVisuals* _tmp68_;
 									GdkRectangle _tmp69_ = {0};
-									GdkRectangle _tmp70_ = {0};
-									gint _tmp71_ = 0;
-									gdouble _tmp72_ = 0.0;
-									gdouble _tmp73_ = 0.0;
-									gdouble _tmp74_ = 0.0;
-									SpitTransitionsVisuals* _tmp75_ = NULL;
+									GdkRectangle _tmp70_;
+									gint _tmp71_;
+									gdouble _tmp72_;
+									gdouble _tmp73_;
+									gdouble _tmp74_;
+									SpitTransitionsVisuals* _tmp75_;
 									GdkRectangle _tmp76_ = {0};
-									GdkRectangle _tmp77_ = {0};
-									gint _tmp78_ = 0;
-									gdouble _tmp79_ = 0.0;
-									gdouble _tmp80_ = 0.0;
+									GdkRectangle _tmp77_;
+									gint _tmp78_;
+									gdouble _tmp79_;
+									gdouble _tmp80_;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									_tmp63_ = ctx;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
@@ -662,7 +659,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 									_tmp80_ = size;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 									cairo_rectangle (_tmp63_, (((_tmp67_ + _tmp71_) + _tmp72_) - (_tmp73_ * CHESS_EFFECT_SQUARE_SIZE)) - _tmp74_, _tmp78_ + (_tmp79_ * CHESS_EFFECT_SQUARE_SIZE), _tmp80_, (gdouble) CHESS_EFFECT_SQUARE_SIZE);
-#line 666 "ChessEffect.c"
+#line 663 "ChessEffect.c"
 								}
 							}
 						}
@@ -680,7 +677,7 @@ static void chess_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp83_ = alpha;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 		cairo_paint_with_alpha (_tmp82_, _tmp83_);
-#line 684 "ChessEffect.c"
+#line 681 "ChessEffect.c"
 	}
 }
 
@@ -693,7 +690,7 @@ static void chess_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 697 "ChessEffect.c"
+#line 694 "ChessEffect.c"
 }
 
 
@@ -701,7 +698,7 @@ static void chess_effect_real_cancel (SpitTransitionsEffect* base) {
 	ChessEffect * self;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHESS_EFFECT, ChessEffect);
-#line 705 "ChessEffect.c"
+#line 702 "ChessEffect.c"
 }
 
 
@@ -712,7 +709,7 @@ static void chess_effect_class_init (ChessEffectClass * klass) {
 	g_type_class_add_private (klass, sizeof (ChessEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = chess_effect_finalize;
-#line 716 "ChessEffect.c"
+#line 713 "ChessEffect.c"
 }
 
 
@@ -720,35 +717,35 @@ static void chess_effect_spit_transitions_effect_interface_init (SpitTransitions
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	chess_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) chess_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) chess_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) chess_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) chess_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) chess_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) chess_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) chess_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) chess_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) chess_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) chess_effect_real_cancel;
-#line 735 "ChessEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) chess_effect_real_cancel;
+#line 732 "ChessEffect.c"
 }
 
 
 static void chess_effect_instance_init (ChessEffect * self) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self->priv = CHESS_EFFECT_GET_PRIVATE (self);
-#line 742 "ChessEffect.c"
+#line 739 "ChessEffect.c"
 }
 
 
-static void chess_effect_finalize (GObject* obj) {
+static void chess_effect_finalize (GObject * obj) {
 	ChessEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHESS_EFFECT, ChessEffect);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ChessEffect.vala"
 	G_OBJECT_CLASS (chess_effect_parent_class)->finalize (obj);
-#line 752 "ChessEffect.c"
+#line 749 "ChessEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c
index 41871a7..97680cb 100644
--- a/plugins/shotwell-transitions/CircleEffect.c
+++ b/plugins/shotwell-transitions/CircleEffect.c
@@ -1,4 +1,4 @@
-/* CircleEffect.c generated by valac 0.34.7, the Vala compiler
+/* CircleEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from CircleEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -87,7 +87,7 @@ struct _CircleEffectClass {
 
 static gpointer circle_effect_descriptor_parent_class = NULL;
 static gpointer circle_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* circle_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * circle_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType circle_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -118,7 +118,7 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base);
 
 CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	CircleEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -154,23 +154,20 @@ static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDesc
 static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	CircleEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	_tmp0_ = _ ("Circle");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	result = _tmp0_;
+	result = _ ("Circle");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 167 "CircleEffect.c"
+#line 164 "CircleEffect.c"
 }
 
 
 static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	CircleEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	CircleEffect* _tmp0_ = NULL;
+	CircleEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -181,7 +178,7 @@ static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTran
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 185 "CircleEffect.c"
+#line 182 "CircleEffect.c"
 }
 
 
@@ -189,12 +186,12 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circle_effect_descriptor_real_create;
-#line 198 "CircleEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circle_effect_descriptor_real_create;
+#line 195 "CircleEffect.c"
 }
 
 
@@ -220,14 +217,14 @@ CircleEffect* circle_effect_construct (GType object_type) {
 	self = (CircleEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return self;
-#line 224 "CircleEffect.c"
+#line 221 "CircleEffect.c"
 }
 
 
 CircleEffect* circle_effect_new (void) {
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return circle_effect_construct (TYPE_CIRCLE_EFFECT);
-#line 231 "CircleEffect.c"
+#line 228 "CircleEffect.c"
 }
 
 
@@ -245,13 +242,13 @@ static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 249 "CircleEffect.c"
+#line 246 "CircleEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 255 "CircleEffect.c"
+#line 252 "CircleEffect.c"
 	}
 }
 
@@ -264,7 +261,7 @@ static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 268 "CircleEffect.c"
+#line 265 "CircleEffect.c"
 }
 
 
@@ -277,27 +274,27 @@ static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 281 "CircleEffect.c"
+#line 278 "CircleEffect.c"
 }
 
 
 static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	CircleEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gint radius = 0;
-	gdouble _tmp3_ = 0.0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
-	SpitTransitionsVisuals* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	SpitTransitionsVisuals* _tmp24_ = NULL;
-	GdkPixbuf* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
+	SpitTransitionsVisuals* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	SpitTransitionsVisuals* _tmp24_;
+	GdkPixbuf* _tmp25_;
+	GdkPixbuf* _tmp26_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -332,21 +329,21 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp9_ = _tmp8_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (_tmp9_ != NULL) {
-#line 336 "CircleEffect.c"
-		cairo_t* _tmp10_ = NULL;
-		SpitTransitionsVisuals* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+#line 333 "CircleEffect.c"
+		cairo_t* _tmp10_;
+		SpitTransitionsVisuals* _tmp11_;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		SpitTransitionsVisuals* _tmp18_ = NULL;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		SpitTransitionsVisuals* _tmp18_;
 		GdkRectangle _tmp19_ = {0};
-		GdkRectangle _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		cairo_t* _tmp22_ = NULL;
-		gdouble _tmp23_ = 0.0;
+		GdkRectangle _tmp20_;
+		gint _tmp21_;
+		cairo_t* _tmp22_;
+		gdouble _tmp23_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		_tmp10_ = ctx;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -379,7 +376,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 		_tmp23_ = alpha;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		cairo_paint_with_alpha (_tmp22_, 1 - _tmp23_);
-#line 383 "CircleEffect.c"
+#line 380 "CircleEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	_tmp24_ = visuals;
@@ -389,25 +386,25 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp26_ = _tmp25_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (_tmp26_ != NULL) {
-#line 393 "CircleEffect.c"
-		cairo_t* _tmp27_ = NULL;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
-		GdkPixbuf* _tmp29_ = NULL;
-		GdkPixbuf* _tmp30_ = NULL;
-		SpitTransitionsVisuals* _tmp31_ = NULL;
+#line 390 "CircleEffect.c"
+		cairo_t* _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
+		GdkPixbuf* _tmp29_;
+		GdkPixbuf* _tmp30_;
+		SpitTransitionsVisuals* _tmp31_;
 		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		SpitTransitionsVisuals* _tmp35_ = NULL;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		SpitTransitionsVisuals* _tmp35_;
 		GdkRectangle _tmp36_ = {0};
-		GdkRectangle _tmp37_ = {0};
-		gint _tmp38_ = 0;
-		cairo_t* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
-		cairo_t* _tmp43_ = NULL;
-		cairo_t* _tmp44_ = NULL;
+		GdkRectangle _tmp37_;
+		gint _tmp38_;
+		cairo_t* _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
+		gint _tmp42_;
+		cairo_t* _tmp43_;
+		cairo_t* _tmp44_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		_tmp27_ = ctx;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -452,7 +449,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 		_tmp44_ = ctx;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		cairo_paint (_tmp44_);
-#line 456 "CircleEffect.c"
+#line 453 "CircleEffect.c"
 	}
 }
 
@@ -465,7 +462,7 @@ static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 469 "CircleEffect.c"
+#line 466 "CircleEffect.c"
 }
 
 
@@ -473,14 +470,14 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base) {
 	CircleEffect * self;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
-#line 477 "CircleEffect.c"
+#line 474 "CircleEffect.c"
 }
 
 
 static void circle_effect_class_init (CircleEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_parent_class = g_type_class_peek_parent (klass);
-#line 484 "CircleEffect.c"
+#line 481 "CircleEffect.c"
 }
 
 
@@ -488,18 +485,18 @@ static void circle_effect_spit_transitions_effect_interface_init (SpitTransition
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) circle_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) circle_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) circle_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) circle_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) circle_effect_real_cancel;
-#line 503 "CircleEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) circle_effect_real_cancel;
+#line 500 "CircleEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c
index b4b82c6..2ae59b7 100644
--- a/plugins/shotwell-transitions/CirclesEffect.c
+++ b/plugins/shotwell-transitions/CirclesEffect.c
@@ -1,4 +1,4 @@
-/* CirclesEffect.c generated by valac 0.34.7, the Vala compiler
+/* CirclesEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from CirclesEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -87,7 +87,7 @@ struct _CirclesEffectClass {
 
 static gpointer circles_effect_descriptor_parent_class = NULL;
 static gpointer circles_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* circles_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * circles_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType circles_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -119,7 +119,7 @@ static void circles_effect_real_cancel (SpitTransitionsEffect* base);
 
 CirclesEffectDescriptor* circles_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	CirclesEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -155,23 +155,20 @@ static const gchar* circles_effect_descriptor_real_get_id (ShotwellTransitionDes
 static const gchar* circles_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	CirclesEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT_DESCRIPTOR, CirclesEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	_tmp0_ = _ ("Circles");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	result = _tmp0_;
+	result = _ ("Circles");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	return result;
-#line 168 "CirclesEffect.c"
+#line 165 "CirclesEffect.c"
 }
 
 
 static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	CirclesEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	CirclesEffect* _tmp0_ = NULL;
+	CirclesEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT_DESCRIPTOR, CirclesEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -182,7 +179,7 @@ static SpitTransitionsEffect* circles_effect_descriptor_real_create (ShotwellTra
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	return result;
-#line 186 "CirclesEffect.c"
+#line 183 "CirclesEffect.c"
 }
 
 
@@ -190,12 +187,12 @@ static void circles_effect_descriptor_class_init (CirclesEffectDescriptorClass *
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	circles_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circles_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circles_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circles_effect_descriptor_real_create;
-#line 199 "CirclesEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circles_effect_descriptor_real_create;
+#line 196 "CirclesEffect.c"
 }
 
 
@@ -221,14 +218,14 @@ CirclesEffect* circles_effect_construct (GType object_type) {
 	self = (CirclesEffect*) g_object_new (object_type, NULL);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	return self;
-#line 225 "CirclesEffect.c"
+#line 222 "CirclesEffect.c"
 }
 
 
 CirclesEffect* circles_effect_new (void) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	return circles_effect_construct (TYPE_CIRCLES_EFFECT);
-#line 232 "CirclesEffect.c"
+#line 229 "CirclesEffect.c"
 }
 
 
@@ -246,13 +243,13 @@ static void circles_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
 	if (desired_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 250 "CirclesEffect.c"
+#line 247 "CirclesEffect.c"
 	}
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	if (min_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 256 "CirclesEffect.c"
+#line 253 "CirclesEffect.c"
 	}
 }
 
@@ -265,7 +262,7 @@ static void circles_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 269 "CirclesEffect.c"
+#line 266 "CirclesEffect.c"
 }
 
 
@@ -278,32 +275,32 @@ static gboolean circles_effect_real_needs_clear_background (SpitTransitionsEffec
 	result = TRUE;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	return result;
-#line 282 "CirclesEffect.c"
+#line 279 "CirclesEffect.c"
 }
 
 
 static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	CirclesEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gint distance = 0;
 	gint radius = 0;
 	gint circleCountX = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gint circleCountY = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
+	gint _tmp5_;
+	gint _tmp6_;
 	gdouble maxRadius = 0.0;
-	gint _tmp7_ = 0;
-	SpitTransitionsVisuals* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	SpitTransitionsVisuals* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	GdkPixbuf* _tmp27_ = NULL;
+	gint _tmp7_;
+	SpitTransitionsVisuals* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
+	SpitTransitionsVisuals* _tmp25_;
+	GdkPixbuf* _tmp26_;
+	GdkPixbuf* _tmp27_;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -346,21 +343,21 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp10_ = _tmp9_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	if (_tmp10_ != NULL) {
-#line 350 "CirclesEffect.c"
-		cairo_t* _tmp11_ = NULL;
-		SpitTransitionsVisuals* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		SpitTransitionsVisuals* _tmp15_ = NULL;
+#line 347 "CirclesEffect.c"
+		cairo_t* _tmp11_;
+		SpitTransitionsVisuals* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		SpitTransitionsVisuals* _tmp15_;
 		GdkRectangle _tmp16_ = {0};
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
-		SpitTransitionsVisuals* _tmp19_ = NULL;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		SpitTransitionsVisuals* _tmp19_;
 		GdkRectangle _tmp20_ = {0};
-		GdkRectangle _tmp21_ = {0};
-		gint _tmp22_ = 0;
-		cairo_t* _tmp23_ = NULL;
-		gdouble _tmp24_ = 0.0;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
+		cairo_t* _tmp23_;
+		gdouble _tmp24_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		_tmp11_ = ctx;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -393,7 +390,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp24_ = alpha;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		cairo_paint_with_alpha (_tmp23_, 1 - _tmp24_);
-#line 397 "CirclesEffect.c"
+#line 394 "CirclesEffect.c"
 	}
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	_tmp25_ = visuals;
@@ -403,22 +400,22 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp27_ = _tmp26_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	if (_tmp27_ != NULL) {
-#line 407 "CirclesEffect.c"
-		cairo_t* _tmp28_ = NULL;
-		SpitTransitionsVisuals* _tmp29_ = NULL;
-		GdkPixbuf* _tmp30_ = NULL;
-		GdkPixbuf* _tmp31_ = NULL;
-		SpitTransitionsVisuals* _tmp32_ = NULL;
+#line 404 "CirclesEffect.c"
+		cairo_t* _tmp28_;
+		SpitTransitionsVisuals* _tmp29_;
+		GdkPixbuf* _tmp30_;
+		GdkPixbuf* _tmp31_;
+		SpitTransitionsVisuals* _tmp32_;
 		GdkRectangle _tmp33_ = {0};
-		GdkRectangle _tmp34_ = {0};
-		gint _tmp35_ = 0;
-		SpitTransitionsVisuals* _tmp36_ = NULL;
+		GdkRectangle _tmp34_;
+		gint _tmp35_;
+		SpitTransitionsVisuals* _tmp36_;
 		GdkRectangle _tmp37_ = {0};
-		GdkRectangle _tmp38_ = {0};
-		gint _tmp39_ = 0;
-		cairo_t* _tmp63_ = NULL;
-		cairo_t* _tmp64_ = NULL;
-		gdouble _tmp65_ = 0.0;
+		GdkRectangle _tmp38_;
+		gint _tmp39_;
+		cairo_t* _tmp63_;
+		cairo_t* _tmp64_;
+		gdouble _tmp65_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		_tmp28_ = ctx;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
@@ -445,30 +442,30 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp39_ = _tmp38_.y;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		gdk_cairo_set_source_pixbuf (_tmp28_, _tmp31_, (gdouble) _tmp35_, (gdouble) _tmp39_);
-#line 449 "CirclesEffect.c"
+#line 446 "CirclesEffect.c"
 		{
 			gint y = 0;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 			y = 0;
-#line 454 "CirclesEffect.c"
+#line 451 "CirclesEffect.c"
 			{
 				gboolean _tmp40_ = FALSE;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 				_tmp40_ = TRUE;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 				while (TRUE) {
-#line 461 "CirclesEffect.c"
-					gint _tmp42_ = 0;
-					gint _tmp43_ = 0;
+#line 458 "CirclesEffect.c"
+					gint _tmp42_;
+					gint _tmp43_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 					if (!_tmp40_) {
-#line 466 "CirclesEffect.c"
-						gint _tmp41_ = 0;
+#line 463 "CirclesEffect.c"
+						gint _tmp41_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 						_tmp41_ = y;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 						y = _tmp41_ + 1;
-#line 472 "CirclesEffect.c"
+#line 469 "CirclesEffect.c"
 					}
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 					_tmp40_ = FALSE;
@@ -480,46 +477,46 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					if (!(_tmp42_ <= _tmp43_)) {
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 						break;
-#line 484 "CirclesEffect.c"
+#line 481 "CirclesEffect.c"
 					}
 					{
 						gint x = 0;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 						x = 0;
-#line 490 "CirclesEffect.c"
+#line 487 "CirclesEffect.c"
 						{
 							gboolean _tmp44_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 							_tmp44_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 							while (TRUE) {
-#line 497 "CirclesEffect.c"
-								gint _tmp46_ = 0;
-								gint _tmp47_ = 0;
-								gdouble _tmp48_ = 0.0;
-								gint _tmp49_ = 0;
-								gint _tmp50_ = 0;
-								gint _tmp51_ = 0;
-								gint _tmp52_ = 0;
-								gdouble _tmp53_ = 0.0;
-								gdouble _tmp54_ = 0.0;
-								gdouble _tmp55_ = 0.0;
-								cairo_t* _tmp56_ = NULL;
-								gint _tmp57_ = 0;
-								gint _tmp58_ = 0;
-								gint _tmp59_ = 0;
-								gint _tmp60_ = 0;
-								gint _tmp61_ = 0;
-								cairo_t* _tmp62_ = NULL;
+#line 494 "CirclesEffect.c"
+								gint _tmp46_;
+								gint _tmp47_;
+								gdouble _tmp48_;
+								gint _tmp49_;
+								gint _tmp50_;
+								gint _tmp51_;
+								gint _tmp52_;
+								gdouble _tmp53_;
+								gdouble _tmp54_;
+								gdouble _tmp55_;
+								cairo_t* _tmp56_;
+								gint _tmp57_;
+								gint _tmp58_;
+								gint _tmp59_;
+								gint _tmp60_;
+								gint _tmp61_;
+								cairo_t* _tmp62_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 								if (!_tmp44_) {
-#line 517 "CirclesEffect.c"
-									gint _tmp45_ = 0;
+#line 514 "CirclesEffect.c"
+									gint _tmp45_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 									_tmp45_ = x;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 									x = _tmp45_ + 1;
-#line 523 "CirclesEffect.c"
+#line 520 "CirclesEffect.c"
 								}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 								_tmp44_ = FALSE;
@@ -531,7 +528,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 								if (!(_tmp46_ <= _tmp47_)) {
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 									break;
-#line 535 "CirclesEffect.c"
+#line 532 "CirclesEffect.c"
 								}
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 								_tmp48_ = alpha;
@@ -569,7 +566,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 								_tmp62_ = ctx;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 								cairo_fill (_tmp62_);
-#line 573 "CirclesEffect.c"
+#line 570 "CirclesEffect.c"
 							}
 						}
 					}
@@ -586,7 +583,7 @@ static void circles_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp65_ = alpha;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 		cairo_paint_with_alpha (_tmp64_, _tmp65_);
-#line 590 "CirclesEffect.c"
+#line 587 "CirclesEffect.c"
 	}
 }
 
@@ -599,7 +596,7 @@ static void circles_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 603 "CirclesEffect.c"
+#line 600 "CirclesEffect.c"
 }
 
 
@@ -607,14 +604,14 @@ static void circles_effect_real_cancel (SpitTransitionsEffect* base) {
 	CirclesEffect * self;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLES_EFFECT, CirclesEffect);
-#line 611 "CirclesEffect.c"
+#line 608 "CirclesEffect.c"
 }
 
 
 static void circles_effect_class_init (CirclesEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	circles_effect_parent_class = g_type_class_peek_parent (klass);
-#line 618 "CirclesEffect.c"
+#line 615 "CirclesEffect.c"
 }
 
 
@@ -622,18 +619,18 @@ static void circles_effect_spit_transitions_effect_interface_init (SpitTransitio
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
 	circles_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) circles_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) circles_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circles_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circles_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) circles_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) circles_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circles_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circles_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circles_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CirclesEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) circles_effect_real_cancel;
-#line 637 "CirclesEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) circles_effect_real_cancel;
+#line 634 "CirclesEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c
index 8f5ed37..c1f5257 100644
--- a/plugins/shotwell-transitions/ClockEffect.c
+++ b/plugins/shotwell-transitions/ClockEffect.c
@@ -1,4 +1,4 @@
-/* ClockEffect.c generated by valac 0.34.7, the Vala compiler
+/* ClockEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from ClockEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -87,7 +87,7 @@ struct _ClockEffectClass {
 
 static gpointer clock_effect_descriptor_parent_class = NULL;
 static gpointer clock_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* clock_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -119,7 +119,7 @@ static void clock_effect_real_cancel (SpitTransitionsEffect* base);
 
 ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	ClockEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -155,23 +155,20 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr
 static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	ClockEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp0_ = _ ("Clock");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	result = _tmp0_;
+	result = _ ("Clock");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 168 "ClockEffect.c"
+#line 165 "ClockEffect.c"
 }
 
 
 static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	ClockEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	ClockEffect* _tmp0_ = NULL;
+	ClockEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -182,7 +179,7 @@ static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTrans
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 186 "ClockEffect.c"
+#line 183 "ClockEffect.c"
 }
 
 
@@ -190,12 +187,12 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) clock_effect_descriptor_real_create;
-#line 199 "ClockEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create;
+#line 196 "ClockEffect.c"
 }
 
 
@@ -221,14 +218,14 @@ ClockEffect* clock_effect_construct (GType object_type) {
 	self = (ClockEffect*) g_object_new (object_type, NULL);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return self;
-#line 225 "ClockEffect.c"
+#line 222 "ClockEffect.c"
 }
 
 
 ClockEffect* clock_effect_new (void) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return clock_effect_construct (TYPE_CLOCK_EFFECT);
-#line 232 "ClockEffect.c"
+#line 229 "ClockEffect.c"
 }
 
 
@@ -246,13 +243,13 @@ static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
 	if (desired_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 250 "ClockEffect.c"
+#line 247 "ClockEffect.c"
 	}
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (min_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 256 "ClockEffect.c"
+#line 253 "ClockEffect.c"
 	}
 }
 
@@ -265,7 +262,7 @@ static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransition
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 269 "ClockEffect.c"
+#line 266 "ClockEffect.c"
 }
 
 
@@ -278,37 +275,37 @@ static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 282 "ClockEffect.c"
+#line 279 "ClockEffect.c"
 }
 
 
 static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	ClockEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gdouble start_angle = 0.0;
 	gdouble stop_angle = 0.0;
-	SpitTransitionsMotion* _tmp3_ = NULL;
-	SpitTransitionsDirection _tmp4_ = 0;
-	SpitTransitionsDirection _tmp5_ = 0;
+	SpitTransitionsMotion* _tmp3_;
+	SpitTransitionsDirection _tmp4_;
+	SpitTransitionsDirection _tmp5_;
 	gint radius = 0;
-	SpitTransitionsVisuals* _tmp8_ = NULL;
+	SpitTransitionsVisuals* _tmp8_;
 	GdkRectangle _tmp9_ = {0};
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	SpitTransitionsVisuals* _tmp12_ = NULL;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	SpitTransitionsVisuals* _tmp12_;
 	GdkRectangle _tmp13_ = {0};
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gdouble _tmp16_ = 0.0;
-	SpitTransitionsVisuals* _tmp17_ = NULL;
-	GdkPixbuf* _tmp18_ = NULL;
-	GdkPixbuf* _tmp19_ = NULL;
-	SpitTransitionsVisuals* _tmp34_ = NULL;
-	GdkPixbuf* _tmp35_ = NULL;
-	GdkPixbuf* _tmp36_ = NULL;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	gdouble _tmp16_;
+	SpitTransitionsVisuals* _tmp17_;
+	GdkPixbuf* _tmp18_;
+	GdkPixbuf* _tmp19_;
+	SpitTransitionsVisuals* _tmp34_;
+	GdkPixbuf* _tmp35_;
+	GdkPixbuf* _tmp36_;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -337,20 +334,20 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp5_ = _tmp4_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 341 "ClockEffect.c"
-		gdouble _tmp6_ = 0.0;
+#line 338 "ClockEffect.c"
+		gdouble _tmp6_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp6_ = alpha;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
-#line 347 "ClockEffect.c"
+#line 344 "ClockEffect.c"
 	} else {
-		gdouble _tmp7_ = 0.0;
+		gdouble _tmp7_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp7_ = alpha;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
-#line 354 "ClockEffect.c"
+#line 351 "ClockEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	_tmp8_ = visuals;
@@ -380,21 +377,21 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp19_ = _tmp18_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp19_ != NULL) {
-#line 384 "ClockEffect.c"
-		cairo_t* _tmp20_ = NULL;
-		SpitTransitionsVisuals* _tmp21_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
+#line 381 "ClockEffect.c"
+		cairo_t* _tmp20_;
+		SpitTransitionsVisuals* _tmp21_;
+		GdkPixbuf* _tmp22_;
+		GdkPixbuf* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
 		GdkRectangle _tmp25_ = {0};
-		GdkRectangle _tmp26_ = {0};
-		gint _tmp27_ = 0;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
+		GdkRectangle _tmp26_;
+		gint _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
 		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		cairo_t* _tmp32_ = NULL;
-		gdouble _tmp33_ = 0.0;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		cairo_t* _tmp32_;
+		gdouble _tmp33_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp20_ = ctx;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -427,7 +424,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp33_ = alpha;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_);
-#line 431 "ClockEffect.c"
+#line 428 "ClockEffect.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	_tmp34_ = visuals;
@@ -437,47 +434,47 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp36_ = _tmp35_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp36_ != NULL) {
-#line 441 "ClockEffect.c"
-		cairo_t* _tmp37_ = NULL;
-		SpitTransitionsVisuals* _tmp38_ = NULL;
-		GdkPixbuf* _tmp39_ = NULL;
-		GdkPixbuf* _tmp40_ = NULL;
-		SpitTransitionsVisuals* _tmp41_ = NULL;
+#line 438 "ClockEffect.c"
+		cairo_t* _tmp37_;
+		SpitTransitionsVisuals* _tmp38_;
+		GdkPixbuf* _tmp39_;
+		GdkPixbuf* _tmp40_;
+		SpitTransitionsVisuals* _tmp41_;
 		GdkRectangle _tmp42_ = {0};
-		GdkRectangle _tmp43_ = {0};
-		gint _tmp44_ = 0;
-		SpitTransitionsVisuals* _tmp45_ = NULL;
+		GdkRectangle _tmp43_;
+		gint _tmp44_;
+		SpitTransitionsVisuals* _tmp45_;
 		GdkRectangle _tmp46_ = {0};
-		GdkRectangle _tmp47_ = {0};
-		gint _tmp48_ = 0;
+		GdkRectangle _tmp47_;
+		gint _tmp48_;
 		gint x = 0;
-		SpitTransitionsVisuals* _tmp49_ = NULL;
+		SpitTransitionsVisuals* _tmp49_;
 		GdkRectangle _tmp50_ = {0};
-		GdkRectangle _tmp51_ = {0};
-		gint _tmp52_ = 0;
-		SpitTransitionsVisuals* _tmp53_ = NULL;
+		GdkRectangle _tmp51_;
+		gint _tmp52_;
+		SpitTransitionsVisuals* _tmp53_;
 		GdkRectangle _tmp54_ = {0};
-		GdkRectangle _tmp55_ = {0};
-		gint _tmp56_ = 0;
+		GdkRectangle _tmp55_;
+		gint _tmp56_;
 		gint y = 0;
-		SpitTransitionsVisuals* _tmp57_ = NULL;
+		SpitTransitionsVisuals* _tmp57_;
 		GdkRectangle _tmp58_ = {0};
-		GdkRectangle _tmp59_ = {0};
-		gint _tmp60_ = 0;
-		SpitTransitionsVisuals* _tmp61_ = NULL;
+		GdkRectangle _tmp59_;
+		gint _tmp60_;
+		SpitTransitionsVisuals* _tmp61_;
 		GdkRectangle _tmp62_ = {0};
-		GdkRectangle _tmp63_ = {0};
-		gint _tmp64_ = 0;
-		cairo_t* _tmp65_ = NULL;
-		gint _tmp66_ = 0;
-		gint _tmp67_ = 0;
-		cairo_t* _tmp68_ = NULL;
-		gint _tmp69_ = 0;
-		gint _tmp70_ = 0;
-		gint _tmp71_ = 0;
-		gdouble _tmp72_ = 0.0;
-		gdouble _tmp73_ = 0.0;
-		cairo_t* _tmp74_ = NULL;
+		GdkRectangle _tmp63_;
+		gint _tmp64_;
+		cairo_t* _tmp65_;
+		gint _tmp66_;
+		gint _tmp67_;
+		cairo_t* _tmp68_;
+		gint _tmp69_;
+		gint _tmp70_;
+		gint _tmp71_;
+		gdouble _tmp72_;
+		gdouble _tmp73_;
+		cairo_t* _tmp74_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp37_ = ctx;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -566,7 +563,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp74_ = ctx;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		cairo_fill_preserve (_tmp74_);
-#line 570 "ClockEffect.c"
+#line 567 "ClockEffect.c"
 	}
 }
 
@@ -579,7 +576,7 @@ static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 583 "ClockEffect.c"
+#line 580 "ClockEffect.c"
 }
 
 
@@ -587,14 +584,14 @@ static void clock_effect_real_cancel (SpitTransitionsEffect* base) {
 	ClockEffect * self;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
-#line 591 "ClockEffect.c"
+#line 588 "ClockEffect.c"
 }
 
 
 static void clock_effect_class_init (ClockEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_parent_class = g_type_class_peek_parent (klass);
-#line 598 "ClockEffect.c"
+#line 595 "ClockEffect.c"
 }
 
 
@@ -602,18 +599,18 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) clock_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) clock_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) clock_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) clock_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) clock_effect_real_cancel;
-#line 617 "ClockEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel;
+#line 614 "ClockEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c
index 5b490c9..56f3667 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.c
+++ b/plugins/shotwell-transitions/CrumbleEffect.c
@@ -1,4 +1,4 @@
-/* CrumbleEffect.c generated by valac 0.34.7, the Vala compiler
+/* CrumbleEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from CrumbleEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -101,7 +101,7 @@ struct _CrumbleEffectPrivate {
 
 static gpointer crumble_effect_descriptor_parent_class = NULL;
 static gpointer crumble_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* crumble_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * crumble_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -130,14 +130,14 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
 static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
 static void crumble_effect_real_cancel (SpitTransitionsEffect* base);
-static void crumble_effect_finalize (GObject* obj);
+static void crumble_effect_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);
 
 
 CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	CrumbleEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -173,23 +173,20 @@ static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDes
 static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	CrumbleEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT_DESCRIPTOR, CrumbleEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp0_ = _ ("Crumble");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	result = _tmp0_;
+	result = _ ("Crumble");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return result;
-#line 186 "CrumbleEffect.c"
+#line 183 "CrumbleEffect.c"
 }
 
 
 static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	CrumbleEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	CrumbleEffect* _tmp0_ = NULL;
+	CrumbleEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT_DESCRIPTOR, CrumbleEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -200,7 +197,7 @@ static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTra
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return result;
-#line 204 "CrumbleEffect.c"
+#line 201 "CrumbleEffect.c"
 }
 
 
@@ -208,12 +205,12 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass *
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	crumble_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) crumble_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) crumble_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) crumble_effect_descriptor_real_create;
-#line 217 "CrumbleEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) crumble_effect_descriptor_real_create;
+#line 214 "CrumbleEffect.c"
 }
 
 
@@ -239,14 +236,14 @@ CrumbleEffect* crumble_effect_construct (GType object_type) {
 	self = (CrumbleEffect*) g_object_new (object_type, NULL);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return self;
-#line 243 "CrumbleEffect.c"
+#line 240 "CrumbleEffect.c"
 }
 
 
 CrumbleEffect* crumble_effect_new (void) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return crumble_effect_construct (TYPE_CRUMBLE_EFFECT);
-#line 250 "CrumbleEffect.c"
+#line 247 "CrumbleEffect.c"
 }
 
 
@@ -264,13 +261,13 @@ static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
 	if (desired_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 268 "CrumbleEffect.c"
+#line 265 "CrumbleEffect.c"
 	}
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	if (min_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 274 "CrumbleEffect.c"
+#line 271 "CrumbleEffect.c"
 	}
 }
 
@@ -284,17 +281,17 @@ static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffec
 	result = TRUE;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return result;
-#line 288 "CrumbleEffect.c"
+#line 285 "CrumbleEffect.c"
 }
 
 
 static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
 	CrumbleEffect * self;
 	GRand* rand = NULL;
-	GRand* _tmp0_ = NULL;
-	SpitTransitionsVisuals* _tmp1_ = NULL;
-	GdkPixbuf* _tmp2_ = NULL;
-	GdkPixbuf* _tmp3_ = NULL;
+	GRand* _tmp0_;
+	SpitTransitionsVisuals* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -313,16 +310,16 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 	_tmp3_ = _tmp2_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	if (_tmp3_ != NULL) {
-#line 317 "CrumbleEffect.c"
-		SpitTransitionsVisuals* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		cairo_surface_t** _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gdouble* _tmp12_ = NULL;
+#line 314 "CrumbleEffect.c"
+		SpitTransitionsVisuals* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		cairo_surface_t** _tmp10_;
+		gint _tmp11_;
+		gdouble* _tmp12_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		_tmp4_ = visuals;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -359,58 +356,58 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 		self->priv->accelerations_length1 = _tmp11_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		self->priv->_accelerations_size_ = self->priv->accelerations_length1;
-#line 363 "CrumbleEffect.c"
+#line 360 "CrumbleEffect.c"
 		{
 			gint i = 0;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			i = 0;
-#line 368 "CrumbleEffect.c"
+#line 365 "CrumbleEffect.c"
 			{
 				gboolean _tmp13_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				_tmp13_ = TRUE;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				while (TRUE) {
-#line 375 "CrumbleEffect.c"
-					gint _tmp15_ = 0;
-					gint _tmp16_ = 0;
-					cairo_surface_t** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-					gint _tmp18_ = 0;
-					SpitTransitionsVisuals* _tmp19_ = NULL;
-					GdkPixbuf* _tmp20_ = NULL;
-					GdkPixbuf* _tmp21_ = NULL;
-					gint _tmp22_ = 0;
-					gint _tmp23_ = 0;
-					cairo_surface_t* _tmp24_ = NULL;
-					cairo_surface_t* _tmp25_ = NULL;
+#line 372 "CrumbleEffect.c"
+					gint _tmp15_;
+					gint _tmp16_;
+					cairo_surface_t** _tmp17_;
+					gint _tmp17__length1;
+					gint _tmp18_;
+					SpitTransitionsVisuals* _tmp19_;
+					GdkPixbuf* _tmp20_;
+					GdkPixbuf* _tmp21_;
+					gint _tmp22_;
+					gint _tmp23_;
+					cairo_surface_t* _tmp24_;
+					cairo_surface_t* _tmp25_;
 					cairo_t* ctx = NULL;
-					cairo_surface_t** _tmp26_ = NULL;
-					gint _tmp26__length1 = 0;
-					gint _tmp27_ = 0;
-					cairo_surface_t* _tmp28_ = NULL;
-					cairo_t* _tmp29_ = NULL;
-					cairo_t* _tmp30_ = NULL;
-					SpitTransitionsVisuals* _tmp31_ = NULL;
-					GdkPixbuf* _tmp32_ = NULL;
-					GdkPixbuf* _tmp33_ = NULL;
-					gint _tmp34_ = 0;
-					cairo_t* _tmp35_ = NULL;
-					gdouble* _tmp36_ = NULL;
-					gint _tmp36__length1 = 0;
-					gint _tmp37_ = 0;
-					GRand* _tmp38_ = NULL;
-					gdouble _tmp39_ = 0.0;
-					gdouble _tmp40_ = 0.0;
+					cairo_surface_t** _tmp26_;
+					gint _tmp26__length1;
+					gint _tmp27_;
+					cairo_surface_t* _tmp28_;
+					cairo_t* _tmp29_;
+					cairo_t* _tmp30_;
+					SpitTransitionsVisuals* _tmp31_;
+					GdkPixbuf* _tmp32_;
+					GdkPixbuf* _tmp33_;
+					gint _tmp34_;
+					cairo_t* _tmp35_;
+					gdouble* _tmp36_;
+					gint _tmp36__length1;
+					gint _tmp37_;
+					GRand* _tmp38_;
+					gdouble _tmp39_;
+					gdouble _tmp40_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					if (!_tmp13_) {
-#line 408 "CrumbleEffect.c"
-						gint _tmp14_ = 0;
+#line 405 "CrumbleEffect.c"
+						gint _tmp14_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						_tmp14_ = i;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						i = _tmp14_ + 1;
-#line 414 "CrumbleEffect.c"
+#line 411 "CrumbleEffect.c"
 					}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_tmp13_ = FALSE;
@@ -422,7 +419,7 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 					if (!(_tmp15_ < _tmp16_)) {
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						break;
-#line 426 "CrumbleEffect.c"
+#line 423 "CrumbleEffect.c"
 					}
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_tmp17_ = self->priv->from_stripes;
@@ -492,24 +489,24 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 					_tmp40_ = _tmp36_[_tmp37_];
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_cairo_destroy0 (ctx);
-#line 496 "CrumbleEffect.c"
+#line 493 "CrumbleEffect.c"
 				}
 			}
 		}
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	_g_rand_free0 (rand);
-#line 503 "CrumbleEffect.c"
+#line 500 "CrumbleEffect.c"
 }
 
 
 static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	CrumbleEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -530,69 +527,69 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp3_ = alpha;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	if (_tmp3_ < 0.5) {
-#line 534 "CrumbleEffect.c"
-		gdouble _tmp4_ = 0.0;
+#line 531 "CrumbleEffect.c"
+		gdouble _tmp4_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		_tmp4_ = alpha;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		alpha = _tmp4_ * 2;
-#line 540 "CrumbleEffect.c"
+#line 537 "CrumbleEffect.c"
 		{
 			gint i = 0;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			i = 0;
-#line 545 "CrumbleEffect.c"
+#line 542 "CrumbleEffect.c"
 			{
 				gboolean _tmp5_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				_tmp5_ = TRUE;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				while (TRUE) {
-#line 552 "CrumbleEffect.c"
-					gint _tmp7_ = 0;
-					gint _tmp8_ = 0;
+#line 549 "CrumbleEffect.c"
+					gint _tmp7_;
+					gint _tmp8_;
 					gint x = 0;
-					SpitTransitionsVisuals* _tmp9_ = NULL;
+					SpitTransitionsVisuals* _tmp9_;
 					GdkRectangle _tmp10_ = {0};
-					GdkRectangle _tmp11_ = {0};
-					gint _tmp12_ = 0;
-					gint _tmp13_ = 0;
+					GdkRectangle _tmp11_;
+					gint _tmp12_;
+					gint _tmp13_;
 					gdouble a = 0.0;
-					gdouble _tmp14_ = 0.0;
-					gdouble _tmp15_ = 0.0;
-					gdouble* _tmp16_ = NULL;
-					gint _tmp16__length1 = 0;
-					gint _tmp17_ = 0;
-					gdouble _tmp18_ = 0.0;
+					gdouble _tmp14_;
+					gdouble _tmp15_;
+					gdouble* _tmp16_;
+					gint _tmp16__length1;
+					gint _tmp17_;
+					gdouble _tmp18_;
 					gint y = 0;
-					SpitTransitionsVisuals* _tmp19_ = NULL;
+					SpitTransitionsVisuals* _tmp19_;
 					GdkRectangle _tmp20_ = {0};
-					GdkRectangle _tmp21_ = {0};
-					gint _tmp22_ = 0;
-					SpitTransitionsVisuals* _tmp23_ = NULL;
-					GdkPixbuf* _tmp24_ = NULL;
-					GdkPixbuf* _tmp25_ = NULL;
-					gint _tmp26_ = 0;
-					gint _tmp27_ = 0;
-					gdouble _tmp28_ = 0.0;
-					gdouble _tmp29_ = 0.0;
-					cairo_t* _tmp30_ = NULL;
-					cairo_surface_t** _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					gint _tmp32_ = 0;
-					cairo_surface_t* _tmp33_ = NULL;
-					gint _tmp34_ = 0;
-					gint _tmp35_ = 0;
-					cairo_t* _tmp36_ = NULL;
+					GdkRectangle _tmp21_;
+					gint _tmp22_;
+					SpitTransitionsVisuals* _tmp23_;
+					GdkPixbuf* _tmp24_;
+					GdkPixbuf* _tmp25_;
+					gint _tmp26_;
+					gint _tmp27_;
+					gdouble _tmp28_;
+					gdouble _tmp29_;
+					cairo_t* _tmp30_;
+					cairo_surface_t** _tmp31_;
+					gint _tmp31__length1;
+					gint _tmp32_;
+					cairo_surface_t* _tmp33_;
+					gint _tmp34_;
+					gint _tmp35_;
+					cairo_t* _tmp36_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					if (!_tmp5_) {
-#line 590 "CrumbleEffect.c"
-						gint _tmp6_ = 0;
+#line 587 "CrumbleEffect.c"
+						gint _tmp6_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						_tmp6_ = i;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						i = _tmp6_ + 1;
-#line 596 "CrumbleEffect.c"
+#line 593 "CrumbleEffect.c"
 					}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_tmp5_ = FALSE;
@@ -604,7 +601,7 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					if (!(_tmp7_ < _tmp8_)) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						break;
-#line 608 "CrumbleEffect.c"
+#line 605 "CrumbleEffect.c"
 					}
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_tmp9_ = visuals;
@@ -676,14 +673,14 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					_tmp36_ = ctx;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					cairo_paint (_tmp36_);
-#line 680 "CrumbleEffect.c"
+#line 677 "CrumbleEffect.c"
 				}
 			}
 		}
 	} else {
-		SpitTransitionsVisuals* _tmp37_ = NULL;
-		GdkPixbuf* _tmp38_ = NULL;
-		GdkPixbuf* _tmp39_ = NULL;
+		SpitTransitionsVisuals* _tmp37_;
+		GdkPixbuf* _tmp38_;
+		GdkPixbuf* _tmp39_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		_tmp37_ = visuals;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -692,22 +689,22 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp39_ = _tmp38_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		if (_tmp39_ != NULL) {
-#line 696 "CrumbleEffect.c"
-			gdouble _tmp40_ = 0.0;
-			cairo_t* _tmp41_ = NULL;
-			SpitTransitionsVisuals* _tmp42_ = NULL;
-			GdkPixbuf* _tmp43_ = NULL;
-			GdkPixbuf* _tmp44_ = NULL;
-			SpitTransitionsVisuals* _tmp45_ = NULL;
+#line 693 "CrumbleEffect.c"
+			gdouble _tmp40_;
+			cairo_t* _tmp41_;
+			SpitTransitionsVisuals* _tmp42_;
+			GdkPixbuf* _tmp43_;
+			GdkPixbuf* _tmp44_;
+			SpitTransitionsVisuals* _tmp45_;
 			GdkRectangle _tmp46_ = {0};
-			GdkRectangle _tmp47_ = {0};
-			gint _tmp48_ = 0;
-			SpitTransitionsVisuals* _tmp49_ = NULL;
+			GdkRectangle _tmp47_;
+			gint _tmp48_;
+			SpitTransitionsVisuals* _tmp49_;
 			GdkRectangle _tmp50_ = {0};
-			GdkRectangle _tmp51_ = {0};
-			gint _tmp52_ = 0;
-			cairo_t* _tmp53_ = NULL;
-			gdouble _tmp54_ = 0.0;
+			GdkRectangle _tmp51_;
+			gint _tmp52_;
+			cairo_t* _tmp53_;
+			gdouble _tmp54_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			_tmp40_ = alpha;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -744,7 +741,7 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 			_tmp54_ = alpha;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			cairo_paint_with_alpha (_tmp53_, _tmp54_);
-#line 748 "CrumbleEffect.c"
+#line 745 "CrumbleEffect.c"
 		} else {
 		}
 	}
@@ -759,7 +756,7 @@ static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 763 "CrumbleEffect.c"
+#line 760 "CrumbleEffect.c"
 }
 
 
@@ -767,7 +764,7 @@ static void crumble_effect_real_cancel (SpitTransitionsEffect* base) {
 	CrumbleEffect * self;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
-#line 771 "CrumbleEffect.c"
+#line 768 "CrumbleEffect.c"
 }
 
 
@@ -778,7 +775,7 @@ static void crumble_effect_class_init (CrumbleEffectClass * klass) {
 	g_type_class_add_private (klass, sizeof (CrumbleEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = crumble_effect_finalize;
-#line 782 "CrumbleEffect.c"
+#line 779 "CrumbleEffect.c"
 }
 
 
@@ -786,29 +783,29 @@ static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitio
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	crumble_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) crumble_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) crumble_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) crumble_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) crumble_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) crumble_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) crumble_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) crumble_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) crumble_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) crumble_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) crumble_effect_real_cancel;
-#line 801 "CrumbleEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) crumble_effect_real_cancel;
+#line 798 "CrumbleEffect.c"
 }
 
 
 static void crumble_effect_instance_init (CrumbleEffect * self) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self->priv = CRUMBLE_EFFECT_GET_PRIVATE (self);
-#line 808 "CrumbleEffect.c"
+#line 805 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_finalize (GObject* obj) {
+static void crumble_effect_finalize (GObject * obj) {
 	CrumbleEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
@@ -818,7 +815,7 @@ static void crumble_effect_finalize (GObject* obj) {
 	self->priv->accelerations = (g_free (self->priv->accelerations), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	G_OBJECT_CLASS (crumble_effect_parent_class)->finalize (obj);
-#line 822 "CrumbleEffect.c"
+#line 819 "CrumbleEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c
index fd081d0..8234972 100644
--- a/plugins/shotwell-transitions/FadeEffect.c
+++ b/plugins/shotwell-transitions/FadeEffect.c
@@ -1,4 +1,4 @@
-/* FadeEffect.c generated by valac 0.34.7, the Vala compiler
+/* FadeEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from FadeEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -87,7 +87,7 @@ struct _FadeEffectClass {
 
 static gpointer fade_effect_descriptor_parent_class = NULL;
 static gpointer fade_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* fade_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType fade_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -118,7 +118,7 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base);
 
 FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	FadeEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -154,23 +154,20 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri
 static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	FadeEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp0_ = _ ("Fade");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	result = _tmp0_;
+	result = _ ("Fade");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 167 "FadeEffect.c"
+#line 164 "FadeEffect.c"
 }
 
 
 static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	FadeEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	FadeEffect* _tmp0_ = NULL;
+	FadeEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -181,7 +178,7 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 185 "FadeEffect.c"
+#line 182 "FadeEffect.c"
 }
 
 
@@ -189,12 +186,12 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) fade_effect_descriptor_real_create;
-#line 198 "FadeEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create;
+#line 195 "FadeEffect.c"
 }
 
 
@@ -220,14 +217,14 @@ FadeEffect* fade_effect_construct (GType object_type) {
 	self = (FadeEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return self;
-#line 224 "FadeEffect.c"
+#line 221 "FadeEffect.c"
 }
 
 
 FadeEffect* fade_effect_new (void) {
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return fade_effect_construct (TYPE_FADE_EFFECT);
-#line 231 "FadeEffect.c"
+#line 228 "FadeEffect.c"
 }
 
 
@@ -245,13 +242,13 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 249 "FadeEffect.c"
+#line 246 "FadeEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 255 "FadeEffect.c"
+#line 252 "FadeEffect.c"
 	}
 }
 
@@ -264,7 +261,7 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 268 "FadeEffect.c"
+#line 265 "FadeEffect.c"
 }
 
 
@@ -277,22 +274,22 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 281 "FadeEffect.c"
+#line 278 "FadeEffect.c"
 }
 
 
 static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	FadeEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	SpitTransitionsVisuals* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	SpitTransitionsVisuals* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	SpitTransitionsVisuals* _tmp20_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -317,21 +314,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 	_tmp5_ = _tmp4_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (_tmp5_ != NULL) {
-#line 321 "FadeEffect.c"
-		cairo_t* _tmp6_ = NULL;
-		SpitTransitionsVisuals* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		SpitTransitionsVisuals* _tmp10_ = NULL;
+#line 318 "FadeEffect.c"
+		cairo_t* _tmp6_;
+		SpitTransitionsVisuals* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		SpitTransitionsVisuals* _tmp10_;
 		GdkRectangle _tmp11_ = {0};
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		cairo_t* _tmp18_ = NULL;
-		gdouble _tmp19_ = 0.0;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		cairo_t* _tmp18_;
+		gdouble _tmp19_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		_tmp6_ = ctx;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -364,7 +361,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 		_tmp19_ = alpha;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_);
-#line 368 "FadeEffect.c"
+#line 365 "FadeEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	_tmp20_ = visuals;
@@ -374,21 +371,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 	_tmp22_ = _tmp21_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (_tmp22_ != NULL) {
-#line 378 "FadeEffect.c"
-		cairo_t* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
-		GdkPixbuf* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		SpitTransitionsVisuals* _tmp27_ = NULL;
+#line 375 "FadeEffect.c"
+		cairo_t* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
+		GdkPixbuf* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		SpitTransitionsVisuals* _tmp27_;
 		GdkRectangle _tmp28_ = {0};
-		GdkRectangle _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		SpitTransitionsVisuals* _tmp31_ = NULL;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
+		SpitTransitionsVisuals* _tmp31_;
 		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		cairo_t* _tmp35_ = NULL;
-		gdouble _tmp36_ = 0.0;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		cairo_t* _tmp35_;
+		gdouble _tmp36_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		_tmp23_ = ctx;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -421,7 +418,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 		_tmp36_ = alpha;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		cairo_paint_with_alpha (_tmp35_, _tmp36_);
-#line 425 "FadeEffect.c"
+#line 422 "FadeEffect.c"
 	}
 }
 
@@ -434,7 +431,7 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 438 "FadeEffect.c"
+#line 435 "FadeEffect.c"
 }
 
 
@@ -442,14 +439,14 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base) {
 	FadeEffect * self;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
-#line 446 "FadeEffect.c"
+#line 443 "FadeEffect.c"
 }
 
 
 static void fade_effect_class_init (FadeEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_parent_class = g_type_class_peek_parent (klass);
-#line 453 "FadeEffect.c"
+#line 450 "FadeEffect.c"
 }
 
 
@@ -457,18 +454,18 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) fade_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) fade_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) fade_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) fade_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) fade_effect_real_cancel;
-#line 472 "FadeEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel;
+#line 469 "FadeEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c
index 678cc11..7cc87e7 100644
--- a/plugins/shotwell-transitions/SlideEffect.c
+++ b/plugins/shotwell-transitions/SlideEffect.c
@@ -1,4 +1,4 @@
-/* SlideEffect.c generated by valac 0.34.7, the Vala compiler
+/* SlideEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from SlideEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -88,7 +88,7 @@ struct _SlideEffectClass {
 
 static gpointer slide_effect_descriptor_parent_class = NULL;
 static gpointer slide_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* slide_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType slide_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -119,7 +119,7 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base);
 
 SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	SlideEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -155,23 +155,20 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr
 static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	SlideEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp0_ = _ ("Slide");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	result = _tmp0_;
+	result = _ ("Slide");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 168 "SlideEffect.c"
+#line 165 "SlideEffect.c"
 }
 
 
 static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	SlideEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	SlideEffect* _tmp0_ = NULL;
+	SlideEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT_DESCRIPTOR, SlideEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -182,7 +179,7 @@ static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTrans
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 186 "SlideEffect.c"
+#line 183 "SlideEffect.c"
 }
 
 
@@ -190,12 +187,12 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) slide_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) slide_effect_descriptor_real_create;
-#line 199 "SlideEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) slide_effect_descriptor_real_create;
+#line 196 "SlideEffect.c"
 }
 
 
@@ -221,14 +218,14 @@ SlideEffect* slide_effect_construct (GType object_type) {
 	self = (SlideEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return self;
-#line 225 "SlideEffect.c"
+#line 222 "SlideEffect.c"
 }
 
 
 SlideEffect* slide_effect_new (void) {
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return slide_effect_construct (TYPE_SLIDE_EFFECT);
-#line 232 "SlideEffect.c"
+#line 229 "SlideEffect.c"
 }
 
 
@@ -246,13 +243,13 @@ static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 250 "SlideEffect.c"
+#line 247 "SlideEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 256 "SlideEffect.c"
+#line 253 "SlideEffect.c"
 	}
 }
 
@@ -265,7 +262,7 @@ static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransition
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 269 "SlideEffect.c"
+#line 266 "SlideEffect.c"
 }
 
 
@@ -278,22 +275,22 @@ static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 282 "SlideEffect.c"
+#line 279 "SlideEffect.c"
 }
 
 
 static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	SlideEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	SpitTransitionsVisuals* _tmp33_ = NULL;
-	GdkPixbuf* _tmp34_ = NULL;
-	GdkPixbuf* _tmp35_ = NULL;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	SpitTransitionsVisuals* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	SpitTransitionsVisuals* _tmp33_;
+	GdkPixbuf* _tmp34_;
+	GdkPixbuf* _tmp35_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -318,30 +315,30 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp5_ = _tmp4_;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	if (_tmp5_ != NULL) {
-#line 322 "SlideEffect.c"
+#line 319 "SlideEffect.c"
 		gint _tmp6_ = 0;
-		SpitTransitionsMotion* _tmp7_ = NULL;
-		SpitTransitionsDirection _tmp8_ = 0;
-		SpitTransitionsDirection _tmp9_ = 0;
+		SpitTransitionsMotion* _tmp7_;
+		SpitTransitionsDirection _tmp8_;
+		SpitTransitionsDirection _tmp9_;
 		gint from_target_x = 0;
 		gint from_current_x = 0;
-		SpitTransitionsVisuals* _tmp16_ = NULL;
+		SpitTransitionsVisuals* _tmp16_;
 		GdkRectangle _tmp17_ = {0};
-		GdkRectangle _tmp18_ = {0};
-		gint _tmp19_ = 0;
-		gdouble _tmp20_ = 0.0;
-		gint _tmp21_ = 0;
-		gdouble _tmp22_ = 0.0;
-		cairo_t* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
-		GdkPixbuf* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		gint _tmp27_ = 0;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
+		GdkRectangle _tmp18_;
+		gint _tmp19_;
+		gdouble _tmp20_;
+		gint _tmp21_;
+		gdouble _tmp22_;
+		cairo_t* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
+		GdkPixbuf* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		gint _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
 		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		cairo_t* _tmp32_ = NULL;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		cairo_t* _tmp32_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		_tmp7_ = motion;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -350,12 +347,12 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp9_ = _tmp8_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 354 "SlideEffect.c"
-			SpitTransitionsVisuals* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
-			GdkPixbuf* _tmp12_ = NULL;
-			gint _tmp13_ = 0;
-			gint _tmp14_ = 0;
+#line 351 "SlideEffect.c"
+			SpitTransitionsVisuals* _tmp10_;
+			GdkPixbuf* _tmp11_;
+			GdkPixbuf* _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp10_ = visuals;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -368,14 +365,14 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 			_tmp14_ = _tmp13_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp6_ = -_tmp14_;
-#line 372 "SlideEffect.c"
+#line 369 "SlideEffect.c"
 		} else {
-			gint _tmp15_ = 0;
+			gint _tmp15_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp15_ = width;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp6_ = _tmp15_;
-#line 379 "SlideEffect.c"
+#line 376 "SlideEffect.c"
 		}
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		from_target_x = _tmp6_;
@@ -419,7 +416,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp32_ = ctx;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		cairo_paint (_tmp32_);
-#line 423 "SlideEffect.c"
+#line 420 "SlideEffect.c"
 	}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	_tmp33_ = visuals;
@@ -429,34 +426,34 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp35_ = _tmp34_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	if (_tmp35_ != NULL) {
-#line 433 "SlideEffect.c"
+#line 430 "SlideEffect.c"
 		gint to_target_x = 0;
-		gint _tmp36_ = 0;
-		SpitTransitionsVisuals* _tmp37_ = NULL;
-		GdkPixbuf* _tmp38_ = NULL;
-		GdkPixbuf* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
+		gint _tmp36_;
+		SpitTransitionsVisuals* _tmp37_;
+		GdkPixbuf* _tmp38_;
+		GdkPixbuf* _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
 		gint _tmp42_ = 0;
-		SpitTransitionsMotion* _tmp43_ = NULL;
-		SpitTransitionsDirection _tmp44_ = 0;
-		SpitTransitionsDirection _tmp45_ = 0;
+		SpitTransitionsMotion* _tmp43_;
+		SpitTransitionsDirection _tmp44_;
+		SpitTransitionsDirection _tmp45_;
 		gint from_x = 0;
 		gint to_current_x = 0;
-		gint _tmp52_ = 0;
-		gdouble _tmp53_ = 0.0;
-		gint _tmp54_ = 0;
-		gdouble _tmp55_ = 0.0;
-		cairo_t* _tmp56_ = NULL;
-		SpitTransitionsVisuals* _tmp57_ = NULL;
-		GdkPixbuf* _tmp58_ = NULL;
-		GdkPixbuf* _tmp59_ = NULL;
-		gint _tmp60_ = 0;
-		SpitTransitionsVisuals* _tmp61_ = NULL;
+		gint _tmp52_;
+		gdouble _tmp53_;
+		gint _tmp54_;
+		gdouble _tmp55_;
+		cairo_t* _tmp56_;
+		SpitTransitionsVisuals* _tmp57_;
+		GdkPixbuf* _tmp58_;
+		GdkPixbuf* _tmp59_;
+		gint _tmp60_;
+		SpitTransitionsVisuals* _tmp61_;
 		GdkRectangle _tmp62_ = {0};
-		GdkRectangle _tmp63_ = {0};
-		gint _tmp64_ = 0;
-		cairo_t* _tmp65_ = NULL;
+		GdkRectangle _tmp63_;
+		gint _tmp64_;
+		cairo_t* _tmp65_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		_tmp36_ = width;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -479,19 +476,19 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp45_ = _tmp44_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 483 "SlideEffect.c"
-			gint _tmp46_ = 0;
+#line 480 "SlideEffect.c"
+			gint _tmp46_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp46_ = width;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp42_ = _tmp46_;
-#line 489 "SlideEffect.c"
+#line 486 "SlideEffect.c"
 		} else {
-			SpitTransitionsVisuals* _tmp47_ = NULL;
-			GdkPixbuf* _tmp48_ = NULL;
-			GdkPixbuf* _tmp49_ = NULL;
-			gint _tmp50_ = 0;
-			gint _tmp51_ = 0;
+			SpitTransitionsVisuals* _tmp47_;
+			GdkPixbuf* _tmp48_;
+			GdkPixbuf* _tmp49_;
+			gint _tmp50_;
+			gint _tmp51_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp47_ = visuals;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -504,7 +501,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 			_tmp51_ = _tmp50_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 			_tmp42_ = -_tmp51_;
-#line 508 "SlideEffect.c"
+#line 505 "SlideEffect.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		from_x = _tmp42_;
@@ -542,7 +539,7 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp65_ = ctx;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		cairo_paint (_tmp65_);
-#line 546 "SlideEffect.c"
+#line 543 "SlideEffect.c"
 	}
 }
 
@@ -555,7 +552,7 @@ static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 559 "SlideEffect.c"
+#line 556 "SlideEffect.c"
 }
 
 
@@ -563,14 +560,14 @@ static void slide_effect_real_cancel (SpitTransitionsEffect* base) {
 	SlideEffect * self;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
-#line 567 "SlideEffect.c"
+#line 564 "SlideEffect.c"
 }
 
 
 static void slide_effect_class_init (SlideEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_parent_class = g_type_class_peek_parent (klass);
-#line 574 "SlideEffect.c"
+#line 571 "SlideEffect.c"
 }
 
 
@@ -578,18 +575,18 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) slide_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) slide_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) slide_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) slide_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) slide_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) slide_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) slide_effect_real_cancel;
-#line 593 "SlideEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) slide_effect_real_cancel;
+#line 590 "SlideEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c
index fdf32ee..402d502 100644
--- a/plugins/shotwell-transitions/SquaresEffect.c
+++ b/plugins/shotwell-transitions/SquaresEffect.c
@@ -1,4 +1,4 @@
-/* SquaresEffect.c generated by valac 0.34.7, the Vala compiler
+/* SquaresEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from SquaresEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -92,7 +92,7 @@ struct _SquaresEffectPrivate {
 
 static gpointer squares_effect_descriptor_parent_class = NULL;
 static gpointer squares_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* squares_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * squares_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType squares_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -121,12 +121,12 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec
 static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
 static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
 static void squares_effect_real_cancel (SpitTransitionsEffect* base);
-static void squares_effect_finalize (GObject* obj);
+static void squares_effect_finalize (GObject * obj);
 
 
 SquaresEffectDescriptor* squares_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	SquaresEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -162,23 +162,20 @@ static const gchar* squares_effect_descriptor_real_get_id (ShotwellTransitionDes
 static const gchar* squares_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	SquaresEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT_DESCRIPTOR, SquaresEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	_tmp0_ = _ ("Squares");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	result = _tmp0_;
+	result = _ ("Squares");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	return result;
-#line 175 "SquaresEffect.c"
+#line 172 "SquaresEffect.c"
 }
 
 
 static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	SquaresEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	SquaresEffect* _tmp0_ = NULL;
+	SquaresEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT_DESCRIPTOR, SquaresEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -189,7 +186,7 @@ static SpitTransitionsEffect* squares_effect_descriptor_real_create (ShotwellTra
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	return result;
-#line 193 "SquaresEffect.c"
+#line 190 "SquaresEffect.c"
 }
 
 
@@ -197,12 +194,12 @@ static void squares_effect_descriptor_class_init (SquaresEffectDescriptorClass *
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	squares_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) squares_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) squares_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) squares_effect_descriptor_real_create;
-#line 206 "SquaresEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) squares_effect_descriptor_real_create;
+#line 203 "SquaresEffect.c"
 }
 
 
@@ -228,14 +225,14 @@ SquaresEffect* squares_effect_construct (GType object_type) {
 	self = (SquaresEffect*) g_object_new (object_type, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	return self;
-#line 232 "SquaresEffect.c"
+#line 229 "SquaresEffect.c"
 }
 
 
 SquaresEffect* squares_effect_new (void) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	return squares_effect_construct (TYPE_SQUARES_EFFECT);
-#line 239 "SquaresEffect.c"
+#line 236 "SquaresEffect.c"
 }
 
 
@@ -253,27 +250,27 @@ static void squares_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
 	if (desired_fps) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 257 "SquaresEffect.c"
+#line 254 "SquaresEffect.c"
 	}
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	if (min_fps) {
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 263 "SquaresEffect.c"
+#line 260 "SquaresEffect.c"
 	}
 }
 
 
 static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
 	SquaresEffect * self;
-	SpitTransitionsVisuals* _tmp0_ = NULL;
+	SpitTransitionsVisuals* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	SpitTransitionsVisuals* _tmp4_ = NULL;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	SpitTransitionsVisuals* _tmp4_;
 	GdkRectangle _tmp5_ = {0};
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -300,7 +297,7 @@ static void squares_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 	_tmp7_ = _tmp6_.height;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self->priv->square_count_y = (gdouble) ((_tmp7_ / SQUARES_EFFECT_SQUARE_SIZE) + 1);
-#line 304 "SquaresEffect.c"
+#line 301 "SquaresEffect.c"
 }
 
 
@@ -313,22 +310,22 @@ static gboolean squares_effect_real_needs_clear_background (SpitTransitionsEffec
 	result = TRUE;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	return result;
-#line 317 "SquaresEffect.c"
+#line 314 "SquaresEffect.c"
 }
 
 
 static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	SquaresEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	SpitTransitionsVisuals* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	SpitTransitionsVisuals* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	SpitTransitionsVisuals* _tmp20_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -353,21 +350,21 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp5_ = _tmp4_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	if (_tmp5_ != NULL) {
-#line 357 "SquaresEffect.c"
-		cairo_t* _tmp6_ = NULL;
-		SpitTransitionsVisuals* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		SpitTransitionsVisuals* _tmp10_ = NULL;
+#line 354 "SquaresEffect.c"
+		cairo_t* _tmp6_;
+		SpitTransitionsVisuals* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		SpitTransitionsVisuals* _tmp10_;
 		GdkRectangle _tmp11_ = {0};
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		cairo_t* _tmp18_ = NULL;
-		gdouble _tmp19_ = 0.0;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		cairo_t* _tmp18_;
+		gdouble _tmp19_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		_tmp6_ = ctx;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -400,7 +397,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp19_ = alpha;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		cairo_paint_with_alpha (_tmp18_, 1 - _tmp19_);
-#line 404 "SquaresEffect.c"
+#line 401 "SquaresEffect.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	_tmp20_ = visuals;
@@ -410,22 +407,22 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp22_ = _tmp21_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	if (_tmp22_ != NULL) {
-#line 414 "SquaresEffect.c"
-		cairo_t* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
-		GdkPixbuf* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		SpitTransitionsVisuals* _tmp27_ = NULL;
+#line 411 "SquaresEffect.c"
+		cairo_t* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
+		GdkPixbuf* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		SpitTransitionsVisuals* _tmp27_;
 		GdkRectangle _tmp28_ = {0};
-		GdkRectangle _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		SpitTransitionsVisuals* _tmp31_ = NULL;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
+		SpitTransitionsVisuals* _tmp31_;
 		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		cairo_t* _tmp65_ = NULL;
-		cairo_t* _tmp66_ = NULL;
-		gdouble _tmp67_ = 0.0;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		cairo_t* _tmp65_;
+		cairo_t* _tmp66_;
+		gdouble _tmp67_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		_tmp23_ = ctx;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
@@ -452,30 +449,30 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp34_ = _tmp33_.y;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_);
-#line 456 "SquaresEffect.c"
+#line 453 "SquaresEffect.c"
 		{
 			gdouble y = 0.0;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 			y = (gdouble) 0;
-#line 461 "SquaresEffect.c"
+#line 458 "SquaresEffect.c"
 			{
 				gboolean _tmp35_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 				_tmp35_ = TRUE;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 				while (TRUE) {
-#line 468 "SquaresEffect.c"
-					gdouble _tmp37_ = 0.0;
-					gdouble _tmp38_ = 0.0;
+#line 465 "SquaresEffect.c"
+					gdouble _tmp37_;
+					gdouble _tmp38_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 					if (!_tmp35_) {
-#line 473 "SquaresEffect.c"
-						gdouble _tmp36_ = 0.0;
+#line 470 "SquaresEffect.c"
+						gdouble _tmp36_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 						_tmp36_ = y;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 						y = _tmp36_ + 1;
-#line 479 "SquaresEffect.c"
+#line 476 "SquaresEffect.c"
 					}
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 					_tmp35_ = FALSE;
@@ -487,54 +484,54 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					if (!(_tmp37_ <= _tmp38_)) {
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 						break;
-#line 491 "SquaresEffect.c"
+#line 488 "SquaresEffect.c"
 					}
 					{
 						gdouble x = 0.0;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 						x = (gdouble) 0;
-#line 497 "SquaresEffect.c"
+#line 494 "SquaresEffect.c"
 						{
 							gboolean _tmp39_ = FALSE;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 							_tmp39_ = TRUE;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 							while (TRUE) {
-#line 504 "SquaresEffect.c"
-								gdouble _tmp41_ = 0.0;
-								gdouble _tmp42_ = 0.0;
+#line 501 "SquaresEffect.c"
+								gdouble _tmp41_;
+								gdouble _tmp42_;
 								gdouble size = 0.0;
-								gdouble _tmp43_ = 0.0;
-								gdouble _tmp44_ = 0.0;
-								gdouble _tmp45_ = 0.0;
-								gdouble _tmp46_ = 0.0;
-								gdouble _tmp47_ = 0.0;
-								gdouble _tmp48_ = 0.0;
-								gdouble _tmp49_ = 0.0;
-								gdouble _tmp50_ = 0.0;
-								cairo_t* _tmp51_ = NULL;
-								SpitTransitionsVisuals* _tmp52_ = NULL;
+								gdouble _tmp43_;
+								gdouble _tmp44_;
+								gdouble _tmp45_;
+								gdouble _tmp46_;
+								gdouble _tmp47_;
+								gdouble _tmp48_;
+								gdouble _tmp49_;
+								gdouble _tmp50_;
+								cairo_t* _tmp51_;
+								SpitTransitionsVisuals* _tmp52_;
 								GdkRectangle _tmp53_ = {0};
-								GdkRectangle _tmp54_ = {0};
-								gint _tmp55_ = 0;
-								gdouble _tmp56_ = 0.0;
-								SpitTransitionsVisuals* _tmp57_ = NULL;
+								GdkRectangle _tmp54_;
+								gint _tmp55_;
+								gdouble _tmp56_;
+								SpitTransitionsVisuals* _tmp57_;
 								GdkRectangle _tmp58_ = {0};
-								GdkRectangle _tmp59_ = {0};
-								gint _tmp60_ = 0;
-								gdouble _tmp61_ = 0.0;
-								gdouble _tmp62_ = 0.0;
-								gdouble _tmp63_ = 0.0;
-								cairo_t* _tmp64_ = NULL;
+								GdkRectangle _tmp59_;
+								gint _tmp60_;
+								gdouble _tmp61_;
+								gdouble _tmp62_;
+								gdouble _tmp63_;
+								cairo_t* _tmp64_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 								if (!_tmp39_) {
-#line 532 "SquaresEffect.c"
-									gdouble _tmp40_ = 0.0;
+#line 529 "SquaresEffect.c"
+									gdouble _tmp40_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 									_tmp40_ = x;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 									x = _tmp40_ + 1;
-#line 538 "SquaresEffect.c"
+#line 535 "SquaresEffect.c"
 								}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 								_tmp39_ = FALSE;
@@ -546,7 +543,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 								if (!(_tmp41_ <= _tmp42_)) {
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 									break;
-#line 550 "SquaresEffect.c"
+#line 547 "SquaresEffect.c"
 								}
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 								_tmp43_ = alpha;
@@ -598,7 +595,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 								_tmp64_ = ctx;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 								cairo_fill (_tmp64_);
-#line 602 "SquaresEffect.c"
+#line 599 "SquaresEffect.c"
 							}
 						}
 					}
@@ -615,7 +612,7 @@ static void squares_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp67_ = alpha;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 		cairo_paint_with_alpha (_tmp66_, _tmp67_);
-#line 619 "SquaresEffect.c"
+#line 616 "SquaresEffect.c"
 	}
 }
 
@@ -628,7 +625,7 @@ static void squares_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 632 "SquaresEffect.c"
+#line 629 "SquaresEffect.c"
 }
 
 
@@ -636,7 +633,7 @@ static void squares_effect_real_cancel (SpitTransitionsEffect* base) {
 	SquaresEffect * self;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SQUARES_EFFECT, SquaresEffect);
-#line 640 "SquaresEffect.c"
+#line 637 "SquaresEffect.c"
 }
 
 
@@ -647,7 +644,7 @@ static void squares_effect_class_init (SquaresEffectClass * klass) {
 	g_type_class_add_private (klass, sizeof (SquaresEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = squares_effect_finalize;
-#line 651 "SquaresEffect.c"
+#line 648 "SquaresEffect.c"
 }
 
 
@@ -655,35 +652,35 @@ static void squares_effect_spit_transitions_effect_interface_init (SpitTransitio
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	squares_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) squares_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) squares_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) squares_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) squares_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) squares_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) squares_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) squares_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) squares_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) squares_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) squares_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) squares_effect_real_cancel;
-#line 670 "SquaresEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) squares_effect_real_cancel;
+#line 667 "SquaresEffect.c"
 }
 
 
 static void squares_effect_instance_init (SquaresEffect * self) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self->priv = SQUARES_EFFECT_GET_PRIVATE (self);
-#line 677 "SquaresEffect.c"
+#line 674 "SquaresEffect.c"
 }
 
 
-static void squares_effect_finalize (GObject* obj) {
+static void squares_effect_finalize (GObject * obj) {
 	SquaresEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SQUARES_EFFECT, SquaresEffect);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SquaresEffect.vala"
 	G_OBJECT_CLASS (squares_effect_parent_class)->finalize (obj);
-#line 687 "SquaresEffect.c"
+#line 684 "SquaresEffect.c"
 }
 
 
diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c
index eec9185..53ef18d 100644
--- a/plugins/shotwell-transitions/StripesEffect.c
+++ b/plugins/shotwell-transitions/StripesEffect.c
@@ -1,4 +1,4 @@
-/* StripesEffect.c generated by valac 0.34.7, the Vala compiler
+/* StripesEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from StripesEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -91,7 +91,7 @@ struct _StripesEffectPrivate {
 
 static gpointer stripes_effect_descriptor_parent_class = NULL;
 static gpointer stripes_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* stripes_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * stripes_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType stripes_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -120,12 +120,12 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec
 static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
 static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
 static void stripes_effect_real_cancel (SpitTransitionsEffect* base);
-static void stripes_effect_finalize (GObject* obj);
+static void stripes_effect_finalize (GObject * obj);
 
 
 StripesEffectDescriptor* stripes_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	StripesEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -161,23 +161,20 @@ static const gchar* stripes_effect_descriptor_real_get_id (ShotwellTransitionDes
 static const gchar* stripes_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	StripesEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT_DESCRIPTOR, StripesEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	_tmp0_ = _ ("Stripes");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	result = _tmp0_;
+	result = _ ("Stripes");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	return result;
-#line 174 "StripesEffect.c"
+#line 171 "StripesEffect.c"
 }
 
 
 static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	StripesEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	StripesEffect* _tmp0_ = NULL;
+	StripesEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT_DESCRIPTOR, StripesEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -188,7 +185,7 @@ static SpitTransitionsEffect* stripes_effect_descriptor_real_create (ShotwellTra
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	return result;
-#line 192 "StripesEffect.c"
+#line 189 "StripesEffect.c"
 }
 
 
@@ -196,12 +193,12 @@ static void stripes_effect_descriptor_class_init (StripesEffectDescriptorClass *
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	stripes_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) stripes_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) stripes_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) stripes_effect_descriptor_real_create;
-#line 205 "StripesEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) stripes_effect_descriptor_real_create;
+#line 202 "StripesEffect.c"
 }
 
 
@@ -227,14 +224,14 @@ StripesEffect* stripes_effect_construct (GType object_type) {
 	self = (StripesEffect*) g_object_new (object_type, NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	return self;
-#line 231 "StripesEffect.c"
+#line 228 "StripesEffect.c"
 }
 
 
 StripesEffect* stripes_effect_new (void) {
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	return stripes_effect_construct (TYPE_STRIPES_EFFECT);
-#line 238 "StripesEffect.c"
+#line 235 "StripesEffect.c"
 }
 
 
@@ -252,23 +249,23 @@ static void stripes_effect_real_get_fps (SpitTransitionsEffect* base, gint* desi
 	if (desired_fps) {
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 256 "StripesEffect.c"
+#line 253 "StripesEffect.c"
 	}
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	if (min_fps) {
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 262 "StripesEffect.c"
+#line 259 "StripesEffect.c"
 	}
 }
 
 
 static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
 	StripesEffect * self;
-	SpitTransitionsVisuals* _tmp0_ = NULL;
+	SpitTransitionsVisuals* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -285,7 +282,7 @@ static void stripes_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 	_tmp3_ = _tmp2_.height;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self->priv->stripe_count = (_tmp3_ / STRIPES_EFFECT_STRIPE_HEIGHT) + 1;
-#line 289 "StripesEffect.c"
+#line 286 "StripesEffect.c"
 }
 
 
@@ -298,22 +295,22 @@ static gboolean stripes_effect_real_needs_clear_background (SpitTransitionsEffec
 	result = TRUE;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	return result;
-#line 302 "StripesEffect.c"
+#line 299 "StripesEffect.c"
 }
 
 
 static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	StripesEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	SpitTransitionsVisuals* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
-	GdkPixbuf* _tmp23_ = NULL;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	SpitTransitionsVisuals* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	SpitTransitionsVisuals* _tmp21_;
+	GdkPixbuf* _tmp22_;
+	GdkPixbuf* _tmp23_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -338,22 +335,22 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp5_ = _tmp4_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	if (_tmp5_ != NULL) {
-#line 342 "StripesEffect.c"
-		cairo_t* _tmp6_ = NULL;
-		SpitTransitionsVisuals* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		SpitTransitionsVisuals* _tmp10_ = NULL;
+#line 339 "StripesEffect.c"
+		cairo_t* _tmp6_;
+		SpitTransitionsVisuals* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		SpitTransitionsVisuals* _tmp10_;
 		GdkRectangle _tmp11_ = {0};
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		cairo_t* _tmp18_ = NULL;
-		gdouble _tmp19_ = 0.0;
-		gdouble _tmp20_ = 0.0;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		cairo_t* _tmp18_;
+		gdouble _tmp19_;
+		gdouble _tmp20_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		_tmp6_ = ctx;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -388,7 +385,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp20_ = fmin ((gdouble) 1, _tmp19_ * 2);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		cairo_paint_with_alpha (_tmp18_, 1 - _tmp20_);
-#line 392 "StripesEffect.c"
+#line 389 "StripesEffect.c"
 	}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	_tmp21_ = visuals;
@@ -398,32 +395,32 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 	_tmp23_ = _tmp22_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	if (_tmp23_ != NULL) {
-#line 402 "StripesEffect.c"
-		cairo_t* _tmp24_ = NULL;
-		SpitTransitionsVisuals* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		GdkPixbuf* _tmp27_ = NULL;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
+#line 399 "StripesEffect.c"
+		cairo_t* _tmp24_;
+		SpitTransitionsVisuals* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		GdkPixbuf* _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
 		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		SpitTransitionsVisuals* _tmp32_ = NULL;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		SpitTransitionsVisuals* _tmp32_;
 		GdkRectangle _tmp33_ = {0};
-		GdkRectangle _tmp34_ = {0};
-		gint _tmp35_ = 0;
+		GdkRectangle _tmp34_;
+		gint _tmp35_;
 		gint x = 0;
-		SpitTransitionsVisuals* _tmp36_ = NULL;
+		SpitTransitionsVisuals* _tmp36_;
 		GdkRectangle _tmp37_ = {0};
-		GdkRectangle _tmp38_ = {0};
-		gint _tmp39_ = 0;
+		GdkRectangle _tmp38_;
+		gint _tmp39_;
 		gint y = 0;
-		SpitTransitionsVisuals* _tmp40_ = NULL;
+		SpitTransitionsVisuals* _tmp40_;
 		GdkRectangle _tmp41_ = {0};
-		GdkRectangle _tmp42_ = {0};
-		gint _tmp43_ = 0;
-		cairo_t* _tmp79_ = NULL;
-		cairo_t* _tmp80_ = NULL;
-		gdouble _tmp81_ = 0.0;
+		GdkRectangle _tmp42_;
+		gint _tmp43_;
+		cairo_t* _tmp79_;
+		cairo_t* _tmp80_;
+		gdouble _tmp81_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		_tmp24_ = ctx;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -470,34 +467,34 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp43_ = _tmp42_.y;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		y = _tmp43_;
-#line 474 "StripesEffect.c"
+#line 471 "StripesEffect.c"
 		{
 			gint i = 0;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 			i = 0;
-#line 479 "StripesEffect.c"
+#line 476 "StripesEffect.c"
 			{
 				gboolean _tmp44_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 				_tmp44_ = TRUE;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 				while (TRUE) {
-#line 486 "StripesEffect.c"
-					gint _tmp46_ = 0;
-					gint _tmp47_ = 0;
-					gint _tmp48_ = 0;
-					SpitTransitionsMotion* _tmp49_ = NULL;
-					SpitTransitionsDirection _tmp50_ = 0;
-					SpitTransitionsDirection _tmp51_ = 0;
+#line 483 "StripesEffect.c"
+					gint _tmp46_;
+					gint _tmp47_;
+					gint _tmp48_;
+					SpitTransitionsMotion* _tmp49_;
+					SpitTransitionsDirection _tmp50_;
+					SpitTransitionsDirection _tmp51_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 					if (!_tmp44_) {
-#line 495 "StripesEffect.c"
-						gint _tmp45_ = 0;
+#line 492 "StripesEffect.c"
+						gint _tmp45_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						_tmp45_ = i;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						i = _tmp45_ + 1;
-#line 501 "StripesEffect.c"
+#line 498 "StripesEffect.c"
 					}
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 					_tmp44_ = FALSE;
@@ -509,7 +506,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					if (!(_tmp46_ <= _tmp47_)) {
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						break;
-#line 513 "StripesEffect.c"
+#line 510 "StripesEffect.c"
 					}
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 					_tmp48_ = i;
@@ -521,25 +518,25 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 					_tmp51_ = _tmp50_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 					if ((_tmp48_ % 2) == ((gint) _tmp51_)) {
-#line 525 "StripesEffect.c"
-						cairo_t* _tmp52_ = NULL;
-						gint _tmp53_ = 0;
-						SpitTransitionsVisuals* _tmp54_ = NULL;
+#line 522 "StripesEffect.c"
+						cairo_t* _tmp52_;
+						gint _tmp53_;
+						SpitTransitionsVisuals* _tmp54_;
 						GdkRectangle _tmp55_ = {0};
-						GdkRectangle _tmp56_ = {0};
-						gint _tmp57_ = 0;
-						gdouble _tmp58_ = 0.0;
-						SpitTransitionsVisuals* _tmp59_ = NULL;
+						GdkRectangle _tmp56_;
+						gint _tmp57_;
+						gdouble _tmp58_;
+						SpitTransitionsVisuals* _tmp59_;
 						GdkRectangle _tmp60_ = {0};
-						GdkRectangle _tmp61_ = {0};
-						gint _tmp62_ = 0;
-						gint _tmp63_ = 0;
-						gint _tmp64_ = 0;
-						gint _tmp65_ = 0;
-						SpitTransitionsVisuals* _tmp66_ = NULL;
+						GdkRectangle _tmp61_;
+						gint _tmp62_;
+						gint _tmp63_;
+						gint _tmp64_;
+						gint _tmp65_;
+						SpitTransitionsVisuals* _tmp66_;
 						GdkRectangle _tmp67_ = {0};
-						GdkRectangle _tmp68_ = {0};
-						gint _tmp69_ = 0;
+						GdkRectangle _tmp68_;
+						gint _tmp69_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						_tmp52_ = ctx;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -578,17 +575,17 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 						_tmp69_ = _tmp68_.width;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						cairo_rectangle (_tmp52_, (_tmp53_ + _tmp57_) - (_tmp58_ * _tmp62_), (gdouble) (_tmp63_ + (_tmp64_ * STRIPES_EFFECT_STRIPE_HEIGHT)), (gdouble) (_tmp65_ + _tmp69_), (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
-#line 582 "StripesEffect.c"
+#line 579 "StripesEffect.c"
 					} else {
-						cairo_t* _tmp70_ = NULL;
-						gint _tmp71_ = 0;
-						gint _tmp72_ = 0;
-						gint _tmp73_ = 0;
-						SpitTransitionsVisuals* _tmp74_ = NULL;
+						cairo_t* _tmp70_;
+						gint _tmp71_;
+						gint _tmp72_;
+						gint _tmp73_;
+						SpitTransitionsVisuals* _tmp74_;
 						GdkRectangle _tmp75_ = {0};
-						GdkRectangle _tmp76_ = {0};
-						gint _tmp77_ = 0;
-						gdouble _tmp78_ = 0.0;
+						GdkRectangle _tmp76_;
+						gint _tmp77_;
+						gdouble _tmp78_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						_tmp70_ = ctx;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
@@ -609,7 +606,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 						_tmp78_ = alpha;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 						cairo_rectangle (_tmp70_, (gdouble) _tmp71_, (gdouble) (_tmp72_ + (STRIPES_EFFECT_STRIPE_HEIGHT * _tmp73_)), _tmp77_ * _tmp78_, (gdouble) STRIPES_EFFECT_STRIPE_HEIGHT);
-#line 613 "StripesEffect.c"
+#line 610 "StripesEffect.c"
 					}
 				}
 			}
@@ -624,7 +621,7 @@ static void stripes_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 		_tmp81_ = alpha;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 		cairo_paint_with_alpha (_tmp80_, _tmp81_);
-#line 628 "StripesEffect.c"
+#line 625 "StripesEffect.c"
 	}
 }
 
@@ -637,7 +634,7 @@ static void stripes_effect_real_advance (SpitTransitionsEffect* base, SpitTransi
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 641 "StripesEffect.c"
+#line 638 "StripesEffect.c"
 }
 
 
@@ -645,7 +642,7 @@ static void stripes_effect_real_cancel (SpitTransitionsEffect* base) {
 	StripesEffect * self;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRIPES_EFFECT, StripesEffect);
-#line 649 "StripesEffect.c"
+#line 646 "StripesEffect.c"
 }
 
 
@@ -656,7 +653,7 @@ static void stripes_effect_class_init (StripesEffectClass * klass) {
 	g_type_class_add_private (klass, sizeof (StripesEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = stripes_effect_finalize;
-#line 660 "StripesEffect.c"
+#line 657 "StripesEffect.c"
 }
 
 
@@ -664,35 +661,35 @@ static void stripes_effect_spit_transitions_effect_interface_init (SpitTransitio
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	stripes_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) stripes_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) stripes_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) stripes_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) stripes_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) stripes_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) stripes_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) stripes_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) stripes_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) stripes_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) stripes_effect_real_cancel;
-#line 679 "StripesEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) stripes_effect_real_cancel;
+#line 676 "StripesEffect.c"
 }
 
 
 static void stripes_effect_instance_init (StripesEffect * self) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self->priv = STRIPES_EFFECT_GET_PRIVATE (self);
-#line 686 "StripesEffect.c"
+#line 683 "StripesEffect.c"
 }
 
 
-static void stripes_effect_finalize (GObject* obj) {
+static void stripes_effect_finalize (GObject * obj) {
 	StripesEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRIPES_EFFECT, StripesEffect);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/StripesEffect.vala"
 	G_OBJECT_CLASS (stripes_effect_parent_class)->finalize (obj);
-#line 696 "StripesEffect.c"
+#line 693 "StripesEffect.c"
 }
 
 
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"
 }