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

1 files changed, 113 insertions, 116 deletions

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