Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

1 files changed, 338 insertions, 320 deletions

diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c
index 20733f9..ef1f15e 100644
--- a/plugins/shotwell-transitions/BlindsEffect.c
+++ b/plugins/shotwell-transitions/BlindsEffect.c
@@ -1,4 +1,4 @@
-/* BlindsEffect.c generated by valac 0.36.6, the Vala compiler
+/* BlindsEffect.c generated by valac 0.40.4, the Vala compiler
  * generated from BlindsEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -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 _BlindsEffectDescriptor BlindsEffectDescriptor;
 typedef struct _BlindsEffectDescriptorClass BlindsEffectDescriptorClass;
 typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate;
+enum  {
+	BLINDS_EFFECT_DESCRIPTOR_0_PROPERTY,
+	BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* blinds_effect_descriptor_properties[BLINDS_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
 
 #define TYPE_BLINDS_EFFECT (blinds_effect_get_type ())
 #define BLINDS_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BLINDS_EFFECT, BlindsEffect))
@@ -54,6 +60,11 @@ typedef struct _BlindsEffectDescriptorPrivate BlindsEffectDescriptorPrivate;
 typedef struct _BlindsEffect BlindsEffect;
 typedef struct _BlindsEffectClass BlindsEffectClass;
 typedef struct _BlindsEffectPrivate BlindsEffectPrivate;
+enum  {
+	BLINDS_EFFECT_0_PROPERTY,
+	BLINDS_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* blinds_effect_properties[BLINDS_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)))
 
@@ -102,59 +113,77 @@ static SpitTransitionsEffectIface * blinds_effect_spit_transitions_effect_parent
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType blinds_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum  {
-	BLINDS_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
 BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory);
-BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+BlindsEffectDescriptor* blinds_effect_descriptor_construct (GType object_type,
+                                                            GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+                                                                        GFile* resource_directory);
 static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
 static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                                             SpitHostInterface* host);
 BlindsEffect* blinds_effect_new (void);
 BlindsEffect* blinds_effect_construct (GType object_type);
 GType blinds_effect_get_type (void) G_GNUC_CONST;
 #define BLINDS_EFFECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BLINDS_EFFECT, BlindsEffectPrivate))
-enum  {
-	BLINDS_EFFECT_DUMMY_PROPERTY
-};
 #define BLINDS_EFFECT_DESIRED_FPS 30
 #define BLINDS_EFFECT_MIN_FPS 15
 #define BLINDS_EFFECT_BLIND_WIDTH 50
-static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
+static void blinds_effect_real_get_fps (SpitTransitionsEffect* base,
+                                 gint* desired_fps,
+                                 gint* min_fps);
 static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
-static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void blinds_effect_real_start (SpitTransitionsEffect* base,
+                               SpitTransitionsVisuals* visuals,
+                               SpitTransitionsMotion* motion);
+static void blinds_effect_real_paint (SpitTransitionsEffect* base,
+                               SpitTransitionsVisuals* visuals,
+                               SpitTransitionsMotion* motion,
+                               cairo_t* ctx,
+                               gint width,
+                               gint height,
+                               gint frame_number);
+static void blinds_effect_real_advance (SpitTransitionsEffect* base,
+                                 SpitTransitionsVisuals* visuals,
+                                 SpitTransitionsMotion* motion,
+                                 gint frame_number);
 static void blinds_effect_real_cancel (SpitTransitionsEffect* base);
 static void blinds_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);
-
-
-BlindsEffectDescriptor* blinds_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);
+
+
+BlindsEffectDescriptor*
+blinds_effect_descriptor_construct (GType object_type,
+                                    GFile* resource_directory)
+{
 	BlindsEffectDescriptor * self = NULL;
-	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+	self = (BlindsEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return self;
-#line 147 "BlindsEffect.c"
+#line 172 "BlindsEffect.c"
 }
 
 
-BlindsEffectDescriptor* blinds_effect_descriptor_new (GFile* resource_directory) {
+BlindsEffectDescriptor*
+blinds_effect_descriptor_new (GFile* resource_directory)
+{
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return blinds_effect_descriptor_construct (TYPE_BLINDS_EFFECT_DESCRIPTOR, resource_directory);
-#line 154 "BlindsEffect.c"
+#line 181 "BlindsEffect.c"
 }
 
 
-static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+blinds_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
 	BlindsEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -163,11 +192,13 @@ static const gchar* blinds_effect_descriptor_real_get_id (ShotwellTransitionDesc
 	result = "org.yorba.shotwell.transitions.blinds";
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 167 "BlindsEffect.c"
+#line 196 "BlindsEffect.c"
 }
 
 
-static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+blinds_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
 	BlindsEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -176,11 +207,14 @@ static const gchar* blinds_effect_descriptor_real_get_pluggable_name (ShotwellTr
 	result = _ ("Blinds");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 180 "BlindsEffect.c"
+#line 211 "BlindsEffect.c"
 }
 
 
-static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+blinds_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                      SpitHostInterface* host)
+{
 	BlindsEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
 	BlindsEffect* _tmp0_;
@@ -194,11 +228,13 @@ static SpitTransitionsEffect* blinds_effect_descriptor_real_create (ShotwellTran
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 198 "BlindsEffect.c"
+#line 232 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass) {
+static void
+blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	blinds_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -207,15 +243,19 @@ static void blinds_effect_descriptor_class_init (BlindsEffectDescriptorClass * k
 	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) blinds_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) blinds_effect_descriptor_real_create;
-#line 211 "BlindsEffect.c"
+#line 247 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self) {
+static void
+blinds_effect_descriptor_instance_init (BlindsEffectDescriptor * self)
+{
 }
 
 
-GType blinds_effect_descriptor_get_type (void) {
+GType
+blinds_effect_descriptor_get_type (void)
+{
 	static volatile gsize blinds_effect_descriptor_type_id__volatile = 0;
 	if (g_once_init_enter (&blinds_effect_descriptor_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffectDescriptor), 0, (GInstanceInitFunc) blinds_effect_descriptor_instance_init, NULL };
@@ -227,24 +267,32 @@ GType blinds_effect_descriptor_get_type (void) {
 }
 
 
-BlindsEffect* blinds_effect_construct (GType object_type) {
+BlindsEffect*
+blinds_effect_construct (GType object_type)
+{
 	BlindsEffect * self = NULL;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = (BlindsEffect*) g_object_new (object_type, NULL);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return self;
-#line 237 "BlindsEffect.c"
+#line 279 "BlindsEffect.c"
 }
 
 
-BlindsEffect* blinds_effect_new (void) {
+BlindsEffect*
+blinds_effect_new (void)
+{
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return blinds_effect_construct (TYPE_BLINDS_EFFECT);
-#line 244 "BlindsEffect.c"
+#line 288 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+blinds_effect_real_get_fps (SpitTransitionsEffect* base,
+                            gint* desired_fps,
+                            gint* min_fps)
+{
 	BlindsEffect * self;
 	gint _vala_desired_fps = 0;
 	gint _vala_min_fps = 0;
@@ -258,18 +306,20 @@ static void blinds_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
 	if (desired_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 262 "BlindsEffect.c"
+#line 310 "BlindsEffect.c"
 	}
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	if (min_fps) {
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 268 "BlindsEffect.c"
+#line 316 "BlindsEffect.c"
 	}
 }
 
 
-static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+blinds_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
 	BlindsEffect * self;
 	gboolean result = FALSE;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -278,15 +328,18 @@ static gboolean blinds_effect_real_needs_clear_background (SpitTransitionsEffect
 	result = TRUE;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	return result;
-#line 282 "BlindsEffect.c"
+#line 332 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+blinds_effect_real_start (SpitTransitionsEffect* base,
+                          SpitTransitionsVisuals* visuals,
+                          SpitTransitionsMotion* motion)
+{
 	BlindsEffect * self;
-	SpitTransitionsVisuals* _tmp0_;
+	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
-	GdkPixbuf* _tmp2_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -294,188 +347,171 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp0_ = visuals;
+	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp1_ = spit_transitions_visuals_get_from_pixbuf (_tmp0_);
+	_tmp1_ = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp2_ = _tmp1_;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	if (_tmp2_ != NULL) {
-#line 305 "BlindsEffect.c"
-		SpitTransitionsVisuals* _tmp3_;
-		GdkPixbuf* _tmp4_;
-		GdkPixbuf* _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		SpitTransitionsVisuals* _tmp8_;
-		GdkPixbuf* _tmp9_;
-		GdkPixbuf* _tmp10_;
+	if (_tmp1_ != NULL) {
+#line 356 "BlindsEffect.c"
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		gint _tmp4_;
+		gint _tmp5_;
+		GdkPixbuf* _tmp6_;
+		GdkPixbuf* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 		gint _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
-		gdouble _tmp14_;
-		gint _tmp15_;
-		cairo_surface_t** _tmp16_;
+		cairo_surface_t** _tmp12_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp3_ = visuals;
+		_tmp2_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp4_ = spit_transitions_visuals_get_to_pixbuf (_tmp3_);
+		_tmp3_ = _tmp2_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp5_ = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp6_ = gdk_pixbuf_get_width (_tmp5_);
+		_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		self->priv->blind_count = _tmp7_ / BLINDS_EFFECT_BLIND_WIDTH;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp8_ = visuals;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp9_ = spit_transitions_visuals_get_to_pixbuf (_tmp8_);
+		self->priv->blind_count = _tmp5_ / BLINDS_EFFECT_BLIND_WIDTH;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp10_ = _tmp9_;
+		_tmp6_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp11_ = gdk_pixbuf_get_width (_tmp10_);
+		_tmp7_ = _tmp6_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp13_ = self->priv->blind_count;
+		_tmp9_ = _tmp8_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp14_ = ceil (((gdouble) _tmp12_) / ((gdouble) _tmp13_));
+		_tmp10_ = self->priv->blind_count;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		self->priv->current_blind_width = (gint) _tmp14_;
+		self->priv->current_blind_width = (gint) ceil (((gdouble) _tmp9_) / ((gdouble) _tmp10_));
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp15_ = self->priv->blind_count;
+		_tmp11_ = self->priv->blind_count;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp16_ = g_new0 (cairo_surface_t*, _tmp15_ + 1);
+		_tmp12_ = g_new0 (cairo_surface_t*, _tmp11_ + 1);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		self->priv->to_blinds = _tmp16_;
+		self->priv->to_blinds = _tmp12_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		self->priv->to_blinds_length1 = _tmp15_;
+		self->priv->to_blinds_length1 = _tmp11_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		self->priv->_to_blinds_size_ = self->priv->to_blinds_length1;
-#line 360 "BlindsEffect.c"
+#line 402 "BlindsEffect.c"
 		{
 			gint i = 0;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 			i = 0;
-#line 365 "BlindsEffect.c"
+#line 407 "BlindsEffect.c"
 			{
-				gboolean _tmp17_ = FALSE;
+				gboolean _tmp13_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp17_ = TRUE;
+				_tmp13_ = TRUE;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 				while (TRUE) {
-#line 372 "BlindsEffect.c"
+#line 414 "BlindsEffect.c"
+					gint _tmp15_;
+					gint _tmp16_;
+					cairo_surface_t** _tmp17_;
+					gint _tmp17__length1;
+					gint _tmp18_;
 					gint _tmp19_;
-					gint _tmp20_;
-					cairo_surface_t** _tmp21_;
-					gint _tmp21__length1;
+					GdkPixbuf* _tmp20_;
+					GdkPixbuf* _tmp21_;
 					gint _tmp22_;
 					gint _tmp23_;
-					SpitTransitionsVisuals* _tmp24_;
-					GdkPixbuf* _tmp25_;
-					GdkPixbuf* _tmp26_;
-					gint _tmp27_;
-					gint _tmp28_;
-					cairo_surface_t* _tmp29_;
-					cairo_surface_t* _tmp30_;
+					cairo_surface_t* _tmp24_;
+					cairo_surface_t* _tmp25_;
 					cairo_t* ctx = NULL;
-					cairo_surface_t** _tmp31_;
-					gint _tmp31__length1;
-					gint _tmp32_;
-					cairo_surface_t* _tmp33_;
-					cairo_t* _tmp34_;
+					cairo_surface_t** _tmp26_;
+					gint _tmp26__length1;
+					gint _tmp27_;
+					cairo_surface_t* _tmp28_;
+					cairo_t* _tmp29_;
+					cairo_t* _tmp30_;
+					GdkPixbuf* _tmp31_;
+					GdkPixbuf* _tmp32_;
+					gint _tmp33_;
+					gint _tmp34_;
 					cairo_t* _tmp35_;
-					SpitTransitionsVisuals* _tmp36_;
-					GdkPixbuf* _tmp37_;
-					GdkPixbuf* _tmp38_;
-					gint _tmp39_;
-					gint _tmp40_;
-					cairo_t* _tmp41_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					if (!_tmp17_) {
-#line 401 "BlindsEffect.c"
-						gint _tmp18_;
+					if (!_tmp13_) {
+#line 441 "BlindsEffect.c"
+						gint _tmp14_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-						_tmp18_ = i;
+						_tmp14_ = i;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-						i = _tmp18_ + 1;
-#line 407 "BlindsEffect.c"
+						i = _tmp14_ + 1;
+#line 447 "BlindsEffect.c"
 					}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp17_ = FALSE;
+					_tmp13_ = FALSE;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp19_ = i;
+					_tmp15_ = i;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp20_ = self->priv->blind_count;
+					_tmp16_ = self->priv->blind_count;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					if (!(_tmp19_ < _tmp20_)) {
+					if (!(_tmp15_ < _tmp16_)) {
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 						break;
-#line 419 "BlindsEffect.c"
+#line 459 "BlindsEffect.c"
 					}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp21_ = self->priv->to_blinds;
+					_tmp17_ = self->priv->to_blinds;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp21__length1 = self->priv->to_blinds_length1;
+					_tmp17__length1 = self->priv->to_blinds_length1;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp22_ = i;
+					_tmp18_ = i;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp23_ = self->priv->current_blind_width;
+					_tmp19_ = self->priv->current_blind_width;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp24_ = visuals;
+					_tmp20_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
+					_tmp21_ = _tmp20_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp26_ = _tmp25_;
+					_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp27_ = gdk_pixbuf_get_height (_tmp26_);
+					_tmp23_ = _tmp22_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp28_ = _tmp27_;
+					_tmp24_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp19_, _tmp23_);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp29_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, _tmp23_, _tmp28_);
+					_cairo_surface_destroy0 (_tmp17_[_tmp18_]);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_cairo_surface_destroy0 (_tmp21_[_tmp22_]);
+					_tmp17_[_tmp18_] = _tmp24_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp21_[_tmp22_] = _tmp29_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp30_ = _tmp21_[_tmp22_];
+					_tmp25_ = _tmp17_[_tmp18_];
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp31_ = self->priv->to_blinds;
+					_tmp26_ = self->priv->to_blinds;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp31__length1 = self->priv->to_blinds_length1;
+					_tmp26__length1 = self->priv->to_blinds_length1;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp32_ = i;
+					_tmp27_ = i;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp33_ = _tmp31_[_tmp32_];
+					_tmp28_ = _tmp26_[_tmp27_];
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp34_ = cairo_create (_tmp33_);
+					_tmp29_ = cairo_create (_tmp28_);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					ctx = _tmp34_;
+					ctx = _tmp29_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp35_ = ctx;
+					_tmp30_ = ctx;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp36_ = visuals;
+					_tmp31_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp37_ = spit_transitions_visuals_get_to_pixbuf (_tmp36_);
+					_tmp32_ = _tmp31_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp38_ = _tmp37_;
+					_tmp33_ = i;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp39_ = i;
+					_tmp34_ = self->priv->current_blind_width;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp40_ = self->priv->current_blind_width;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					gdk_cairo_set_source_pixbuf (_tmp35_, _tmp38_, (gdouble) ((-_tmp39_) * _tmp40_), (gdouble) 0);
+					gdk_cairo_set_source_pixbuf (_tmp30_, _tmp32_, (gdouble) ((-_tmp33_) * _tmp34_), (gdouble) 0);
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp41_ = ctx;
+					_tmp35_ = ctx;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					cairo_paint (_tmp41_);
+					cairo_paint (_tmp35_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					_cairo_destroy0 (ctx);
-#line 479 "BlindsEffect.c"
+#line 515 "BlindsEffect.c"
 				}
 			}
 		}
@@ -483,27 +519,27 @@ static void blinds_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 }
 
 
-static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+blinds_effect_real_paint (SpitTransitionsEffect* base,
+                          SpitTransitionsVisuals* visuals,
+                          SpitTransitionsMotion* motion,
+                          cairo_t* ctx,
+                          gint width,
+                          gint height,
+                          gint frame_number)
+{
 	BlindsEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_;
-	gint _tmp1_;
-	gdouble _tmp2_;
 	gint y = 0;
-	SpitTransitionsVisuals* _tmp3_;
-	GdkRectangle _tmp4_ = {0};
-	GdkRectangle _tmp5_;
-	gint _tmp6_;
+	GdkRectangle _tmp0_ = {0};
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
 	gint x = 0;
-	SpitTransitionsVisuals* _tmp7_;
-	GdkRectangle _tmp8_ = {0};
-	GdkRectangle _tmp9_;
-	gint _tmp10_;
-	SpitTransitionsVisuals* _tmp11_;
-	GdkPixbuf* _tmp12_;
-	GdkPixbuf* _tmp13_;
-	cairo_t* _tmp53_;
-	cairo_t* _tmp54_;
+	GdkRectangle _tmp3_ = {0};
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp7_;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -513,215 +549,177 @@ static void blinds_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_if_fail (ctx != NULL);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp0_ = motion;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp1_ = frame_number;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	alpha = _tmp2_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp3_ = visuals;
+	alpha = spit_transitions_motion_get_alpha (motion, frame_number);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	spit_transitions_visuals_get_to_pos (_tmp3_, &_tmp4_);
+	spit_transitions_visuals_get_to_pos (visuals, &_tmp0_);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp5_ = _tmp4_;
+	_tmp1_ = _tmp0_;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp6_ = _tmp5_.y;
+	_tmp2_ = _tmp1_.y;
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	y = _tmp6_;
+	y = _tmp2_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp7_ = visuals;
+	spit_transitions_visuals_get_to_pos (visuals, &_tmp3_);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	spit_transitions_visuals_get_to_pos (_tmp7_, &_tmp8_);
+	_tmp4_ = _tmp3_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp9_ = _tmp8_;
+	_tmp5_ = _tmp4_.x;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp10_ = _tmp9_.x;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	x = _tmp10_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp11_ = visuals;
+	x = _tmp5_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp12_ = spit_transitions_visuals_get_from_pixbuf (_tmp11_);
+	_tmp6_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp13_ = _tmp12_;
+	_tmp7_ = _tmp6_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	if (_tmp13_ != NULL) {
-#line 552 "BlindsEffect.c"
-		cairo_t* _tmp14_;
-		SpitTransitionsVisuals* _tmp15_;
-		GdkPixbuf* _tmp16_;
-		GdkPixbuf* _tmp17_;
-		SpitTransitionsVisuals* _tmp18_;
-		GdkRectangle _tmp19_ = {0};
-		GdkRectangle _tmp20_;
-		gint _tmp21_;
-		SpitTransitionsVisuals* _tmp22_;
-		GdkRectangle _tmp23_ = {0};
-		GdkRectangle _tmp24_;
-		gint _tmp25_;
-		cairo_t* _tmp26_;
-		gdouble _tmp27_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp14_ = ctx;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp15_ = visuals;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp16_ = spit_transitions_visuals_get_from_pixbuf (_tmp15_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp17_ = _tmp16_;
+	if (_tmp7_ != NULL) {
+#line 576 "BlindsEffect.c"
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		GdkRectangle _tmp10_ = {0};
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
+		GdkRectangle _tmp13_ = {0};
+		GdkRectangle _tmp14_;
+		gint _tmp15_;
+		gdouble _tmp16_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp18_ = visuals;
+		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp18_, &_tmp19_);
+		_tmp9_ = _tmp8_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp20_ = _tmp19_;
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp10_);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp21_ = _tmp20_.x;
+		_tmp11_ = _tmp10_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp22_ = visuals;
+		_tmp12_ = _tmp11_.x;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp22_, &_tmp23_);
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp13_);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp24_ = _tmp23_;
+		_tmp14_ = _tmp13_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp25_ = _tmp24_.y;
+		_tmp15_ = _tmp14_.y;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp14_, _tmp17_, (gdouble) _tmp21_, (gdouble) _tmp25_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp26_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		_tmp27_ = alpha;
+		_tmp16_ = alpha;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-		cairo_paint_with_alpha (_tmp26_, 1 - (_tmp27_ * 2));
-#line 599 "BlindsEffect.c"
+		cairo_paint_with_alpha (ctx, 1 - (_tmp16_ * 2));
+#line 608 "BlindsEffect.c"
 	}
 	{
 		gint i = 0;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 		i = 0;
-#line 605 "BlindsEffect.c"
+#line 614 "BlindsEffect.c"
 		{
-			gboolean _tmp28_ = FALSE;
+			gboolean _tmp17_ = FALSE;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-			_tmp28_ = TRUE;
+			_tmp17_ = TRUE;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 			while (TRUE) {
-#line 612 "BlindsEffect.c"
+#line 621 "BlindsEffect.c"
+				gint _tmp19_;
+				gint _tmp20_;
+				cairo_surface_t** _tmp21_;
+				gint _tmp21__length1;
+				gint _tmp22_;
+				cairo_surface_t* _tmp23_;
+				gint _tmp24_;
+				gint _tmp25_;
+				gint _tmp26_;
+				gint _tmp27_;
+				gint _tmp28_;
+				gint _tmp29_;
 				gint _tmp30_;
 				gint _tmp31_;
-				cairo_t* _tmp32_;
-				cairo_surface_t** _tmp33_;
-				gint _tmp33__length1;
-				gint _tmp34_;
-				cairo_surface_t* _tmp35_;
+				gint _tmp32_;
+				gdouble _tmp33_;
+				GdkPixbuf* _tmp34_;
+				GdkPixbuf* _tmp35_;
 				gint _tmp36_;
 				gint _tmp37_;
-				gint _tmp38_;
-				gint _tmp39_;
-				cairo_t* _tmp40_;
-				gint _tmp41_;
-				gint _tmp42_;
-				gint _tmp43_;
-				gint _tmp44_;
-				gint _tmp45_;
-				gdouble _tmp46_;
-				SpitTransitionsVisuals* _tmp47_;
-				GdkPixbuf* _tmp48_;
-				GdkPixbuf* _tmp49_;
-				gint _tmp50_;
-				gint _tmp51_;
-				cairo_t* _tmp52_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				if (!_tmp28_) {
-#line 639 "BlindsEffect.c"
-					gint _tmp29_;
+				if (!_tmp17_) {
+#line 644 "BlindsEffect.c"
+					gint _tmp18_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					_tmp29_ = i;
+					_tmp18_ = i;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-					i = _tmp29_ + 1;
-#line 645 "BlindsEffect.c"
+					i = _tmp18_ + 1;
+#line 650 "BlindsEffect.c"
 				}
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp28_ = FALSE;
+				_tmp17_ = FALSE;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp30_ = i;
+				_tmp19_ = i;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp31_ = self->priv->blind_count;
+				_tmp20_ = self->priv->blind_count;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				if (!(_tmp30_ < _tmp31_)) {
+				if (!(_tmp19_ < _tmp20_)) {
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 					break;
-#line 657 "BlindsEffect.c"
+#line 662 "BlindsEffect.c"
 				}
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp32_ = ctx;
+				_tmp21_ = self->priv->to_blinds;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp33_ = self->priv->to_blinds;
+				_tmp21__length1 = self->priv->to_blinds_length1;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp33__length1 = self->priv->to_blinds_length1;
+				_tmp22_ = i;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp34_ = i;
+				_tmp23_ = _tmp21_[_tmp22_];
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp35_ = _tmp33_[_tmp34_];
+				_tmp24_ = x;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp36_ = x;
+				_tmp25_ = i;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp37_ = i;
+				_tmp26_ = self->priv->current_blind_width;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp38_ = self->priv->current_blind_width;
+				_tmp27_ = y;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp39_ = y;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				cairo_set_source_surface (_tmp32_, _tmp35_, (gdouble) (_tmp36_ + (_tmp37_ * _tmp38_)), (gdouble) _tmp39_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp40_ = ctx;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp41_ = x;
+				cairo_set_source_surface (ctx, _tmp23_, (gdouble) (_tmp24_ + (_tmp25_ * _tmp26_)), (gdouble) _tmp27_);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp42_ = i;
+				_tmp28_ = x;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp43_ = self->priv->current_blind_width;
+				_tmp29_ = i;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp44_ = y;
+				_tmp30_ = self->priv->current_blind_width;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp45_ = self->priv->current_blind_width;
+				_tmp31_ = y;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp46_ = alpha;
+				_tmp32_ = self->priv->current_blind_width;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp47_ = visuals;
+				_tmp33_ = alpha;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_);
+				_tmp34_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp49_ = _tmp48_;
+				_tmp35_ = _tmp34_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
+				_tmp36_ = gdk_pixbuf_get_height (_tmp35_);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp51_ = _tmp50_;
+				_tmp37_ = _tmp36_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				cairo_rectangle (_tmp40_, (gdouble) (_tmp41_ + (_tmp42_ * _tmp43_)), (gdouble) _tmp44_, _tmp45_ * (_tmp46_ + 0.5), (gdouble) _tmp51_);
+				cairo_rectangle (ctx, (gdouble) (_tmp28_ + (_tmp29_ * _tmp30_)), (gdouble) _tmp31_, _tmp32_ * (_tmp33_ + 0.5), (gdouble) _tmp37_);
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				_tmp52_ = ctx;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-				cairo_fill (_tmp52_);
-#line 709 "BlindsEffect.c"
+				cairo_fill (ctx);
+#line 706 "BlindsEffect.c"
 			}
 		}
 	}
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp53_ = ctx;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	cairo_clip (_tmp53_);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	_tmp54_ = ctx;
+	cairo_clip (ctx);
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
-	cairo_paint (_tmp54_);
-#line 721 "BlindsEffect.c"
+	cairo_paint (ctx);
+#line 714 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+blinds_effect_real_advance (SpitTransitionsEffect* base,
+                            SpitTransitionsVisuals* visuals,
+                            SpitTransitionsMotion* motion,
+                            gint frame_number)
+{
 	BlindsEffect * self;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -729,11 +727,13 @@ static void blinds_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 733 "BlindsEffect.c"
+#line 731 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+blinds_effect_real_cancel (SpitTransitionsEffect* base)
+{
 	BlindsEffect * self;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -741,18 +741,22 @@ static void blinds_effect_real_cancel (SpitTransitionsEffect* base) {
 }
 
 
-static void blinds_effect_class_init (BlindsEffectClass * klass) {
+static void
+blinds_effect_class_init (BlindsEffectClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	blinds_effect_parent_class = g_type_class_peek_parent (klass);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	g_type_class_add_private (klass, sizeof (BlindsEffectPrivate));
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	G_OBJECT_CLASS (klass)->finalize = blinds_effect_finalize;
-#line 752 "BlindsEffect.c"
+#line 754 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+blinds_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	blinds_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
@@ -767,18 +771,22 @@ static void blinds_effect_spit_transitions_effect_interface_init (SpitTransition
 	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) blinds_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	iface->cancel = (void (*) (SpitTransitionsEffect *)) blinds_effect_real_cancel;
-#line 771 "BlindsEffect.c"
+#line 775 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_instance_init (BlindsEffect * self) {
+static void
+blinds_effect_instance_init (BlindsEffect * self)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self->priv = BLINDS_EFFECT_GET_PRIVATE (self);
-#line 778 "BlindsEffect.c"
+#line 784 "BlindsEffect.c"
 }
 
 
-static void blinds_effect_finalize (GObject * obj) {
+static void
+blinds_effect_finalize (GObject * obj)
+{
 	BlindsEffect * self;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BLINDS_EFFECT, BlindsEffect);
@@ -786,11 +794,13 @@ static void blinds_effect_finalize (GObject * obj) {
 	self->priv->to_blinds = (_vala_array_free (self->priv->to_blinds, self->priv->to_blinds_length1, (GDestroyNotify) cairo_surface_destroy), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/BlindsEffect.vala"
 	G_OBJECT_CLASS (blinds_effect_parent_class)->finalize (obj);
-#line 790 "BlindsEffect.c"
+#line 798 "BlindsEffect.c"
 }
 
 
-GType blinds_effect_get_type (void) {
+GType
+blinds_effect_get_type (void)
+{
 	static volatile gsize blinds_effect_type_id__volatile = 0;
 	if (g_once_init_enter (&blinds_effect_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BlindsEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) blinds_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BlindsEffect), 0, (GInstanceInitFunc) blinds_effect_instance_init, NULL };
@@ -804,7 +814,11 @@ GType blinds_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) {
@@ -816,7 +830,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);
 }