Merge branch 'feature/upstream' into develop

1 files changed, 118 insertions, 121 deletions

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"
 }