Merge branch 'feature/upstream' into develop

1 files changed, 99 insertions, 102 deletions

diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c
index 8f5ed37..c1f5257 100644
--- a/plugins/shotwell-transitions/ClockEffect.c
+++ b/plugins/shotwell-transitions/ClockEffect.c
@@ -1,4 +1,4 @@
-/* ClockEffect.c generated by valac 0.34.7, the Vala compiler
+/* ClockEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from ClockEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -87,7 +87,7 @@ struct _ClockEffectClass {
 
 static gpointer clock_effect_descriptor_parent_class = NULL;
 static gpointer clock_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* clock_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * clock_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType clock_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -119,7 +119,7 @@ static void clock_effect_real_cancel (SpitTransitionsEffect* base);
 
 ClockEffectDescriptor* clock_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	ClockEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = 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"
@@ -155,23 +155,20 @@ static const gchar* clock_effect_descriptor_real_get_id (ShotwellTransitionDescr
 static const gchar* clock_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	ClockEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	_tmp0_ = _ ("Clock");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	result = _tmp0_;
+	result = _ ("Clock");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return result;
-#line 168 "ClockEffect.c"
+#line 165 "ClockEffect.c"
 }
 
 
 static SpitTransitionsEffect* clock_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	ClockEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	ClockEffect* _tmp0_ = NULL;
+	ClockEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CLOCK_EFFECT_DESCRIPTOR, ClockEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -182,7 +179,7 @@ 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 186 "ClockEffect.c"
+#line 183 "ClockEffect.c"
 }
 
 
@@ -190,12 +187,12 @@ static void clock_effect_descriptor_class_init (ClockEffectDescriptorClass * kla
 #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"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) clock_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) clock_effect_descriptor_real_get_pluggable_name;
+	((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 199 "ClockEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) clock_effect_descriptor_real_create;
+#line 196 "ClockEffect.c"
 }
 
 
@@ -221,14 +218,14 @@ ClockEffect* clock_effect_construct (GType object_type) {
 	self = (ClockEffect*) g_object_new (object_type, NULL);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return self;
-#line 225 "ClockEffect.c"
+#line 222 "ClockEffect.c"
 }
 
 
 ClockEffect* clock_effect_new (void) {
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	return clock_effect_construct (TYPE_CLOCK_EFFECT);
-#line 232 "ClockEffect.c"
+#line 229 "ClockEffect.c"
 }
 
 
@@ -246,13 +243,13 @@ 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 250 "ClockEffect.c"
+#line 247 "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 256 "ClockEffect.c"
+#line 253 "ClockEffect.c"
 	}
 }
 
@@ -265,7 +262,7 @@ 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 269 "ClockEffect.c"
+#line 266 "ClockEffect.c"
 }
 
 
@@ -278,37 +275,37 @@ 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 282 "ClockEffect.c"
+#line 279 "ClockEffect.c"
 }
 
 
 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_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gdouble start_angle = 0.0;
 	gdouble stop_angle = 0.0;
-	SpitTransitionsMotion* _tmp3_ = NULL;
-	SpitTransitionsDirection _tmp4_ = 0;
-	SpitTransitionsDirection _tmp5_ = 0;
+	SpitTransitionsMotion* _tmp3_;
+	SpitTransitionsDirection _tmp4_;
+	SpitTransitionsDirection _tmp5_;
 	gint radius = 0;
-	SpitTransitionsVisuals* _tmp8_ = NULL;
+	SpitTransitionsVisuals* _tmp8_;
 	GdkRectangle _tmp9_ = {0};
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	SpitTransitionsVisuals* _tmp12_ = NULL;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	SpitTransitionsVisuals* _tmp12_;
 	GdkRectangle _tmp13_ = {0};
-	GdkRectangle _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gdouble _tmp16_ = 0.0;
-	SpitTransitionsVisuals* _tmp17_ = NULL;
-	GdkPixbuf* _tmp18_ = NULL;
-	GdkPixbuf* _tmp19_ = NULL;
-	SpitTransitionsVisuals* _tmp34_ = NULL;
-	GdkPixbuf* _tmp35_ = NULL;
-	GdkPixbuf* _tmp36_ = NULL;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	gdouble _tmp16_;
+	SpitTransitionsVisuals* _tmp17_;
+	GdkPixbuf* _tmp18_;
+	GdkPixbuf* _tmp19_;
+	SpitTransitionsVisuals* _tmp34_;
+	GdkPixbuf* _tmp35_;
+	GdkPixbuf* _tmp36_;
 #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"
@@ -337,20 +334,20 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp5_ = _tmp4_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp5_ == SPIT_TRANSITIONS_DIRECTION_FORWARD) {
-#line 341 "ClockEffect.c"
-		gdouble _tmp6_ = 0.0;
+#line 338 "ClockEffect.c"
+		gdouble _tmp6_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp6_ = alpha;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		stop_angle = ((_tmp6_ * G_PI) * 2) - CLOCK_EFFECT_TOP_RADIANT;
-#line 347 "ClockEffect.c"
+#line 344 "ClockEffect.c"
 	} else {
-		gdouble _tmp7_ = 0.0;
+		gdouble _tmp7_;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp7_ = alpha;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		start_angle = ((2 * (1 - _tmp7_)) * G_PI) - CLOCK_EFFECT_TOP_RADIANT;
-#line 354 "ClockEffect.c"
+#line 351 "ClockEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	_tmp8_ = visuals;
@@ -380,21 +377,21 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp19_ = _tmp18_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp19_ != NULL) {
-#line 384 "ClockEffect.c"
-		cairo_t* _tmp20_ = NULL;
-		SpitTransitionsVisuals* _tmp21_ = NULL;
-		GdkPixbuf* _tmp22_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
+#line 381 "ClockEffect.c"
+		cairo_t* _tmp20_;
+		SpitTransitionsVisuals* _tmp21_;
+		GdkPixbuf* _tmp22_;
+		GdkPixbuf* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
 		GdkRectangle _tmp25_ = {0};
-		GdkRectangle _tmp26_ = {0};
-		gint _tmp27_ = 0;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
+		GdkRectangle _tmp26_;
+		gint _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
 		GdkRectangle _tmp29_ = {0};
-		GdkRectangle _tmp30_ = {0};
-		gint _tmp31_ = 0;
-		cairo_t* _tmp32_ = NULL;
-		gdouble _tmp33_ = 0.0;
+		GdkRectangle _tmp30_;
+		gint _tmp31_;
+		cairo_t* _tmp32_;
+		gdouble _tmp33_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		_tmp20_ = ctx;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
@@ -427,7 +424,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp33_ = alpha;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		cairo_paint_with_alpha (_tmp32_, 1 - _tmp33_);
-#line 431 "ClockEffect.c"
+#line 428 "ClockEffect.c"
 	}
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	_tmp34_ = visuals;
@@ -437,47 +434,47 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 	_tmp36_ = _tmp35_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 	if (_tmp36_ != NULL) {
-#line 441 "ClockEffect.c"
-		cairo_t* _tmp37_ = NULL;
-		SpitTransitionsVisuals* _tmp38_ = NULL;
-		GdkPixbuf* _tmp39_ = NULL;
-		GdkPixbuf* _tmp40_ = NULL;
-		SpitTransitionsVisuals* _tmp41_ = NULL;
+#line 438 "ClockEffect.c"
+		cairo_t* _tmp37_;
+		SpitTransitionsVisuals* _tmp38_;
+		GdkPixbuf* _tmp39_;
+		GdkPixbuf* _tmp40_;
+		SpitTransitionsVisuals* _tmp41_;
 		GdkRectangle _tmp42_ = {0};
-		GdkRectangle _tmp43_ = {0};
-		gint _tmp44_ = 0;
-		SpitTransitionsVisuals* _tmp45_ = NULL;
+		GdkRectangle _tmp43_;
+		gint _tmp44_;
+		SpitTransitionsVisuals* _tmp45_;
 		GdkRectangle _tmp46_ = {0};
-		GdkRectangle _tmp47_ = {0};
-		gint _tmp48_ = 0;
+		GdkRectangle _tmp47_;
+		gint _tmp48_;
 		gint x = 0;
-		SpitTransitionsVisuals* _tmp49_ = NULL;
+		SpitTransitionsVisuals* _tmp49_;
 		GdkRectangle _tmp50_ = {0};
-		GdkRectangle _tmp51_ = {0};
-		gint _tmp52_ = 0;
-		SpitTransitionsVisuals* _tmp53_ = NULL;
+		GdkRectangle _tmp51_;
+		gint _tmp52_;
+		SpitTransitionsVisuals* _tmp53_;
 		GdkRectangle _tmp54_ = {0};
-		GdkRectangle _tmp55_ = {0};
-		gint _tmp56_ = 0;
+		GdkRectangle _tmp55_;
+		gint _tmp56_;
 		gint y = 0;
-		SpitTransitionsVisuals* _tmp57_ = NULL;
+		SpitTransitionsVisuals* _tmp57_;
 		GdkRectangle _tmp58_ = {0};
-		GdkRectangle _tmp59_ = {0};
-		gint _tmp60_ = 0;
-		SpitTransitionsVisuals* _tmp61_ = NULL;
+		GdkRectangle _tmp59_;
+		gint _tmp60_;
+		SpitTransitionsVisuals* _tmp61_;
 		GdkRectangle _tmp62_ = {0};
-		GdkRectangle _tmp63_ = {0};
-		gint _tmp64_ = 0;
-		cairo_t* _tmp65_ = NULL;
-		gint _tmp66_ = 0;
-		gint _tmp67_ = 0;
-		cairo_t* _tmp68_ = NULL;
-		gint _tmp69_ = 0;
-		gint _tmp70_ = 0;
-		gint _tmp71_ = 0;
-		gdouble _tmp72_ = 0.0;
-		gdouble _tmp73_ = 0.0;
-		cairo_t* _tmp74_ = NULL;
+		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"
@@ -566,7 +563,7 @@ static void clock_effect_real_paint (SpitTransitionsEffect* base, SpitTransition
 		_tmp74_ = ctx;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
 		cairo_fill_preserve (_tmp74_);
-#line 570 "ClockEffect.c"
+#line 567 "ClockEffect.c"
 	}
 }
 
@@ -579,7 +576,7 @@ 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 583 "ClockEffect.c"
+#line 580 "ClockEffect.c"
 }
 
 
@@ -587,14 +584,14 @@ 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 591 "ClockEffect.c"
+#line 588 "ClockEffect.c"
 }
 
 
 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 598 "ClockEffect.c"
+#line 595 "ClockEffect.c"
 }
 
 
@@ -602,18 +599,18 @@ static void clock_effect_spit_transitions_effect_interface_init (SpitTransitions
 #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"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) clock_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) clock_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) clock_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) clock_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) clock_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) clock_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/ClockEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) clock_effect_real_advance;
+	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 617 "ClockEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) clock_effect_real_cancel;
+#line 614 "ClockEffect.c"
 }