Merge branch 'feature/upstream' into develop

1 files changed, 355 insertions, 325 deletions

diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c
index 56f3667..62b4c5e 100644
--- a/plugins/shotwell-transitions/CrumbleEffect.c
+++ b/plugins/shotwell-transitions/CrumbleEffect.c
@@ -1,4 +1,4 @@
-/* CrumbleEffect.c generated by valac 0.36.6, the Vala compiler
+/* CrumbleEffect.c generated by valac 0.40.4, the Vala compiler
  * generated from CrumbleEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -8,6 +8,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
@@ -43,6 +44,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
 typedef struct _CrumbleEffectDescriptor CrumbleEffectDescriptor;
 typedef struct _CrumbleEffectDescriptorClass CrumbleEffectDescriptorClass;
 typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate;
+enum  {
+	CRUMBLE_EFFECT_DESCRIPTOR_0_PROPERTY,
+	CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* crumble_effect_descriptor_properties[CRUMBLE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
 
 #define TYPE_CRUMBLE_EFFECT (crumble_effect_get_type ())
 #define CRUMBLE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CRUMBLE_EFFECT, CrumbleEffect))
@@ -54,6 +60,11 @@ typedef struct _CrumbleEffectDescriptorPrivate CrumbleEffectDescriptorPrivate;
 typedef struct _CrumbleEffect CrumbleEffect;
 typedef struct _CrumbleEffectClass CrumbleEffectClass;
 typedef struct _CrumbleEffectPrivate CrumbleEffectPrivate;
+enum  {
+	CRUMBLE_EFFECT_0_PROPERTY,
+	CRUMBLE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* crumble_effect_properties[CRUMBLE_EFFECT_NUM_PROPERTIES];
 #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
 #define _g_rand_free0(var) ((var == NULL) ? NULL : (var = (g_rand_free (var), NULL)))
@@ -105,59 +116,77 @@ static SpitTransitionsEffectIface * crumble_effect_spit_transitions_effect_paren
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType crumble_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum  {
-	CRUMBLE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
 CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory);
-CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+CrumbleEffectDescriptor* crumble_effect_descriptor_construct (GType object_type,
+                                                              GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+                                                                        GFile* resource_directory);
 static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
 static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                                              SpitHostInterface* host);
 CrumbleEffect* crumble_effect_new (void);
 CrumbleEffect* crumble_effect_construct (GType object_type);
 GType crumble_effect_get_type (void) G_GNUC_CONST;
 #define CRUMBLE_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CRUMBLE_EFFECT, CrumbleEffectPrivate))
-enum  {
-	CRUMBLE_EFFECT_DUMMY_PROPERTY
-};
 #define CRUMBLE_EFFECT_DESIRED_FPS 25
 #define CRUMBLE_EFFECT_MIN_FPS 15
 #define CRUMBLE_EFFECT_STRIPE_WIDTH 10
-static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
+static void crumble_effect_real_get_fps (SpitTransitionsEffect* base,
+                                  gint* desired_fps,
+                                  gint* min_fps);
 static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
-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_start (SpitTransitionsEffect* base,
+                                SpitTransitionsVisuals* visuals,
+                                SpitTransitionsMotion* motion);
+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 _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) {
+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_;
 #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"
-	_tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+	self = (CrumbleEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return self;
-#line 150 "CrumbleEffect.c"
+#line 175 "CrumbleEffect.c"
 }
 
 
-CrumbleEffectDescriptor* crumble_effect_descriptor_new (GFile* resource_directory) {
+CrumbleEffectDescriptor*
+crumble_effect_descriptor_new (GFile* resource_directory)
+{
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return crumble_effect_descriptor_construct (TYPE_CRUMBLE_EFFECT_DESCRIPTOR, resource_directory);
-#line 157 "CrumbleEffect.c"
+#line 184 "CrumbleEffect.c"
 }
 
 
-static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+crumble_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
 	CrumbleEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -166,11 +195,13 @@ static const gchar* crumble_effect_descriptor_real_get_id (ShotwellTransitionDes
 	result = "org.yorba.shotwell.transitions.crumble";
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return result;
-#line 170 "CrumbleEffect.c"
+#line 199 "CrumbleEffect.c"
 }
 
 
-static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+crumble_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
 	CrumbleEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -179,11 +210,14 @@ static const gchar* crumble_effect_descriptor_real_get_pluggable_name (ShotwellT
 	result = _ ("Crumble");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return result;
-#line 183 "CrumbleEffect.c"
+#line 214 "CrumbleEffect.c"
 }
 
 
-static SpitTransitionsEffect* crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+crumble_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                       SpitHostInterface* host)
+{
 	CrumbleEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
 	CrumbleEffect* _tmp0_;
@@ -197,11 +231,13 @@ 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 201 "CrumbleEffect.c"
+#line 235 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass) {
+static void
+crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass * klass)
+{
 #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"
@@ -210,15 +246,19 @@ static void crumble_effect_descriptor_class_init (CrumbleEffectDescriptorClass *
 	((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 214 "CrumbleEffect.c"
+#line 250 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self) {
+static void
+crumble_effect_descriptor_instance_init (CrumbleEffectDescriptor * self)
+{
 }
 
 
-GType crumble_effect_descriptor_get_type (void) {
+GType
+crumble_effect_descriptor_get_type (void)
+{
 	static volatile gsize crumble_effect_descriptor_type_id__volatile = 0;
 	if (g_once_init_enter (&crumble_effect_descriptor_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffectDescriptor), 0, (GInstanceInitFunc) crumble_effect_descriptor_instance_init, NULL };
@@ -230,24 +270,32 @@ GType crumble_effect_descriptor_get_type (void) {
 }
 
 
-CrumbleEffect* crumble_effect_construct (GType object_type) {
+CrumbleEffect*
+crumble_effect_construct (GType object_type)
+{
 	CrumbleEffect * self = NULL;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = (CrumbleEffect*) g_object_new (object_type, NULL);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return self;
-#line 240 "CrumbleEffect.c"
+#line 282 "CrumbleEffect.c"
 }
 
 
-CrumbleEffect* crumble_effect_new (void) {
+CrumbleEffect*
+crumble_effect_new (void)
+{
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	return crumble_effect_construct (TYPE_CRUMBLE_EFFECT);
-#line 247 "CrumbleEffect.c"
+#line 291 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+crumble_effect_real_get_fps (SpitTransitionsEffect* base,
+                             gint* desired_fps,
+                             gint* min_fps)
+{
 	CrumbleEffect * self;
 	gint _vala_desired_fps = 0;
 	gint _vala_min_fps = 0;
@@ -261,18 +309,20 @@ 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 265 "CrumbleEffect.c"
+#line 313 "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 271 "CrumbleEffect.c"
+#line 319 "CrumbleEffect.c"
 	}
 }
 
 
-static gboolean crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+crumble_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
 	CrumbleEffect * self;
 	gboolean result = FALSE;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
@@ -281,17 +331,20 @@ 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 285 "CrumbleEffect.c"
+#line 335 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+crumble_effect_real_start (SpitTransitionsEffect* base,
+                           SpitTransitionsVisuals* visuals,
+                           SpitTransitionsMotion* motion)
+{
 	CrumbleEffect * self;
 	GRand* rand = NULL;
 	GRand* _tmp0_;
-	SpitTransitionsVisuals* _tmp1_;
+	GdkPixbuf* _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"
@@ -303,210 +356,201 @@ static void crumble_effect_real_start (SpitTransitionsEffect* base, SpitTransiti
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	rand = _tmp0_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp1_ = visuals;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp2_ = spit_transitions_visuals_get_from_pixbuf (_tmp1_);
+	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	if (_tmp3_ != NULL) {
-#line 314 "CrumbleEffect.c"
-		SpitTransitionsVisuals* _tmp4_;
-		GdkPixbuf* _tmp5_;
-		GdkPixbuf* _tmp6_;
+	if (_tmp2_ != NULL) {
+#line 365 "CrumbleEffect.c"
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _tmp7_;
-		gint _tmp8_;
+		cairo_surface_t** _tmp8_;
 		gint _tmp9_;
-		cairo_surface_t** _tmp10_;
-		gint _tmp11_;
-		gdouble* _tmp12_;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp4_ = visuals;
+		gdouble* _tmp10_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp5_ = spit_transitions_visuals_get_from_pixbuf (_tmp4_);
+		_tmp3_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
+		_tmp5_ = gdk_pixbuf_get_width (_tmp4_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		self->priv->stripes_count = _tmp8_ / CRUMBLE_EFFECT_STRIPE_WIDTH;
+		self->priv->stripes_count = _tmp6_ / CRUMBLE_EFFECT_STRIPE_WIDTH;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp9_ = self->priv->stripes_count;
+		_tmp7_ = self->priv->stripes_count;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp10_ = g_new0 (cairo_surface_t*, _tmp9_ + 1);
+		_tmp8_ = g_new0 (cairo_surface_t*, _tmp7_ + 1);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		self->priv->from_stripes = (_vala_array_free (self->priv->from_stripes, self->priv->from_stripes_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		self->priv->from_stripes = _tmp10_;
+		self->priv->from_stripes = _tmp8_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		self->priv->from_stripes_length1 = _tmp9_;
+		self->priv->from_stripes_length1 = _tmp7_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		self->priv->_from_stripes_size_ = self->priv->from_stripes_length1;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp11_ = self->priv->stripes_count;
+		_tmp9_ = self->priv->stripes_count;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp12_ = g_new0 (gdouble, _tmp11_);
+		_tmp10_ = g_new0 (gdouble, _tmp9_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		self->priv->accelerations = (g_free (self->priv->accelerations), NULL);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		self->priv->accelerations = _tmp12_;
+		self->priv->accelerations = _tmp10_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		self->priv->accelerations_length1 = _tmp11_;
+		self->priv->accelerations_length1 = _tmp9_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 		self->priv->_accelerations_size_ = self->priv->accelerations_length1;
-#line 360 "CrumbleEffect.c"
+#line 408 "CrumbleEffect.c"
 		{
 			gint i = 0;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			i = 0;
-#line 365 "CrumbleEffect.c"
+#line 413 "CrumbleEffect.c"
 			{
-				gboolean _tmp13_ = FALSE;
+				gboolean _tmp11_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-				_tmp13_ = TRUE;
+				_tmp11_ = TRUE;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				while (TRUE) {
-#line 372 "CrumbleEffect.c"
-					gint _tmp15_;
+#line 420 "CrumbleEffect.c"
+					gint _tmp13_;
+					gint _tmp14_;
+					cairo_surface_t** _tmp15_;
+					gint _tmp15__length1;
 					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_;
+					GdkPixbuf* _tmp17_;
+					GdkPixbuf* _tmp18_;
+					gint _tmp19_;
+					gint _tmp20_;
+					cairo_surface_t* _tmp21_;
+					cairo_surface_t* _tmp22_;
 					cairo_t* ctx = NULL;
-					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_;
+					cairo_surface_t** _tmp23_;
+					gint _tmp23__length1;
+					gint _tmp24_;
+					cairo_surface_t* _tmp25_;
+					cairo_t* _tmp26_;
+					cairo_t* _tmp27_;
+					GdkPixbuf* _tmp28_;
+					GdkPixbuf* _tmp29_;
+					gint _tmp30_;
+					cairo_t* _tmp31_;
+					gdouble* _tmp32_;
+					gint _tmp32__length1;
+					gint _tmp33_;
+					GRand* _tmp34_;
+					gdouble _tmp35_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					if (!_tmp13_) {
-#line 405 "CrumbleEffect.c"
-						gint _tmp14_;
+					if (!_tmp11_) {
+#line 450 "CrumbleEffect.c"
+						gint _tmp12_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-						_tmp14_ = i;
+						_tmp12_ = i;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-						i = _tmp14_ + 1;
-#line 411 "CrumbleEffect.c"
+						i = _tmp12_ + 1;
+#line 456 "CrumbleEffect.c"
 					}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp13_ = FALSE;
+					_tmp11_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp15_ = i;
+					_tmp13_ = i;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp16_ = self->priv->stripes_count;
+					_tmp14_ = self->priv->stripes_count;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					if (!(_tmp15_ < _tmp16_)) {
+					if (!(_tmp13_ < _tmp14_)) {
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						break;
-#line 423 "CrumbleEffect.c"
+#line 468 "CrumbleEffect.c"
 					}
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp17_ = self->priv->from_stripes;
+					_tmp15_ = self->priv->from_stripes;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp17__length1 = self->priv->from_stripes_length1;
+					_tmp15__length1 = self->priv->from_stripes_length1;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp18_ = i;
+					_tmp16_ = i;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp19_ = visuals;
+					_tmp17_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp20_ = spit_transitions_visuals_get_from_pixbuf (_tmp19_);
+					_tmp18_ = _tmp17_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp21_ = _tmp20_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
+					_tmp19_ = gdk_pixbuf_get_height (_tmp18_);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp23_ = _tmp22_;
+					_tmp20_ = _tmp19_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp23_);
+					_tmp21_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, CRUMBLE_EFFECT_STRIPE_WIDTH, _tmp20_);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_cairo_surface_destroy0 (_tmp17_[_tmp18_]);
+					_cairo_surface_destroy0 (_tmp15_[_tmp16_]);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp17_[_tmp18_] = _tmp24_;
+					_tmp15_[_tmp16_] = _tmp21_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp25_ = _tmp17_[_tmp18_];
+					_tmp22_ = _tmp15_[_tmp16_];
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp26_ = self->priv->from_stripes;
+					_tmp23_ = self->priv->from_stripes;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp26__length1 = self->priv->from_stripes_length1;
+					_tmp23__length1 = self->priv->from_stripes_length1;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp27_ = i;
+					_tmp24_ = i;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp28_ = _tmp26_[_tmp27_];
+					_tmp25_ = _tmp23_[_tmp24_];
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp29_ = cairo_create (_tmp28_);
+					_tmp26_ = cairo_create (_tmp25_);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					ctx = _tmp29_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp30_ = ctx;
+					ctx = _tmp26_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp31_ = visuals;
+					_tmp27_ = ctx;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp32_ = spit_transitions_visuals_get_from_pixbuf (_tmp31_);
+					_tmp28_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp33_ = _tmp32_;
+					_tmp29_ = _tmp28_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp34_ = i;
+					_tmp30_ = i;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					gdk_cairo_set_source_pixbuf (_tmp30_, _tmp33_, (gdouble) ((-_tmp34_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0);
+					gdk_cairo_set_source_pixbuf (_tmp27_, _tmp29_, (gdouble) ((-_tmp30_) * CRUMBLE_EFFECT_STRIPE_WIDTH), (gdouble) 0);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp35_ = ctx;
+					_tmp31_ = ctx;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					cairo_paint (_tmp35_);
+					cairo_paint (_tmp31_);
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp36_ = self->priv->accelerations;
+					_tmp32_ = self->priv->accelerations;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp36__length1 = self->priv->accelerations_length1;
+					_tmp32__length1 = self->priv->accelerations_length1;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp37_ = i;
+					_tmp33_ = i;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp38_ = rand;
+					_tmp34_ = rand;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp39_ = g_rand_double (_tmp38_);
+					_tmp32_[_tmp33_] = g_rand_double (_tmp34_);
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp36_[_tmp37_] = _tmp39_;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp40_ = _tmp36_[_tmp37_];
+					_tmp35_ = _tmp32_[_tmp33_];
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 					_cairo_destroy0 (ctx);
-#line 493 "CrumbleEffect.c"
+#line 532 "CrumbleEffect.c"
 				}
 			}
 		}
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	_g_rand_free0 (rand);
-#line 500 "CrumbleEffect.c"
+#line 539 "CrumbleEffect.c"
 }
 
 
-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_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_;
-	gint _tmp1_;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
+	gdouble _tmp0_;
 #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"
@@ -516,239 +560,205 @@ static void crumble_effect_real_paint (SpitTransitionsEffect* base, SpitTransiti
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	g_return_if_fail (ctx != NULL);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp0_ = motion;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp1_ = frame_number;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	alpha = _tmp2_;
+	alpha = spit_transitions_motion_get_alpha (motion, frame_number);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	_tmp3_ = alpha;
+	_tmp0_ = alpha;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-	if (_tmp3_ < 0.5) {
-#line 531 "CrumbleEffect.c"
-		gdouble _tmp4_;
+	if (_tmp0_ < 0.5) {
+#line 569 "CrumbleEffect.c"
+		gdouble _tmp1_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp4_ = alpha;
+		_tmp1_ = alpha;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		alpha = _tmp4_ * 2;
-#line 537 "CrumbleEffect.c"
+		alpha = _tmp1_ * 2;
+#line 575 "CrumbleEffect.c"
 		{
 			gint i = 0;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 			i = 0;
-#line 542 "CrumbleEffect.c"
+#line 580 "CrumbleEffect.c"
 			{
-				gboolean _tmp5_ = FALSE;
+				gboolean _tmp2_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-				_tmp5_ = TRUE;
+				_tmp2_ = TRUE;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 				while (TRUE) {
-#line 549 "CrumbleEffect.c"
-					gint _tmp7_;
-					gint _tmp8_;
+#line 587 "CrumbleEffect.c"
+					gint _tmp4_;
+					gint _tmp5_;
 					gint x = 0;
-					SpitTransitionsVisuals* _tmp9_;
-					GdkRectangle _tmp10_ = {0};
-					GdkRectangle _tmp11_;
-					gint _tmp12_;
-					gint _tmp13_;
+					GdkRectangle _tmp6_ = {0};
+					GdkRectangle _tmp7_;
+					gint _tmp8_;
+					gint _tmp9_;
 					gdouble a = 0.0;
+					gdouble _tmp10_;
+					gdouble _tmp11_;
+					gdouble* _tmp12_;
+					gint _tmp12__length1;
+					gint _tmp13_;
 					gdouble _tmp14_;
-					gdouble _tmp15_;
-					gdouble* _tmp16_;
-					gint _tmp16__length1;
-					gint _tmp17_;
-					gdouble _tmp18_;
 					gint y = 0;
-					SpitTransitionsVisuals* _tmp19_;
-					GdkRectangle _tmp20_ = {0};
-					GdkRectangle _tmp21_;
-					gint _tmp22_;
-					SpitTransitionsVisuals* _tmp23_;
-					GdkPixbuf* _tmp24_;
-					GdkPixbuf* _tmp25_;
-					gint _tmp26_;
+					GdkRectangle _tmp15_ = {0};
+					GdkRectangle _tmp16_;
+					gint _tmp17_;
+					GdkPixbuf* _tmp18_;
+					GdkPixbuf* _tmp19_;
+					gint _tmp20_;
+					gint _tmp21_;
+					gdouble _tmp22_;
+					gdouble _tmp23_;
+					cairo_surface_t** _tmp24_;
+					gint _tmp24__length1;
+					gint _tmp25_;
+					cairo_surface_t* _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_;
+					gint _tmp28_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					if (!_tmp5_) {
-#line 587 "CrumbleEffect.c"
-						gint _tmp6_;
+					if (!_tmp2_) {
+#line 620 "CrumbleEffect.c"
+						gint _tmp3_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-						_tmp6_ = i;
+						_tmp3_ = i;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-						i = _tmp6_ + 1;
-#line 593 "CrumbleEffect.c"
+						i = _tmp3_ + 1;
+#line 626 "CrumbleEffect.c"
 					}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp5_ = FALSE;
+					_tmp2_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp7_ = i;
+					_tmp4_ = i;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp8_ = self->priv->stripes_count;
+					_tmp5_ = self->priv->stripes_count;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					if (!(_tmp7_ < _tmp8_)) {
+					if (!(_tmp4_ < _tmp5_)) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 						break;
-#line 605 "CrumbleEffect.c"
+#line 638 "CrumbleEffect.c"
 					}
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp9_ = visuals;
+					spit_transitions_visuals_get_from_pos (visuals, &_tmp6_);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					spit_transitions_visuals_get_from_pos (_tmp9_, &_tmp10_);
+					_tmp7_ = _tmp6_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp11_ = _tmp10_;
+					_tmp8_ = _tmp7_.x;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp12_ = _tmp11_.x;
+					_tmp9_ = i;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp13_ = i;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					x = _tmp12_ + (_tmp13_ * CRUMBLE_EFFECT_STRIPE_WIDTH);
+					x = _tmp8_ + (_tmp9_ * CRUMBLE_EFFECT_STRIPE_WIDTH);
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp14_ = alpha;
+					_tmp10_ = alpha;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp15_ = alpha;
+					_tmp11_ = alpha;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp16_ = self->priv->accelerations;
+					_tmp12_ = self->priv->accelerations;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp16__length1 = self->priv->accelerations_length1;
+					_tmp12__length1 = self->priv->accelerations_length1;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp17_ = i;
+					_tmp13_ = i;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp18_ = _tmp16_[_tmp17_];
+					_tmp14_ = _tmp12_[_tmp13_];
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					a = _tmp14_ + (_tmp15_ * _tmp18_);
+					a = _tmp10_ + (_tmp11_ * _tmp14_);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp19_ = visuals;
+					spit_transitions_visuals_get_from_pos (visuals, &_tmp15_);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					spit_transitions_visuals_get_from_pos (_tmp19_, &_tmp20_);
+					_tmp16_ = _tmp15_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp21_ = _tmp20_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp22_ = _tmp21_.y;
+					_tmp17_ = _tmp16_.y;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp23_ = visuals;
+					_tmp18_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp24_ = spit_transitions_visuals_get_from_pixbuf (_tmp23_);
+					_tmp19_ = _tmp18_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp25_ = _tmp24_;
+					_tmp20_ = gdk_pixbuf_get_height (_tmp19_);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp27_ = _tmp26_;
+					_tmp21_ = _tmp20_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp28_ = a;
+					_tmp22_ = a;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp29_ = a;
+					_tmp23_ = a;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					y = _tmp22_ + ((gint) ((_tmp27_ * _tmp28_) * _tmp29_));
+					y = _tmp17_ + ((gint) ((_tmp21_ * _tmp22_) * _tmp23_));
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp30_ = ctx;
+					_tmp24_ = self->priv->from_stripes;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp31_ = self->priv->from_stripes;
+					_tmp24__length1 = self->priv->from_stripes_length1;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp31__length1 = self->priv->from_stripes_length1;
+					_tmp25_ = i;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp32_ = i;
+					_tmp26_ = _tmp24_[_tmp25_];
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp33_ = _tmp31_[_tmp32_];
+					_tmp27_ = x;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp34_ = x;
+					_tmp28_ = y;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp35_ = y;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					cairo_set_source_surface (_tmp30_, _tmp33_, (gdouble) _tmp34_, (gdouble) _tmp35_);
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					_tmp36_ = ctx;
+					cairo_set_source_surface (ctx, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp28_);
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-					cairo_paint (_tmp36_);
-#line 677 "CrumbleEffect.c"
+					cairo_paint (ctx);
+#line 700 "CrumbleEffect.c"
 				}
 			}
 		}
 	} else {
-		SpitTransitionsVisuals* _tmp37_;
-		GdkPixbuf* _tmp38_;
-		GdkPixbuf* _tmp39_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp37_ = visuals;
+		GdkPixbuf* _tmp29_;
+		GdkPixbuf* _tmp30_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_);
+		_tmp29_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		_tmp39_ = _tmp38_;
+		_tmp30_ = _tmp29_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-		if (_tmp39_ != NULL) {
-#line 693 "CrumbleEffect.c"
+		if (_tmp30_ != NULL) {
+#line 713 "CrumbleEffect.c"
+			gdouble _tmp31_;
+			GdkPixbuf* _tmp32_;
+			GdkPixbuf* _tmp33_;
+			GdkRectangle _tmp34_ = {0};
+			GdkRectangle _tmp35_;
+			gint _tmp36_;
+			GdkRectangle _tmp37_ = {0};
+			GdkRectangle _tmp38_;
+			gint _tmp39_;
 			gdouble _tmp40_;
-			cairo_t* _tmp41_;
-			SpitTransitionsVisuals* _tmp42_;
-			GdkPixbuf* _tmp43_;
-			GdkPixbuf* _tmp44_;
-			SpitTransitionsVisuals* _tmp45_;
-			GdkRectangle _tmp46_ = {0};
-			GdkRectangle _tmp47_;
-			gint _tmp48_;
-			SpitTransitionsVisuals* _tmp49_;
-			GdkRectangle _tmp50_ = {0};
-			GdkRectangle _tmp51_;
-			gint _tmp52_;
-			cairo_t* _tmp53_;
-			gdouble _tmp54_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp40_ = alpha;
+			_tmp31_ = alpha;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			alpha = (_tmp40_ - 0.5) * 2;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp41_ = ctx;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp42_ = visuals;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp43_ = spit_transitions_visuals_get_to_pixbuf (_tmp42_);
+			alpha = (_tmp31_ - 0.5) * 2;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp44_ = _tmp43_;
+			_tmp32_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp45_ = visuals;
+			_tmp33_ = _tmp32_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_);
+			spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp47_ = _tmp46_;
+			_tmp35_ = _tmp34_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp48_ = _tmp47_.x;
+			_tmp36_ = _tmp35_.x;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp49_ = visuals;
+			spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_);
+			_tmp38_ = _tmp37_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp51_ = _tmp50_;
+			_tmp39_ = _tmp38_.y;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp52_ = _tmp51_.y;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			gdk_cairo_set_source_pixbuf (_tmp41_, _tmp44_, (gdouble) _tmp48_, (gdouble) _tmp52_);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp53_ = ctx;
+			gdk_cairo_set_source_pixbuf (ctx, _tmp33_, (gdouble) _tmp36_, (gdouble) _tmp39_);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			_tmp54_ = alpha;
+			_tmp40_ = alpha;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
-			cairo_paint_with_alpha (_tmp53_, _tmp54_);
-#line 745 "CrumbleEffect.c"
+			cairo_paint_with_alpha (ctx, _tmp40_);
+#line 750 "CrumbleEffect.c"
 		} else {
 		}
 	}
 }
 
 
-static void crumble_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+crumble_effect_real_advance (SpitTransitionsEffect* base,
+                             SpitTransitionsVisuals* visuals,
+                             SpitTransitionsMotion* motion,
+                             gint frame_number)
+{
 	CrumbleEffect * self;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CRUMBLE_EFFECT, CrumbleEffect);
@@ -756,30 +766,36 @@ 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 760 "CrumbleEffect.c"
+#line 770 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_real_cancel (SpitTransitionsEffect* base) {
+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 768 "CrumbleEffect.c"
+#line 780 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_class_init (CrumbleEffectClass * klass) {
+static void
+crumble_effect_class_init (CrumbleEffectClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	crumble_effect_parent_class = g_type_class_peek_parent (klass);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CrumbleEffect.vala"
 	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 779 "CrumbleEffect.c"
+#line 793 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+crumble_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
 #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"
@@ -794,18 +810,22 @@ static void crumble_effect_spit_transitions_effect_interface_init (SpitTransitio
 	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 798 "CrumbleEffect.c"
+#line 814 "CrumbleEffect.c"
 }
 
 
-static void crumble_effect_instance_init (CrumbleEffect * self) {
+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 805 "CrumbleEffect.c"
+#line 823 "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);
@@ -815,11 +835,13 @@ 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 819 "CrumbleEffect.c"
+#line 839 "CrumbleEffect.c"
 }
 
 
-GType crumble_effect_get_type (void) {
+GType
+crumble_effect_get_type (void)
+{
 	static volatile gsize crumble_effect_type_id__volatile = 0;
 	if (g_once_init_enter (&crumble_effect_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CrumbleEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) crumble_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CrumbleEffect), 0, (GInstanceInitFunc) crumble_effect_instance_init, NULL };
@@ -833,7 +855,11 @@ GType crumble_effect_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -845,7 +871,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }