Merge branch 'feature/upstream' into develop

1 files changed, 129 insertions, 132 deletions

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