Update upstream source from tag 'upstream/0.28.3'

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

1 files changed, 237 insertions, 231 deletions

diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c
index 7cc87e7..f516265 100644
--- a/plugins/shotwell-transitions/SlideEffect.c
+++ b/plugins/shotwell-transitions/SlideEffect.c
@@ -1,4 +1,4 @@
-/* SlideEffect.c generated by valac 0.36.6, the Vala compiler
+/* SlideEffect.c generated by valac 0.40.4, the Vala compiler
  * generated from SlideEffect.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 _SlideEffectDescriptor SlideEffectDescriptor;
 typedef struct _SlideEffectDescriptorClass SlideEffectDescriptorClass;
 typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate;
+enum  {
+	SLIDE_EFFECT_DESCRIPTOR_0_PROPERTY,
+	SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* slide_effect_descriptor_properties[SLIDE_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
 
 #define TYPE_SLIDE_EFFECT (slide_effect_get_type ())
 #define SLIDE_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SLIDE_EFFECT, SlideEffect))
@@ -54,6 +60,11 @@ typedef struct _SlideEffectDescriptorPrivate SlideEffectDescriptorPrivate;
 typedef struct _SlideEffect SlideEffect;
 typedef struct _SlideEffectClass SlideEffectClass;
 typedef struct _SlideEffectPrivate SlideEffectPrivate;
+enum  {
+	SLIDE_EFFECT_0_PROPERTY,
+	SLIDE_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* slide_effect_properties[SLIDE_EFFECT_NUM_PROPERTIES];
 
 struct _ShotwellTransitionDescriptor {
 	GObject parent_instance;
@@ -92,54 +103,68 @@ static SpitTransitionsEffectIface * slide_effect_spit_transitions_effect_parent_
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType slide_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum  {
-	SLIDE_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
 SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory);
-SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type,
+                                                          GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+                                                                        GFile* resource_directory);
 static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
 static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                                            SpitHostInterface* host);
 SlideEffect* slide_effect_new (void);
 SlideEffect* slide_effect_construct (GType object_type);
 GType slide_effect_get_type (void) G_GNUC_CONST;
-enum  {
-	SLIDE_EFFECT_DUMMY_PROPERTY
-};
 #define SLIDE_EFFECT_DESIRED_FPS 25
 #define SLIDE_EFFECT_MIN_FPS 15
-static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void slide_effect_real_get_fps (SpitTransitionsEffect* base,
+                                gint* desired_fps,
+                                gint* min_fps);
+static void slide_effect_real_start (SpitTransitionsEffect* base,
+                              SpitTransitionsVisuals* visuals,
+                              SpitTransitionsMotion* motion);
 static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void slide_effect_real_paint (SpitTransitionsEffect* base,
+                              SpitTransitionsVisuals* visuals,
+                              SpitTransitionsMotion* motion,
+                              cairo_t* ctx,
+                              gint width,
+                              gint height,
+                              gint frame_number);
+static void slide_effect_real_advance (SpitTransitionsEffect* base,
+                                SpitTransitionsVisuals* visuals,
+                                SpitTransitionsMotion* motion,
+                                gint frame_number);
 static void slide_effect_real_cancel (SpitTransitionsEffect* base);
 
 
-SlideEffectDescriptor* slide_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+SlideEffectDescriptor*
+slide_effect_descriptor_construct (GType object_type,
+                                   GFile* resource_directory)
+{
 	SlideEffectDescriptor * self = NULL;
-	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+	self = (SlideEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return self;
-#line 132 "SlideEffect.c"
+#line 153 "SlideEffect.c"
 }
 
 
-SlideEffectDescriptor* slide_effect_descriptor_new (GFile* resource_directory) {
+SlideEffectDescriptor*
+slide_effect_descriptor_new (GFile* resource_directory)
+{
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return slide_effect_descriptor_construct (TYPE_SLIDE_EFFECT_DESCRIPTOR, resource_directory);
-#line 139 "SlideEffect.c"
+#line 162 "SlideEffect.c"
 }
 
 
-static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+slide_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
 	SlideEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -148,11 +173,13 @@ static const gchar* slide_effect_descriptor_real_get_id (ShotwellTransitionDescr
 	result = "org.yorba.shotwell.transitions.slide";
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 152 "SlideEffect.c"
+#line 177 "SlideEffect.c"
 }
 
 
-static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+slide_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
 	SlideEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -161,11 +188,14 @@ static const gchar* slide_effect_descriptor_real_get_pluggable_name (ShotwellTra
 	result = _ ("Slide");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 165 "SlideEffect.c"
+#line 192 "SlideEffect.c"
 }
 
 
-static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+slide_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                     SpitHostInterface* host)
+{
 	SlideEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
 	SlideEffect* _tmp0_;
@@ -179,11 +209,13 @@ static SpitTransitionsEffect* slide_effect_descriptor_real_create (ShotwellTrans
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 183 "SlideEffect.c"
+#line 213 "SlideEffect.c"
 }
 
 
-static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass) {
+static void
+slide_effect_descriptor_class_init (SlideEffectDescriptorClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -192,15 +224,19 @@ static void slide_effect_descriptor_class_init (SlideEffectDescriptorClass * kla
 	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) slide_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) slide_effect_descriptor_real_create;
-#line 196 "SlideEffect.c"
+#line 228 "SlideEffect.c"
 }
 
 
-static void slide_effect_descriptor_instance_init (SlideEffectDescriptor * self) {
+static void
+slide_effect_descriptor_instance_init (SlideEffectDescriptor * self)
+{
 }
 
 
-GType slide_effect_descriptor_get_type (void) {
+GType
+slide_effect_descriptor_get_type (void)
+{
 	static volatile gsize slide_effect_descriptor_type_id__volatile = 0;
 	if (g_once_init_enter (&slide_effect_descriptor_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SlideEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffectDescriptor), 0, (GInstanceInitFunc) slide_effect_descriptor_instance_init, NULL };
@@ -212,24 +248,32 @@ GType slide_effect_descriptor_get_type (void) {
 }
 
 
-SlideEffect* slide_effect_construct (GType object_type) {
+SlideEffect*
+slide_effect_construct (GType object_type)
+{
 	SlideEffect * self = NULL;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = (SlideEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return self;
-#line 222 "SlideEffect.c"
+#line 260 "SlideEffect.c"
 }
 
 
-SlideEffect* slide_effect_new (void) {
+SlideEffect*
+slide_effect_new (void)
+{
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return slide_effect_construct (TYPE_SLIDE_EFFECT);
-#line 229 "SlideEffect.c"
+#line 269 "SlideEffect.c"
 }
 
 
-static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+slide_effect_real_get_fps (SpitTransitionsEffect* base,
+                           gint* desired_fps,
+                           gint* min_fps)
+{
 	SlideEffect * self;
 	gint _vala_desired_fps = 0;
 	gint _vala_min_fps = 0;
@@ -243,18 +287,22 @@ static void slide_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 247 "SlideEffect.c"
+#line 291 "SlideEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 253 "SlideEffect.c"
+#line 297 "SlideEffect.c"
 	}
 }
 
 
-static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+slide_effect_real_start (SpitTransitionsEffect* base,
+                         SpitTransitionsVisuals* visuals,
+                         SpitTransitionsMotion* motion)
+{
 	SlideEffect * self;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
@@ -262,11 +310,13 @@ static void slide_effect_real_start (SpitTransitionsEffect* base, SpitTransition
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 266 "SlideEffect.c"
+#line 314 "SlideEffect.c"
 }
 
 
-static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+slide_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
 	SlideEffect * self;
 	gboolean result = FALSE;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -275,22 +325,25 @@ static gboolean slide_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	return result;
-#line 279 "SlideEffect.c"
+#line 329 "SlideEffect.c"
 }
 
 
-static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+slide_effect_real_paint (SpitTransitionsEffect* base,
+                         SpitTransitionsVisuals* visuals,
+                         SpitTransitionsMotion* motion,
+                         cairo_t* ctx,
+                         gint width,
+                         gint height,
+                         gint frame_number)
+{
 	SlideEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_;
-	gint _tmp1_;
-	gdouble _tmp2_;
-	SpitTransitionsVisuals* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkPixbuf* _tmp5_;
-	SpitTransitionsVisuals* _tmp33_;
-	GdkPixbuf* _tmp34_;
-	GdkPixbuf* _tmp35_;
+	GdkPixbuf* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -300,251 +353,194 @@ static void slide_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_if_fail (ctx != NULL);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp0_ = motion;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp1_ = frame_number;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	alpha = _tmp2_;
+	alpha = spit_transitions_motion_get_alpha (motion, frame_number);
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp3_ = visuals;
+	_tmp0_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp4_ = spit_transitions_visuals_get_from_pixbuf (_tmp3_);
+	_tmp1_ = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp5_ = _tmp4_;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	if (_tmp5_ != NULL) {
-#line 319 "SlideEffect.c"
-		gint _tmp6_ = 0;
-		SpitTransitionsMotion* _tmp7_;
-		SpitTransitionsDirection _tmp8_;
-		SpitTransitionsDirection _tmp9_;
+	if (_tmp1_ != NULL) {
+#line 364 "SlideEffect.c"
+		gint _tmp2_ = 0;
+		SpitTransitionsDirection _tmp3_;
+		SpitTransitionsDirection _tmp4_;
 		gint from_target_x = 0;
 		gint from_current_x = 0;
-		SpitTransitionsVisuals* _tmp16_;
-		GdkRectangle _tmp17_ = {0};
-		GdkRectangle _tmp18_;
-		gint _tmp19_;
-		gdouble _tmp20_;
-		gint _tmp21_;
-		gdouble _tmp22_;
-		cairo_t* _tmp23_;
-		SpitTransitionsVisuals* _tmp24_;
-		GdkPixbuf* _tmp25_;
-		GdkPixbuf* _tmp26_;
-		gint _tmp27_;
-		SpitTransitionsVisuals* _tmp28_;
-		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_;
-		gint _tmp31_;
-		cairo_t* _tmp32_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp7_ = motion;
+		GdkRectangle _tmp9_ = {0};
+		GdkRectangle _tmp10_;
+		gint _tmp11_;
+		gdouble _tmp12_;
+		gint _tmp13_;
+		gdouble _tmp14_;
+		GdkPixbuf* _tmp15_;
+		GdkPixbuf* _tmp16_;
+		gint _tmp17_;
+		GdkRectangle _tmp18_ = {0};
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp8_ = spit_transitions_motion_get_direction (_tmp7_);
+		_tmp3_ = spit_transitions_motion_get_direction (motion);
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp9_ = _tmp8_;
+		_tmp4_ = _tmp3_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		if (_tmp9_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 351 "SlideEffect.c"
-			SpitTransitionsVisuals* _tmp10_;
-			GdkPixbuf* _tmp11_;
-			GdkPixbuf* _tmp12_;
-			gint _tmp13_;
-			gint _tmp14_;
+		if (_tmp4_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
+#line 388 "SlideEffect.c"
+			GdkPixbuf* _tmp5_;
+			GdkPixbuf* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp10_ = visuals;
+			_tmp5_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp11_ = spit_transitions_visuals_get_from_pixbuf (_tmp10_);
+			_tmp6_ = _tmp5_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp12_ = _tmp11_;
+			_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp13_ = gdk_pixbuf_get_width (_tmp12_);
+			_tmp8_ = _tmp7_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp14_ = _tmp13_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp6_ = -_tmp14_;
-#line 369 "SlideEffect.c"
+			_tmp2_ = -_tmp8_;
+#line 403 "SlideEffect.c"
 		} else {
-			gint _tmp15_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp15_ = width;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp6_ = _tmp15_;
-#line 376 "SlideEffect.c"
+			_tmp2_ = width;
+#line 407 "SlideEffect.c"
 		}
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		from_target_x = _tmp6_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp16_ = visuals;
+		from_target_x = _tmp2_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp16_, &_tmp17_);
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp9_);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp18_ = _tmp17_;
+		_tmp10_ = _tmp9_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp19_ = _tmp18_.x;
+		_tmp11_ = _tmp10_.x;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp20_ = alpha;
+		_tmp12_ = alpha;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp21_ = from_target_x;
+		_tmp13_ = from_target_x;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp22_ = alpha;
+		_tmp14_ = alpha;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		from_current_x = (gint) ((_tmp19_ * (1 - _tmp20_)) + (_tmp21_ * _tmp22_));
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp23_ = ctx;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp24_ = visuals;
+		from_current_x = (gint) ((_tmp11_ * (1 - _tmp12_)) + (_tmp13_ * _tmp14_));
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp25_ = spit_transitions_visuals_get_from_pixbuf (_tmp24_);
+		_tmp15_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp26_ = _tmp25_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp27_ = from_current_x;
+		_tmp16_ = _tmp15_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp28_ = visuals;
+		_tmp17_ = from_current_x;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_);
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp18_);
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp30_ = _tmp29_;
+		_tmp19_ = _tmp18_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp31_ = _tmp30_.y;
+		_tmp20_ = _tmp19_.y;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp23_, _tmp26_, (gdouble) _tmp27_, (gdouble) _tmp31_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp32_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp16_, (gdouble) _tmp17_, (gdouble) _tmp20_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		cairo_paint (_tmp32_);
-#line 420 "SlideEffect.c"
+		cairo_paint (ctx);
+#line 441 "SlideEffect.c"
 	}
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp33_ = visuals;
+	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp34_ = spit_transitions_visuals_get_to_pixbuf (_tmp33_);
+	_tmp22_ = _tmp21_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	_tmp35_ = _tmp34_;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-	if (_tmp35_ != NULL) {
-#line 430 "SlideEffect.c"
+	if (_tmp22_ != NULL) {
+#line 449 "SlideEffect.c"
 		gint to_target_x = 0;
+		GdkPixbuf* _tmp23_;
+		GdkPixbuf* _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_ = 0;
+		SpitTransitionsDirection _tmp28_;
+		SpitTransitionsDirection _tmp29_;
+		gint from_x = 0;
+		gint to_current_x = 0;
+		gint _tmp34_;
+		gdouble _tmp35_;
 		gint _tmp36_;
-		SpitTransitionsVisuals* _tmp37_;
+		gdouble _tmp37_;
 		GdkPixbuf* _tmp38_;
 		GdkPixbuf* _tmp39_;
 		gint _tmp40_;
-		gint _tmp41_;
-		gint _tmp42_ = 0;
-		SpitTransitionsMotion* _tmp43_;
-		SpitTransitionsDirection _tmp44_;
-		SpitTransitionsDirection _tmp45_;
-		gint from_x = 0;
-		gint to_current_x = 0;
-		gint _tmp52_;
-		gdouble _tmp53_;
-		gint _tmp54_;
-		gdouble _tmp55_;
-		cairo_t* _tmp56_;
-		SpitTransitionsVisuals* _tmp57_;
-		GdkPixbuf* _tmp58_;
-		GdkPixbuf* _tmp59_;
-		gint _tmp60_;
-		SpitTransitionsVisuals* _tmp61_;
-		GdkRectangle _tmp62_ = {0};
-		GdkRectangle _tmp63_;
-		gint _tmp64_;
-		cairo_t* _tmp65_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp36_ = width;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp37_ = visuals;
+		GdkRectangle _tmp41_ = {0};
+		GdkRectangle _tmp42_;
+		gint _tmp43_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (_tmp37_);
+		_tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp39_ = _tmp38_;
+		_tmp24_ = _tmp23_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp40_ = gdk_pixbuf_get_width (_tmp39_);
+		_tmp25_ = gdk_pixbuf_get_width (_tmp24_);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp41_ = _tmp40_;
+		_tmp26_ = _tmp25_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		to_target_x = (_tmp36_ - _tmp41_) / 2;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp43_ = motion;
+		to_target_x = (width - _tmp26_) / 2;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp44_ = spit_transitions_motion_get_direction (_tmp43_);
+		_tmp28_ = spit_transitions_motion_get_direction (motion);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp45_ = _tmp44_;
+		_tmp29_ = _tmp28_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		if (_tmp45_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 480 "SlideEffect.c"
-			gint _tmp46_;
+		if (_tmp29_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp46_ = width;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp42_ = _tmp46_;
-#line 486 "SlideEffect.c"
+			_tmp27_ = width;
+#line 488 "SlideEffect.c"
 		} else {
-			SpitTransitionsVisuals* _tmp47_;
-			GdkPixbuf* _tmp48_;
-			GdkPixbuf* _tmp49_;
-			gint _tmp50_;
-			gint _tmp51_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp47_ = visuals;
+			GdkPixbuf* _tmp30_;
+			GdkPixbuf* _tmp31_;
+			gint _tmp32_;
+			gint _tmp33_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp48_ = spit_transitions_visuals_get_to_pixbuf (_tmp47_);
+			_tmp30_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp49_ = _tmp48_;
+			_tmp31_ = _tmp30_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp50_ = gdk_pixbuf_get_width (_tmp49_);
+			_tmp32_ = gdk_pixbuf_get_width (_tmp31_);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp51_ = _tmp50_;
+			_tmp33_ = _tmp32_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-			_tmp42_ = -_tmp51_;
-#line 505 "SlideEffect.c"
+			_tmp27_ = -_tmp33_;
+#line 504 "SlideEffect.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		from_x = _tmp42_;
+		from_x = _tmp27_;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp52_ = from_x;
+		_tmp34_ = from_x;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp53_ = alpha;
+		_tmp35_ = alpha;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp54_ = to_target_x;
+		_tmp36_ = to_target_x;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp55_ = alpha;
+		_tmp37_ = alpha;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		to_current_x = (gint) ((_tmp52_ * (1 - _tmp53_)) + (_tmp54_ * _tmp55_));
+		to_current_x = (gint) ((_tmp34_ * (1 - _tmp35_)) + (_tmp36_ * _tmp37_));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp56_ = ctx;
+		_tmp38_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp57_ = visuals;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp58_ = spit_transitions_visuals_get_to_pixbuf (_tmp57_);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp59_ = _tmp58_;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp60_ = to_current_x;
+		_tmp39_ = _tmp38_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp61_ = visuals;
+		_tmp40_ = to_current_x;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_);
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp41_);
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp63_ = _tmp62_;
+		_tmp42_ = _tmp41_;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp64_ = _tmp63_.y;
+		_tmp43_ = _tmp42_.y;
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp56_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp64_);
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		_tmp65_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp43_);
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
-		cairo_paint (_tmp65_);
-#line 543 "SlideEffect.c"
+		cairo_paint (ctx);
+#line 534 "SlideEffect.c"
 	}
 }
 
 
-static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+slide_effect_real_advance (SpitTransitionsEffect* base,
+                           SpitTransitionsVisuals* visuals,
+                           SpitTransitionsMotion* motion,
+                           gint frame_number)
+{
 	SlideEffect * self;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
@@ -552,26 +548,32 @@ static void slide_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 556 "SlideEffect.c"
+#line 552 "SlideEffect.c"
 }
 
 
-static void slide_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+slide_effect_real_cancel (SpitTransitionsEffect* base)
+{
 	SlideEffect * self;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDE_EFFECT, SlideEffect);
-#line 564 "SlideEffect.c"
+#line 562 "SlideEffect.c"
 }
 
 
-static void slide_effect_class_init (SlideEffectClass * klass) {
+static void
+slide_effect_class_init (SlideEffectClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_parent_class = g_type_class_peek_parent (klass);
 #line 571 "SlideEffect.c"
 }
 
 
-static void slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+slide_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	slide_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
@@ -586,15 +588,19 @@ static void slide_effect_spit_transitions_effect_interface_init (SpitTransitions
 	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) slide_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/SlideEffect.vala"
 	iface->cancel = (void (*) (SpitTransitionsEffect *)) slide_effect_real_cancel;
-#line 590 "SlideEffect.c"
+#line 592 "SlideEffect.c"
 }
 
 
-static void slide_effect_instance_init (SlideEffect * self) {
+static void
+slide_effect_instance_init (SlideEffect * self)
+{
 }
 
 
-GType slide_effect_get_type (void) {
+GType
+slide_effect_get_type (void)
+{
 	static volatile gsize slide_effect_type_id__volatile = 0;
 	if (g_once_init_enter (&slide_effect_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SlideEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) slide_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SlideEffect), 0, (GInstanceInitFunc) slide_effect_instance_init, NULL };