Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 72 insertions, 75 deletions

diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c
index 41871a7..97680cb 100644
--- a/plugins/shotwell-transitions/CircleEffect.c
+++ b/plugins/shotwell-transitions/CircleEffect.c
@@ -1,4 +1,4 @@
-/* CircleEffect.c generated by valac 0.34.7, the Vala compiler
+/* CircleEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from CircleEffect.vala, do not modify */
 
 /* Copyright 2013 Jens Bav
@@ -87,7 +87,7 @@ struct _CircleEffectClass {
 
 static gpointer circle_effect_descriptor_parent_class = NULL;
 static gpointer circle_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* circle_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * circle_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType circle_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -118,7 +118,7 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base);
 
 CircleEffectDescriptor* circle_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	CircleEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -154,23 +154,20 @@ static const gchar* circle_effect_descriptor_real_get_id (ShotwellTransitionDesc
 static const gchar* circle_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	CircleEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	_tmp0_ = _ ("Circle");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	result = _tmp0_;
+	result = _ ("Circle");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 167 "CircleEffect.c"
+#line 164 "CircleEffect.c"
 }
 
 
 static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	CircleEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	CircleEffect* _tmp0_ = NULL;
+	CircleEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT_DESCRIPTOR, CircleEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -181,7 +178,7 @@ static SpitTransitionsEffect* circle_effect_descriptor_real_create (ShotwellTran
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 185 "CircleEffect.c"
+#line 182 "CircleEffect.c"
 }
 
 
@@ -189,12 +186,12 @@ static void circle_effect_descriptor_class_init (CircleEffectDescriptorClass * k
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) circle_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) circle_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) circle_effect_descriptor_real_create;
-#line 198 "CircleEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) circle_effect_descriptor_real_create;
+#line 195 "CircleEffect.c"
 }
 
 
@@ -220,14 +217,14 @@ CircleEffect* circle_effect_construct (GType object_type) {
 	self = (CircleEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return self;
-#line 224 "CircleEffect.c"
+#line 221 "CircleEffect.c"
 }
 
 
 CircleEffect* circle_effect_new (void) {
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return circle_effect_construct (TYPE_CIRCLE_EFFECT);
-#line 231 "CircleEffect.c"
+#line 228 "CircleEffect.c"
 }
 
 
@@ -245,13 +242,13 @@ static void circle_effect_real_get_fps (SpitTransitionsEffect* base, gint* desir
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 249 "CircleEffect.c"
+#line 246 "CircleEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 255 "CircleEffect.c"
+#line 252 "CircleEffect.c"
 	}
 }
 
@@ -264,7 +261,7 @@ static void circle_effect_real_start (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 268 "CircleEffect.c"
+#line 265 "CircleEffect.c"
 }
 
 
@@ -277,27 +274,27 @@ static gboolean circle_effect_real_needs_clear_background (SpitTransitionsEffect
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	return result;
-#line 281 "CircleEffect.c"
+#line 278 "CircleEffect.c"
 }
 
 
 static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	CircleEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	gint radius = 0;
-	gdouble _tmp3_ = 0.0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gdouble _tmp6_ = 0.0;
-	SpitTransitionsVisuals* _tmp7_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
-	GdkPixbuf* _tmp9_ = NULL;
-	SpitTransitionsVisuals* _tmp24_ = NULL;
-	GdkPixbuf* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gdouble _tmp6_;
+	SpitTransitionsVisuals* _tmp7_;
+	GdkPixbuf* _tmp8_;
+	GdkPixbuf* _tmp9_;
+	SpitTransitionsVisuals* _tmp24_;
+	GdkPixbuf* _tmp25_;
+	GdkPixbuf* _tmp26_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -332,21 +329,21 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp9_ = _tmp8_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (_tmp9_ != NULL) {
-#line 336 "CircleEffect.c"
-		cairo_t* _tmp10_ = NULL;
-		SpitTransitionsVisuals* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp13_ = NULL;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+#line 333 "CircleEffect.c"
+		cairo_t* _tmp10_;
+		SpitTransitionsVisuals* _tmp11_;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		SpitTransitionsVisuals* _tmp18_ = NULL;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		SpitTransitionsVisuals* _tmp18_;
 		GdkRectangle _tmp19_ = {0};
-		GdkRectangle _tmp20_ = {0};
-		gint _tmp21_ = 0;
-		cairo_t* _tmp22_ = NULL;
-		gdouble _tmp23_ = 0.0;
+		GdkRectangle _tmp20_;
+		gint _tmp21_;
+		cairo_t* _tmp22_;
+		gdouble _tmp23_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		_tmp10_ = ctx;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -379,7 +376,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 		_tmp23_ = alpha;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		cairo_paint_with_alpha (_tmp22_, 1 - _tmp23_);
-#line 383 "CircleEffect.c"
+#line 380 "CircleEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	_tmp24_ = visuals;
@@ -389,25 +386,25 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 	_tmp26_ = _tmp25_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	if (_tmp26_ != NULL) {
-#line 393 "CircleEffect.c"
-		cairo_t* _tmp27_ = NULL;
-		SpitTransitionsVisuals* _tmp28_ = NULL;
-		GdkPixbuf* _tmp29_ = NULL;
-		GdkPixbuf* _tmp30_ = NULL;
-		SpitTransitionsVisuals* _tmp31_ = NULL;
+#line 390 "CircleEffect.c"
+		cairo_t* _tmp27_;
+		SpitTransitionsVisuals* _tmp28_;
+		GdkPixbuf* _tmp29_;
+		GdkPixbuf* _tmp30_;
+		SpitTransitionsVisuals* _tmp31_;
 		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		SpitTransitionsVisuals* _tmp35_ = NULL;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		SpitTransitionsVisuals* _tmp35_;
 		GdkRectangle _tmp36_ = {0};
-		GdkRectangle _tmp37_ = {0};
-		gint _tmp38_ = 0;
-		cairo_t* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
-		cairo_t* _tmp43_ = NULL;
-		cairo_t* _tmp44_ = NULL;
+		GdkRectangle _tmp37_;
+		gint _tmp38_;
+		cairo_t* _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
+		gint _tmp42_;
+		cairo_t* _tmp43_;
+		cairo_t* _tmp44_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		_tmp27_ = ctx;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
@@ -452,7 +449,7 @@ static void circle_effect_real_paint (SpitTransitionsEffect* base, SpitTransitio
 		_tmp44_ = ctx;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 		cairo_paint (_tmp44_);
-#line 456 "CircleEffect.c"
+#line 453 "CircleEffect.c"
 	}
 }
 
@@ -465,7 +462,7 @@ static void circle_effect_real_advance (SpitTransitionsEffect* base, SpitTransit
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 469 "CircleEffect.c"
+#line 466 "CircleEffect.c"
 }
 
 
@@ -473,14 +470,14 @@ static void circle_effect_real_cancel (SpitTransitionsEffect* base) {
 	CircleEffect * self;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CIRCLE_EFFECT, CircleEffect);
-#line 477 "CircleEffect.c"
+#line 474 "CircleEffect.c"
 }
 
 
 static void circle_effect_class_init (CircleEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_parent_class = g_type_class_peek_parent (klass);
-#line 484 "CircleEffect.c"
+#line 481 "CircleEffect.c"
 }
 
 
@@ -488,18 +485,18 @@ static void circle_effect_spit_transitions_effect_interface_init (SpitTransition
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
 	circle_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) circle_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) circle_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) circle_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) circle_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) circle_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) circle_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) circle_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/CircleEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) circle_effect_real_cancel;
-#line 503 "CircleEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) circle_effect_real_cancel;
+#line 500 "CircleEffect.c"
 }