Update upstream source from tag 'upstream/0.28.3'

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

1 files changed, 249 insertions, 251 deletions

diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c
index c1f5257..f8f3748 100644
--- a/plugins/shotwell-transitions/ClockEffect.c
+++ b/plugins/shotwell-transitions/ClockEffect.c
@@ -1,4 +1,4 @@
-/* ClockEffect.c generated by valac 0.36.6, the Vala compiler
+/* ClockEffect.c generated by valac 0.40.4, the Vala compiler
  * generated from ClockEffect.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>
@@ -42,6 +43,11 @@ typedef struct _ShotwellTransitionDescriptorPrivate ShotwellTransitionDescriptor
 typedef struct _ClockEffectDescriptor ClockEffectDescriptor;
 typedef struct _ClockEffectDescriptorClass ClockEffectDescriptorClass;
 typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate;
+enum  {
+	CLOCK_EFFECT_DESCRIPTOR_0_PROPERTY,
+	CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES
+};
+static GParamSpec* clock_effect_descriptor_properties[CLOCK_EFFECT_DESCRIPTOR_NUM_PROPERTIES];
 
 #define TYPE_CLOCK_EFFECT (clock_effect_get_type ())
 #define CLOCK_EFFECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLOCK_EFFECT, ClockEffect))
@@ -53,6 +59,11 @@ typedef struct _ClockEffectDescriptorPrivate ClockEffectDescriptorPrivate;
 typedef struct _ClockEffect ClockEffect;
 typedef struct _ClockEffectClass ClockEffectClass;
 typedef struct _ClockEffectPrivate ClockEffectPrivate;
+enum  {
+	CLOCK_EFFECT_0_PROPERTY,
+	CLOCK_EFFECT_NUM_PROPERTIES
+};
+static GParamSpec* clock_effect_properties[CLOCK_EFFECT_NUM_PROPERTIES];
 
 struct _ShotwellTransitionDescriptor {
 	GObject parent_instance;
@@ -91,55 +102,69 @@ static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
-enum  {
-	CLOCK_EFFECT_DESCRIPTOR_DUMMY_PROPERTY
-};
 ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory);
-ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory);
-ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type, GFile* resource_directory);
+ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type,
+                                                          GFile* resource_directory);
+ShotwellTransitionDescriptor* shotwell_transition_descriptor_construct (GType object_type,
+                                                                        GFile* resource_directory);
 static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base);
 static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base);
-static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host);
+static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                                            SpitHostInterface* host);
 ClockEffect* clock_effect_new (void);
 ClockEffect* clock_effect_construct (GType object_type);
 GType clock_effect_get_type (void) G_GNUC_CONST;
-enum  {
-	CLOCK_EFFECT_DUMMY_PROPERTY
-};
 #define CLOCK_EFFECT_DESIRED_FPS 25
 #define CLOCK_EFFECT_MIN_FPS 15
 #define CLOCK_EFFECT_TOP_RADIANT (0.5 * G_PI)
-static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps);
-static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion);
+static void clock_effect_real_get_fps (SpitTransitionsEffect* base,
+                                gint* desired_fps,
+                                gint* min_fps);
+static void clock_effect_real_start (SpitTransitionsEffect* base,
+                              SpitTransitionsVisuals* visuals,
+                              SpitTransitionsMotion* motion);
 static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base);
-static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number);
-static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number);
+static void clock_effect_real_paint (SpitTransitionsEffect* base,
+                              SpitTransitionsVisuals* visuals,
+                              SpitTransitionsMotion* motion,
+                              cairo_t* ctx,
+                              gint width,
+                              gint height,
+                              gint frame_number);
+static void clock_effect_real_advance (SpitTransitionsEffect* base,
+                                SpitTransitionsVisuals* visuals,
+                                SpitTransitionsMotion* motion,
+                                gint frame_number);
 static void clock_effect_real_cancel (SpitTransitionsEffect* base);
 
 
-ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
+ClockEffectDescriptor*
+clock_effect_descriptor_construct (GType object_type,
+                                   GFile* resource_directory)
+{
 	ClockEffectDescriptor * self = NULL;
-	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp0_ = resource_directory;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, _tmp0_);
+	self = (ClockEffectDescriptor*) shotwell_transition_descriptor_construct (object_type, resource_directory);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return self;
-#line 132 "ClockEffect.c"
+#line 153 "ClockEffect.c"
 }
 
 
-ClockEffectDescriptor* clock_effect_descriptor_new (GFile* resource_directory) {
+ClockEffectDescriptor*
+clock_effect_descriptor_new (GFile* resource_directory)
+{
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return clock_effect_descriptor_construct (TYPE_CLOCK_EFFECT_DESCRIPTOR, resource_directory);
-#line 139 "ClockEffect.c"
+#line 162 "ClockEffect.c"
 }
 
 
-static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base) {
+static const gchar*
+clock_effect_descriptor_real_get_id (ShotwellTransitionDescriptor* base)
+{
 	ClockEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -148,11 +173,13 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr
 	result = "org.yorba.shotwell.transitions.clock";
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 152 "ClockEffect.c"
+#line 177 "ClockEffect.c"
 }
 
 
-static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
+static const gchar*
+clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base)
+{
 	ClockEffectDescriptor * self;
 	const gchar* result = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -161,11 +188,14 @@ static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTra
 	result = _ ("Clock");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 165 "ClockEffect.c"
+#line 192 "ClockEffect.c"
 }
 
 
-static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
+static SpitTransitionsEffect*
+clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base,
+                                     SpitHostInterface* host)
+{
 	ClockEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
 	ClockEffect* _tmp0_;
@@ -179,11 +209,13 @@ static SpitTransitionsEffect* clock_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/ClockEffect.vala"
 	return result;
-#line 183 "ClockEffect.c"
+#line 213 "ClockEffect.c"
 }
 
 
-static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass) {
+static void
+clock_effect_descriptor_class_init (ClockEffectDescriptorClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -192,15 +224,19 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla
 	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create;
-#line 196 "ClockEffect.c"
+#line 228 "ClockEffect.c"
 }
 
 
-static void clock_effect_descriptor_instance_init (ClockEffectDescriptor * self) {
+static void
+clock_effect_descriptor_instance_init (ClockEffectDescriptor * self)
+{
 }
 
 
-GType clock_effect_descriptor_get_type (void) {
+GType
+clock_effect_descriptor_get_type (void)
+{
 	static volatile gsize clock_effect_descriptor_type_id__volatile = 0;
 	if (g_once_init_enter (&clock_effect_descriptor_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ClockEffectDescriptorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_descriptor_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffectDescriptor), 0, (GInstanceInitFunc) clock_effect_descriptor_instance_init, NULL };
@@ -212,24 +248,32 @@ GType clock_effect_descriptor_get_type (void) {
 }
 
 
-ClockEffect* clock_effect_construct (GType object_type) {
+ClockEffect*
+clock_effect_construct (GType object_type)
+{
 	ClockEffect * self = NULL;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = (ClockEffect*) g_object_new (object_type, NULL);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return self;
-#line 222 "ClockEffect.c"
+#line 260 "ClockEffect.c"
 }
 
 
-ClockEffect* clock_effect_new (void) {
+ClockEffect*
+clock_effect_new (void)
+{
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return clock_effect_construct (TYPE_CLOCK_EFFECT);
-#line 229 "ClockEffect.c"
+#line 269 "ClockEffect.c"
 }
 
 
-static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired_fps, gint* min_fps) {
+static void
+clock_effect_real_get_fps (SpitTransitionsEffect* base,
+                           gint* desired_fps,
+                           gint* min_fps)
+{
 	ClockEffect * self;
 	gint _vala_desired_fps = 0;
 	gint _vala_min_fps = 0;
@@ -243,18 +287,22 @@ static void clock_effect_real_get_fps (SpitTransitionsEffect* base, gint* desire
 	if (desired_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 247 "ClockEffect.c"
+#line 291 "ClockEffect.c"
 	}
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (min_fps) {
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 253 "ClockEffect.c"
+#line 297 "ClockEffect.c"
 	}
 }
 
 
-static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion) {
+static void
+clock_effect_real_start (SpitTransitionsEffect* base,
+                         SpitTransitionsVisuals* visuals,
+                         SpitTransitionsMotion* motion)
+{
 	ClockEffect * self;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
@@ -262,11 +310,13 @@ static void clock_effect_real_start (SpitTransitionsEffect* base, SpitTransition
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 266 "ClockEffect.c"
+#line 314 "ClockEffect.c"
 }
 
 
-static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect* base) {
+static gboolean
+clock_effect_real_needs_clear_background (SpitTransitionsEffect* base)
+{
 	ClockEffect * self;
 	gboolean result = FALSE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -275,37 +325,36 @@ static gboolean clock_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 279 "ClockEffect.c"
+#line 329 "ClockEffect.c"
 }
 
 
-static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
+static void
+clock_effect_real_paint (SpitTransitionsEffect* base,
+                         SpitTransitionsVisuals* visuals,
+                         SpitTransitionsMotion* motion,
+                         cairo_t* ctx,
+                         gint width,
+                         gint height,
+                         gint frame_number)
+{
 	ClockEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_;
-	gint _tmp1_;
-	gdouble _tmp2_;
 	gdouble start_angle = 0.0;
 	gdouble stop_angle = 0.0;
-	SpitTransitionsMotion* _tmp3_;
-	SpitTransitionsDirection _tmp4_;
-	SpitTransitionsDirection _tmp5_;
+	SpitTransitionsDirection _tmp0_;
+	SpitTransitionsDirection _tmp1_;
 	gint radius = 0;
-	SpitTransitionsVisuals* _tmp8_;
-	GdkRectangle _tmp9_ = {0};
-	GdkRectangle _tmp10_;
-	gint _tmp11_;
-	SpitTransitionsVisuals* _tmp12_;
-	GdkRectangle _tmp13_ = {0};
-	GdkRectangle _tmp14_;
-	gint _tmp15_;
-	gdouble _tmp16_;
-	SpitTransitionsVisuals* _tmp17_;
-	GdkPixbuf* _tmp18_;
-	GdkPixbuf* _tmp19_;
-	SpitTransitionsVisuals* _tmp34_;
-	GdkPixbuf* _tmp35_;
-	GdkPixbuf* _tmp36_;
+	GdkRectangle _tmp4_ = {0};
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_ = {0};
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp11_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -315,260 +364,199 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_if_fail (ctx != NULL);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp0_ = motion;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp1_ = frame_number;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp2_ = spit_transitions_motion_get_alpha (_tmp0_, _tmp1_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	alpha = _tmp2_;
+	alpha = spit_transitions_motion_get_alpha (motion, frame_number);
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	start_angle = -CLOCK_EFFECT_TOP_RADIANT;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	stop_angle = -CLOCK_EFFECT_TOP_RADIANT;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp3_ = motion;
+	_tmp0_ = spit_transitions_motion_get_direction (motion);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp4_ = spit_transitions_motion_get_direction (_tmp3_);
+	_tmp1_ = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp5_ = _tmp4_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 338 "ClockEffect.c"
-		gdouble _tmp6_;
+	if (_tmp1_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
+#line 379 "ClockEffect.c"
+		gdouble _tmp2_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp6_ = alpha;
+		_tmp2_ = alpha;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
-#line 344 "ClockEffect.c"
+		stop_angle = ((_tmp2_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
+#line 385 "ClockEffect.c"
 	} else {
-		gdouble _tmp7_;
+		gdouble _tmp3_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp7_ = alpha;
+		_tmp3_ = alpha;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
-#line 351 "ClockEffect.c"
+		start_angle = ((2 * (1 - _tmp3_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
+#line 392 "ClockEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp8_ = visuals;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	spit_transitions_visuals_get_to_pos (_tmp8_, &_tmp9_);
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp10_ = _tmp9_;
+	spit_transitions_visuals_get_to_pos (visuals, &_tmp4_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp11_ = _tmp10_.width;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp12_ = visuals;
+	_tmp5_ = _tmp4_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	spit_transitions_visuals_get_to_pos (_tmp12_, &_tmp13_);
+	_tmp6_ = _tmp5_.width;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp14_ = _tmp13_;
+	spit_transitions_visuals_get_to_pos (visuals, &_tmp7_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp15_ = _tmp14_.height;
+	_tmp8_ = _tmp7_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp16_ = fmax ((gdouble) _tmp11_, (gdouble) _tmp15_);
+	_tmp9_ = _tmp8_.height;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	radius = (gint) _tmp16_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp17_ = visuals;
+	radius = (gint) fmax ((gdouble) _tmp6_, (gdouble) _tmp9_);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp18_ = spit_transitions_visuals_get_from_pixbuf (_tmp17_);
+	_tmp10_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp19_ = _tmp18_;
+	_tmp11_ = _tmp10_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	if (_tmp19_ != NULL) {
-#line 381 "ClockEffect.c"
-		cairo_t* _tmp20_;
-		SpitTransitionsVisuals* _tmp21_;
-		GdkPixbuf* _tmp22_;
-		GdkPixbuf* _tmp23_;
-		SpitTransitionsVisuals* _tmp24_;
-		GdkRectangle _tmp25_ = {0};
-		GdkRectangle _tmp26_;
-		gint _tmp27_;
-		SpitTransitionsVisuals* _tmp28_;
-		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_;
-		gint _tmp31_;
-		cairo_t* _tmp32_;
-		gdouble _tmp33_;
+	if (_tmp11_ != NULL) {
+#line 414 "ClockEffect.c"
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		GdkRectangle _tmp14_ = {0};
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_ = {0};
+		GdkRectangle _tmp18_;
+		gint _tmp19_;
+		gdouble _tmp20_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp20_ = ctx;
+		_tmp12_ = spit_transitions_visuals_get_from_pixbuf (visuals);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp21_ = visuals;
+		_tmp13_ = _tmp12_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp22_ = spit_transitions_visuals_get_from_pixbuf (_tmp21_);
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp14_);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp23_ = _tmp22_;
+		_tmp15_ = _tmp14_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp24_ = visuals;
+		_tmp16_ = _tmp15_.x;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp24_, &_tmp25_);
+		spit_transitions_visuals_get_from_pos (visuals, &_tmp17_);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp26_ = _tmp25_;
+		_tmp18_ = _tmp17_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp27_ = _tmp26_.x;
+		_tmp19_ = _tmp18_.y;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp28_ = visuals;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_from_pos (_tmp28_, &_tmp29_);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp30_ = _tmp29_;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp31_ = _tmp30_.y;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp20_, _tmp23_, (gdouble) _tmp27_, (gdouble) _tmp31_);
+		gdk_cairo_set_source_pixbuf (ctx, _tmp13_, (gdouble) _tmp16_, (gdouble) _tmp19_);
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp32_ = ctx;
+		_tmp20_ = alpha;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp33_ = alpha;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_);
-#line 428 "ClockEffect.c"
+		cairo_paint_with_alpha (ctx, 1 - _tmp20_);
+#line 446 "ClockEffect.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp34_ = visuals;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp35_ = spit_transitions_visuals_get_to_pixbuf (_tmp34_);
+	_tmp21_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp36_ = _tmp35_;
+	_tmp22_ = _tmp21_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	if (_tmp36_ != NULL) {
-#line 438 "ClockEffect.c"
-		cairo_t* _tmp37_;
-		SpitTransitionsVisuals* _tmp38_;
-		GdkPixbuf* _tmp39_;
-		GdkPixbuf* _tmp40_;
-		SpitTransitionsVisuals* _tmp41_;
-		GdkRectangle _tmp42_ = {0};
-		GdkRectangle _tmp43_;
-		gint _tmp44_;
-		SpitTransitionsVisuals* _tmp45_;
-		GdkRectangle _tmp46_ = {0};
-		GdkRectangle _tmp47_;
-		gint _tmp48_;
+	if (_tmp22_ != NULL) {
+#line 454 "ClockEffect.c"
+		GdkPixbuf* _tmp23_;
+		GdkPixbuf* _tmp24_;
+		GdkRectangle _tmp25_ = {0};
+		GdkRectangle _tmp26_;
+		gint _tmp27_;
+		GdkRectangle _tmp28_ = {0};
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
 		gint x = 0;
-		SpitTransitionsVisuals* _tmp49_;
-		GdkRectangle _tmp50_ = {0};
-		GdkRectangle _tmp51_;
-		gint _tmp52_;
-		SpitTransitionsVisuals* _tmp53_;
-		GdkRectangle _tmp54_ = {0};
-		GdkRectangle _tmp55_;
-		gint _tmp56_;
+		GdkRectangle _tmp31_ = {0};
+		GdkRectangle _tmp32_;
+		gint _tmp33_;
+		GdkRectangle _tmp34_ = {0};
+		GdkRectangle _tmp35_;
+		gint _tmp36_;
 		gint y = 0;
-		SpitTransitionsVisuals* _tmp57_;
-		GdkRectangle _tmp58_ = {0};
-		GdkRectangle _tmp59_;
-		gint _tmp60_;
-		SpitTransitionsVisuals* _tmp61_;
-		GdkRectangle _tmp62_ = {0};
-		GdkRectangle _tmp63_;
-		gint _tmp64_;
-		cairo_t* _tmp65_;
-		gint _tmp66_;
-		gint _tmp67_;
-		cairo_t* _tmp68_;
-		gint _tmp69_;
-		gint _tmp70_;
-		gint _tmp71_;
-		gdouble _tmp72_;
-		gdouble _tmp73_;
-		cairo_t* _tmp74_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp37_ = ctx;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp38_ = visuals;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp39_ = spit_transitions_visuals_get_to_pixbuf (_tmp38_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp40_ = _tmp39_;
+		GdkRectangle _tmp37_ = {0};
+		GdkRectangle _tmp38_;
+		gint _tmp39_;
+		GdkRectangle _tmp40_ = {0};
+		GdkRectangle _tmp41_;
+		gint _tmp42_;
+		gint _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
+		gint _tmp46_;
+		gint _tmp47_;
+		gdouble _tmp48_;
+		gdouble _tmp49_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp41_ = visuals;
+		_tmp23_ = spit_transitions_visuals_get_to_pixbuf (visuals);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp41_, &_tmp42_);
+		_tmp24_ = _tmp23_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp43_ = _tmp42_;
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp25_);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp44_ = _tmp43_.x;
+		_tmp26_ = _tmp25_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp45_ = visuals;
+		_tmp27_ = _tmp26_.x;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp45_, &_tmp46_);
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp28_);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp47_ = _tmp46_;
+		_tmp29_ = _tmp28_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp48_ = _tmp47_.y;
+		_tmp30_ = _tmp29_.y;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		gdk_cairo_set_source_pixbuf (_tmp37_, _tmp40_, (gdouble) _tmp44_, (gdouble) _tmp48_);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp49_ = visuals;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp24_, (gdouble) _tmp27_, (gdouble) _tmp30_);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp49_, &_tmp50_);
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp31_);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp51_ = _tmp50_;
+		_tmp32_ = _tmp31_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp52_ = _tmp51_.x;
+		_tmp33_ = _tmp32_.x;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp53_ = visuals;
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp34_);
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp53_, &_tmp54_);
+		_tmp35_ = _tmp34_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp55_ = _tmp54_;
+		_tmp36_ = _tmp35_.width;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp56_ = _tmp55_.width;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		x = _tmp52_ + (((gint) _tmp56_) / 2);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp57_ = visuals;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp57_, &_tmp58_);
+		x = _tmp33_ + (((gint) _tmp36_) / 2);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp59_ = _tmp58_;
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp37_);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp60_ = _tmp59_.y;
+		_tmp38_ = _tmp37_;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp61_ = visuals;
+		_tmp39_ = _tmp38_.y;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		spit_transitions_visuals_get_to_pos (_tmp61_, &_tmp62_);
+		spit_transitions_visuals_get_to_pos (visuals, &_tmp40_);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp63_ = _tmp62_;
+		_tmp41_ = _tmp40_;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp64_ = _tmp63_.height;
+		_tmp42_ = _tmp41_.height;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		y = _tmp60_ + (((gint) _tmp64_) / 2);
+		y = _tmp39_ + (((gint) _tmp42_) / 2);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp65_ = ctx;
+		_tmp43_ = x;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp66_ = x;
+		_tmp44_ = y;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp67_ = y;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		cairo_move_to (_tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp68_ = ctx;
+		cairo_move_to (ctx, (gdouble) _tmp43_, (gdouble) _tmp44_);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp69_ = x;
+		_tmp45_ = x;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp70_ = y;
+		_tmp46_ = y;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp71_ = radius;
+		_tmp47_ = radius;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp72_ = start_angle;
+		_tmp48_ = start_angle;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp73_ = stop_angle;
+		_tmp49_ = stop_angle;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		cairo_arc (_tmp68_, (gdouble) _tmp69_, (gdouble) _tmp70_, (gdouble) _tmp71_, _tmp72_, _tmp73_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		_tmp74_ = ctx;
+		cairo_arc (ctx, (gdouble) _tmp45_, (gdouble) _tmp46_, (gdouble) _tmp47_, _tmp48_, _tmp49_);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-		cairo_fill_preserve (_tmp74_);
-#line 567 "ClockEffect.c"
+		cairo_fill_preserve (ctx);
+#line 550 "ClockEffect.c"
 	}
 }
 
 
-static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, gint frame_number) {
+static void
+clock_effect_real_advance (SpitTransitionsEffect* base,
+                           SpitTransitionsVisuals* visuals,
+                           SpitTransitionsMotion* motion,
+                           gint frame_number)
+{
 	ClockEffect * self;
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
@@ -576,26 +564,32 @@ static void clock_effect_real_advance (SpitTransitionsEffect* base, SpitTransiti
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 580 "ClockEffect.c"
+#line 568 "ClockEffect.c"
 }
 
 
-static void clock_effect_real_cancel (SpitTransitionsEffect* base) {
+static void
+clock_effect_real_cancel (SpitTransitionsEffect* base)
+{
 	ClockEffect * self;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT, ClockEffect);
-#line 588 "ClockEffect.c"
+#line 578 "ClockEffect.c"
 }
 
 
-static void clock_effect_class_init (ClockEffectClass * klass) {
+static void
+clock_effect_class_init (ClockEffectClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_parent_class = g_type_class_peek_parent (klass);
-#line 595 "ClockEffect.c"
+#line 587 "ClockEffect.c"
 }
 
 
-static void clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface) {
+static void
+clock_effect_spit_transitions_effect_interface_init (SpitTransitionsEffectIface * iface)
+{
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	clock_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -610,15 +604,19 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions
 	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel;
-#line 614 "ClockEffect.c"
+#line 608 "ClockEffect.c"
 }
 
 
-static void clock_effect_instance_init (ClockEffect * self) {
+static void
+clock_effect_instance_init (ClockEffect * self)
+{
 }
 
 
-GType clock_effect_get_type (void) {
+GType
+clock_effect_get_type (void)
+{
 	static volatile gsize clock_effect_type_id__volatile = 0;
 	if (g_once_init_enter (&clock_effect_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ClockEffectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) clock_effect_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ClockEffect), 0, (GInstanceInitFunc) clock_effect_instance_init, NULL };