Merge branch 'feature/upstream' into develop

1 files changed, 144 insertions, 147 deletions

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