Merge branch 'feature/upstream' into develop

1 files changed, 182 insertions, 154 deletions

diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c
index 8234972..25551e2 100644
--- a/plugins/shotwell-transitions/FadeEffect.c
+++ b/plugins/shotwell-transitions/FadeEffect.c
@@ -1,4 +1,4 @@
-/* FadeEffect.c generated by valac 0.36.6, the Vala compiler
+/* FadeEffect.c generated by valac 0.40.4, the Vala compiler
  * generated from FadeEffect.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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
 typedef struct _FadeEffectDescriptor FadeEffectDescriptor;
 typedef struct _FadeEffectDescriptorClass FadeEffectDescriptorClass;
 typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate;
+enum  {
+	FADE_EFFECT_DESCRIPTOR_0_PROPERTY,
+	FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* fade_effect_descriptor_properties[FADE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
 
 #define TYPE_FADE_EFFECT (fade_effect_get_type ())
 #define FADE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FADE_EFFECT, FadeEffect))
@@ -53,6 +59,11 @@ typedef struct _FadeEffectDescriptorPrivate FadeEffectDescriptorPrivate;
 typedef struct _FadeEffect FadeEffect;
 typedef struct _FadeEffectClass FadeEffectClass;
 typedef struct _FadeEffectPrivate FadeEffectPrivate;
+enum  {
+	FADE_EFFECT_0_PROPERTY,
+	FADE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* fade_effect_properties[FADE_EFFECT_NUM_PROPERTIES];
 
 struct _ShotwellTransitionDescriptor {
 	GObject parent_instance;
@@ -91,54 +102,68 @@ static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_i
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType fade_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum  {
-	FADE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
 FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory);
-FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type,
+                                                        GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+                                                                        GFile* resource_directory);
 static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
 static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                                           SpitHostInterface* host);
 FadeEffect* fade_effect_new (void);
 FadeEffect* fade_effect_construct (GType object_type);
 GType fade_effect_get_type (void) G_GNUC_CONST;
-enum  {
-	FADE_EFFECT_DUMMY_PROPERTY
-};
 #define FADE_EFFECT_DESIRED_FPS 30
 #define FADE_EFFECT_MIN_FPS 20
-static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void fade_effect_real_get_fps (SpitTransitionsEffect* base,
+                               gint* desired_fps,
+                               gint* min_fps);
+static void fade_effect_real_start (SpitTransitionsEffect* base,
+                             SpitTransitionsVisuals* visuals,
+                             SpitTransitionsMotion* motion);
 static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void fade_effect_real_paint (SpitTransitionsEffect* base,
+                             SpitTransitionsVisuals* visuals,
+                             SpitTransitionsMotion* motion,
+                             cairo_t* ctx,
+                             gint width,
+                             gint height,
+                             gint frame_number);
+static void fade_effect_real_advance (SpitTransitionsEffect* base,
+                               SpitTransitionsVisuals* visuals,
+                               SpitTransitionsMotion* motion,
+                               gint frame_number);
 static void fade_effect_real_cancel (SpitTransitionsEffect* base);
 
 
-FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+FadeEffectDescriptor*
+fade_effect_descriptor_construct (GType object_type,
+                                  GFile* resource_directory)
+{
 	FadeEffectDescriptor * self = NULL;
-	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+	self = (FadeEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return self;
-#line 131 "FadeEffect.c"
+#line 152 "FadeEffect.c"
 }
 
 
-FadeEffectDescriptor* fade_effect_descriptor_new (GFile* resource_directory) {
+FadeEffectDescriptor*
+fade_effect_descriptor_new (GFile* resource_directory)
+{
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return fade_effect_descriptor_construct (TYPE_FADE_EFFECT_DESCRIPTOR, resource_directory);
-#line 138 "FadeEffect.c"
+#line 161 "FadeEffect.c"
 }
 
 
-static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+fade_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
 	FadeEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -147,11 +172,13 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri
 	result = "org.yorba.shotwell.transitions.fade";
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 151 "FadeEffect.c"
+#line 176 "FadeEffect.c"
 }
 
 
-static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
 	FadeEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -160,11 +187,14 @@ static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTran
 	result = _ ("Fade");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 164 "FadeEffect.c"
+#line 191 "FadeEffect.c"
 }
 
 
-static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                    SpitHostInterface* host)
+{
 	FadeEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
 	FadeEffect* _tmp0_;
@@ -178,11 +208,13 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 182 "FadeEffect.c"
+#line 212 "FadeEffect.c"
 }
 
 
-static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass) {
+static void
+fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -191,15 +223,19 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass
 	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create;
-#line 195 "FadeEffect.c"
+#line 227 "FadeEffect.c"
 }
 
 
-static void fade_effect_descriptor_instance_init (FadeEffectDescriptor * self) {
+static void
+fade_effect_descriptor_instance_init (FadeEffectDescriptor * self)
+{
 }
 
 
-GType fade_effect_descriptor_get_type (void) {
+GType
+fade_effect_descriptor_get_type (void)
+{
 	static volatile gsize fade_effect_descriptor_type_id__volatile = 0;
 	if (g_once_init_enter (&fade_effect_descriptor_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FadeEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffectDescriptor), 0, (GInstanceInitFunc) fade_effect_descriptor_instance_init, NULL };
@@ -211,24 +247,32 @@ GType fade_effect_descriptor_get_type (void) {
 }
 
 
-FadeEffect* fade_effect_construct (GType object_type) {
+FadeEffect*
+fade_effect_construct (GType object_type)
+{
 	FadeEffect * self = NULL;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = (FadeEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return self;
-#line 221 "FadeEffect.c"
+#line 259 "FadeEffect.c"
 }
 
 
-FadeEffect* fade_effect_new (void) {
+FadeEffect*
+fade_effect_new (void)
+{
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return fade_effect_construct (TYPE_FADE_EFFECT);
-#line 228 "FadeEffect.c"
+#line 268 "FadeEffect.c"
 }
 
 
-static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+fade_effect_real_get_fps (SpitTransitionsEffect* base,
+                          gint* desired_fps,
+                          gint* min_fps)
+{
 	FadeEffect * self;
 	gint _vala_desired_fps = 0;
 	gint _vala_min_fps = 0;
@@ -242,18 +286,22 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 246 "FadeEffect.c"
+#line 290 "FadeEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 252 "FadeEffect.c"
+#line 296 "FadeEffect.c"
 	}
 }
 
 
-static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+fade_effect_real_start (SpitTransitionsEffect* base,
+                        SpitTransitionsVisuals* visuals,
+                        SpitTransitionsMotion* motion)
+{
 	FadeEffect * self;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
@@ -261,11 +309,13 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 265 "FadeEffect.c"
+#line 313 "FadeEffect.c"
 }
 
 
-static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+fade_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
 	FadeEffect * self;
 	gboolean result = FALSE;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -274,22 +324,25 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 278 "FadeEffect.c"
+#line 328 "FadeEffect.c"
 }
 
 
-static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+fade_effect_real_paint (SpitTransitionsEffect* base,
+                        SpitTransitionsVisuals* visuals,
+                        SpitTransitionsMotion* motion,
+                        cairo_t* ctx,
+                        gint width,
+                        gint height,
+                        gint frame_number)
+{
 	FadeEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_;
-	gint _tmp1_;
-	gdouble _tmp2_;
-	SpitTransitionsVisuals* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkPixbuf* _tmp5_;
-	SpitTransitionsVisuals* _tmp20_;
-	GdkPixbuf* _tmp21_;
-	GdkPixbuf* _tmp22_;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp11_;
+	GdkPixbuf* _tmp12_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -299,131 +352,96 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (ctx != NULL);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp0_ = motion;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp1_ = frame_number;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	alpha = _tmp2_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp3_ = visuals;
+	alpha = spit_transitions_motion_get_alpha (motion, frame_number);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp5_ = _tmp4_;
+	_tmp1_ = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	if (_tmp5_ != NULL) {
-#line 318 "FadeEffect.c"
-		cairo_t* _tmp6_;
-		SpitTransitionsVisuals* _tmp7_;
-		GdkPixbuf* _tmp8_;
-		GdkPixbuf* _tmp9_;
-		SpitTransitionsVisuals* _tmp10_;
-		GdkRectangle _tmp11_ = {0};
-		GdkRectangle _tmp12_;
-		gint _tmp13_;
-		SpitTransitionsVisuals* _tmp14_;
-		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_;
-		gint _tmp17_;
-		cairo_t* _tmp18_;
-		gdouble _tmp19_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp6_ = ctx;
+	if (_tmp1_ != NULL) {
+#line 363 "FadeEffect.c"
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
+		GdkRectangle _tmp4_ = {0};
+		GdkRectangle _tmp5_;
+		gint _tmp6_;
+		GdkRectangle _tmp7_ = {0};
+		GdkRectangle _tmp8_;
+		gint _tmp9_;
+		gdouble _tmp10_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp7_ = visuals;
+		_tmp2_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp8_ = spit_transitions_visuals_get_from_pixbuf (_tmp7_);
+		_tmp3_ = _tmp2_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp9_ = _tmp8_;
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp4_);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp10_ = visuals;
+		_tmp5_ = _tmp4_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp10_, &_tmp11_);
+		_tmp6_ = _tmp5_.x;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp12_ = _tmp11_;
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp7_);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp13_ = _tmp12_.x;
+		_tmp8_ = _tmp7_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp14_ = visuals;
+		_tmp9_ = _tmp8_.y;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp14_, &_tmp15_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp16_ = _tmp15_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp17_ = _tmp16_.y;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp6_, _tmp9_, (gdouble) _tmp13_, (gdouble) _tmp17_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp18_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) _tmp6_, (gdouble) _tmp9_);
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp19_ = alpha;
+		_tmp10_ = alpha;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_);
-#line 365 "FadeEffect.c"
+		cairo_paint_with_alpha (ctx, 1.0 - _tmp10_);
+#line 395 "FadeEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp20_ = visuals;
+	_tmp11_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (_tmp20_);
+	_tmp12_ = _tmp11_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp22_ = _tmp21_;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	if (_tmp22_ != NULL) {
-#line 375 "FadeEffect.c"
-		cairo_t* _tmp23_;
-		SpitTransitionsVisuals* _tmp24_;
-		GdkPixbuf* _tmp25_;
-		GdkPixbuf* _tmp26_;
-		SpitTransitionsVisuals* _tmp27_;
-		GdkRectangle _tmp28_ = {0};
-		GdkRectangle _tmp29_;
-		gint _tmp30_;
-		SpitTransitionsVisuals* _tmp31_;
-		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_;
-		gint _tmp34_;
-		cairo_t* _tmp35_;
-		gdouble _tmp36_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp23_ = ctx;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp24_ = visuals;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp25_ = spit_transitions_visuals_get_to_pixbuf (_tmp24_);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp26_ = _tmp25_;
+	if (_tmp12_ != NULL) {
+#line 403 "FadeEffect.c"
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		GdkRectangle _tmp15_ = {0};
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		GdkRectangle _tmp18_ = {0};
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		gdouble _tmp21_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp27_ = visuals;
+		_tmp13_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp27_, &_tmp28_);
+		_tmp14_ = _tmp13_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp29_ = _tmp28_;
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp15_);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp30_ = _tmp29_.x;
+		_tmp16_ = _tmp15_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp31_ = visuals;
+		_tmp17_ = _tmp16_.x;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp31_, &_tmp32_);
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp18_);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp33_ = _tmp32_;
+		_tmp19_ = _tmp18_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp34_ = _tmp33_.y;
+		_tmp20_ = _tmp19_.y;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp30_, (gdouble) _tmp34_);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp35_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp14_, (gdouble) _tmp17_, (gdouble) _tmp20_);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		_tmp36_ = alpha;
+		_tmp21_ = alpha;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-		cairo_paint_with_alpha (_tmp35_, _tmp36_);
-#line 422 "FadeEffect.c"
+		cairo_paint_with_alpha (ctx, _tmp21_);
+#line 435 "FadeEffect.c"
 	}
 }
 
 
-static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+fade_effect_real_advance (SpitTransitionsEffect* base,
+                          SpitTransitionsVisuals* visuals,
+                          SpitTransitionsMotion* motion,
+                          gint frame_number)
+{
 	FadeEffect * self;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
@@ -431,26 +449,32 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 435 "FadeEffect.c"
+#line 453 "FadeEffect.c"
 }
 
 
-static void fade_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+fade_effect_real_cancel (SpitTransitionsEffect* base)
+{
 	FadeEffect * self;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
-#line 443 "FadeEffect.c"
+#line 463 "FadeEffect.c"
 }
 
 
-static void fade_effect_class_init (FadeEffectClass * klass) {
+static void
+fade_effect_class_init (FadeEffectClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_parent_class = g_type_class_peek_parent (klass);
-#line 450 "FadeEffect.c"
+#line 472 "FadeEffect.c"
 }
 
 
-static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+fade_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -465,15 +489,19 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE
 	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel;
-#line 469 "FadeEffect.c"
+#line 493 "FadeEffect.c"
 }
 
 
-static void fade_effect_instance_init (FadeEffect * self) {
+static void
+fade_effect_instance_init (FadeEffect * self)
+{
 }
 
 
-GType fade_effect_get_type (void) {
+GType
+fade_effect_get_type (void)
+{
 	static volatile gsize fade_effect_type_id__volatile = 0;
 	if (g_once_init_enter (&fade_effect_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FadeEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fade_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FadeEffect), 0, (GInstanceInitFunc) fade_effect_instance_init, NULL };