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

1 files changed, 64 insertions, 67 deletions

diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c
index fd081d0..8234972 100644
--- a/plugins/shotwell-transitions/FadeEffect.c
+++ b/plugins/shotwell-transitions/FadeEffect.c
@@ -1,4 +1,4 @@
-/* FadeEffect.c generated by valac 0.34.7, the Vala compiler
+/* FadeEffect.c generated by valac 0.36.6, the Vala compiler
  * generated from FadeEffect.vala, do not modify */
 
 /* Copyright 2010 Maxim Kartashev
@@ -87,7 +87,7 @@ struct _FadeEffectClass {
 
 static gpointer fade_effect_descriptor_parent_class = NULL;
 static gpointer fade_effect_parent_class = NULL;
-static SpitTransitionsEffectIface* fade_effect_spit_transitions_effect_parent_iface = NULL;
+static SpitTransitionsEffectIface * fade_effect_spit_transitions_effect_parent_iface = NULL;
 
 GType shotwell_transition_descriptor_get_type (void) G_GNUC_CONST;
 GType fade_effect_descriptor_get_type (void) G_GNUC_CONST;
@@ -118,7 +118,7 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base);
 
 FadeEffectDescriptor* fade_effect_descriptor_construct (GType object_type, GFile* resource_directory) {
 	FadeEffectDescriptor * self = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -154,23 +154,20 @@ static const gchar* fade_effect_descriptor_real_get_id (ShotwellTransitionDescri
 static const gchar* fade_effect_descriptor_real_get_pluggable_name (ShotwellTransitionDescriptor* base) {
 	FadeEffectDescriptor * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	_tmp0_ = _ ("Fade");
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	result = _tmp0_;
+	result = _ ("Fade");
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 167 "FadeEffect.c"
+#line 164 "FadeEffect.c"
 }
 
 
 static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransitionDescriptor* base, SpitHostInterface* host) {
 	FadeEffectDescriptor * self;
 	SpitTransitionsEffect* result = NULL;
-	FadeEffect* _tmp0_ = NULL;
+	FadeEffect* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT_DESCRIPTOR, FadeEffectDescriptor);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -181,7 +178,7 @@ static SpitTransitionsEffect* fade_effect_descriptor_real_create (ShotwellTransi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TRANSITIONS_TYPE_EFFECT, SpitTransitionsEffect);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 185 "FadeEffect.c"
+#line 182 "FadeEffect.c"
 }
 
 
@@ -189,12 +186,12 @@ static void fade_effect_descriptor_class_init (FadeEffectDescriptorClass * klass
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_descriptor_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_id;
+	((ShotwellTransitionDescriptorClass *) klass)->get_id = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*)(ShotwellTransitionDescriptor*)) fade_effect_descriptor_real_get_pluggable_name;
+	((ShotwellTransitionDescriptorClass *) klass)->get_pluggable_name = (const gchar* (*) (ShotwellTransitionDescriptor *)) fade_effect_descriptor_real_get_pluggable_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*)(ShotwellTransitionDescriptor*, SpitHostInterface*)) fade_effect_descriptor_real_create;
-#line 198 "FadeEffect.c"
+	((ShotwellTransitionDescriptorClass *) klass)->create = (SpitTransitionsEffect* (*) (ShotwellTransitionDescriptor *, SpitHostInterface*)) fade_effect_descriptor_real_create;
+#line 195 "FadeEffect.c"
 }
 
 
@@ -220,14 +217,14 @@ FadeEffect* fade_effect_construct (GType object_type) {
 	self = (FadeEffect*) g_object_new (object_type, NULL);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return self;
-#line 224 "FadeEffect.c"
+#line 221 "FadeEffect.c"
 }
 
 
 FadeEffect* fade_effect_new (void) {
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return fade_effect_construct (TYPE_FADE_EFFECT);
-#line 231 "FadeEffect.c"
+#line 228 "FadeEffect.c"
 }
 
 
@@ -245,13 +242,13 @@ static void fade_effect_real_get_fps (SpitTransitionsEffect* base, gint* desired
 	if (desired_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*desired_fps = _vala_desired_fps;
-#line 249 "FadeEffect.c"
+#line 246 "FadeEffect.c"
 	}
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (min_fps) {
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		*min_fps = _vala_min_fps;
-#line 255 "FadeEffect.c"
+#line 252 "FadeEffect.c"
 	}
 }
 
@@ -264,7 +261,7 @@ static void fade_effect_real_start (SpitTransitionsEffect* base, SpitTransitions
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 268 "FadeEffect.c"
+#line 265 "FadeEffect.c"
 }
 
 
@@ -277,22 +274,22 @@ static gboolean fade_effect_real_needs_clear_background (SpitTransitionsEffect*
 	result = TRUE;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	return result;
-#line 281 "FadeEffect.c"
+#line 278 "FadeEffect.c"
 }
 
 
 static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitionsVisuals* visuals, SpitTransitionsMotion* motion, cairo_t* ctx, gint width, gint height, gint frame_number) {
 	FadeEffect * self;
 	gdouble alpha = 0.0;
-	SpitTransitionsMotion* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gdouble _tmp2_ = 0.0;
-	SpitTransitionsVisuals* _tmp3_ = NULL;
-	GdkPixbuf* _tmp4_ = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	SpitTransitionsVisuals* _tmp20_ = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	GdkPixbuf* _tmp22_ = NULL;
+	SpitTransitionsMotion* _tmp0_;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	SpitTransitionsVisuals* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	SpitTransitionsVisuals* _tmp20_;
+	GdkPixbuf* _tmp21_;
+	GdkPixbuf* _tmp22_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -317,21 +314,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 	_tmp5_ = _tmp4_;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (_tmp5_ != NULL) {
-#line 321 "FadeEffect.c"
-		cairo_t* _tmp6_ = NULL;
-		SpitTransitionsVisuals* _tmp7_ = NULL;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		SpitTransitionsVisuals* _tmp10_ = NULL;
+#line 318 "FadeEffect.c"
+		cairo_t* _tmp6_;
+		SpitTransitionsVisuals* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		SpitTransitionsVisuals* _tmp10_;
 		GdkRectangle _tmp11_ = {0};
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
-		SpitTransitionsVisuals* _tmp14_ = NULL;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
+		SpitTransitionsVisuals* _tmp14_;
 		GdkRectangle _tmp15_ = {0};
-		GdkRectangle _tmp16_ = {0};
-		gint _tmp17_ = 0;
-		cairo_t* _tmp18_ = NULL;
-		gdouble _tmp19_ = 0.0;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		cairo_t* _tmp18_;
+		gdouble _tmp19_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		_tmp6_ = ctx;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -364,7 +361,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 		_tmp19_ = alpha;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		cairo_paint_with_alpha (_tmp18_, 1.0 - _tmp19_);
-#line 368 "FadeEffect.c"
+#line 365 "FadeEffect.c"
 	}
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	_tmp20_ = visuals;
@@ -374,21 +371,21 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 	_tmp22_ = _tmp21_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	if (_tmp22_ != NULL) {
-#line 378 "FadeEffect.c"
-		cairo_t* _tmp23_ = NULL;
-		SpitTransitionsVisuals* _tmp24_ = NULL;
-		GdkPixbuf* _tmp25_ = NULL;
-		GdkPixbuf* _tmp26_ = NULL;
-		SpitTransitionsVisuals* _tmp27_ = NULL;
+#line 375 "FadeEffect.c"
+		cairo_t* _tmp23_;
+		SpitTransitionsVisuals* _tmp24_;
+		GdkPixbuf* _tmp25_;
+		GdkPixbuf* _tmp26_;
+		SpitTransitionsVisuals* _tmp27_;
 		GdkRectangle _tmp28_ = {0};
-		GdkRectangle _tmp29_ = {0};
-		gint _tmp30_ = 0;
-		SpitTransitionsVisuals* _tmp31_ = NULL;
+		GdkRectangle _tmp29_;
+		gint _tmp30_;
+		SpitTransitionsVisuals* _tmp31_;
 		GdkRectangle _tmp32_ = {0};
-		GdkRectangle _tmp33_ = {0};
-		gint _tmp34_ = 0;
-		cairo_t* _tmp35_ = NULL;
-		gdouble _tmp36_ = 0.0;
+		GdkRectangle _tmp33_;
+		gint _tmp34_;
+		cairo_t* _tmp35_;
+		gdouble _tmp36_;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		_tmp23_ = ctx;
 #line 59 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
@@ -421,7 +418,7 @@ static void fade_effect_real_paint (SpitTransitionsEffect* base, SpitTransitions
 		_tmp36_ = alpha;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 		cairo_paint_with_alpha (_tmp35_, _tmp36_);
-#line 425 "FadeEffect.c"
+#line 422 "FadeEffect.c"
 	}
 }
 
@@ -434,7 +431,7 @@ static void fade_effect_real_advance (SpitTransitionsEffect* base, SpitTransitio
 	g_return_if_fail (SPIT_TRANSITIONS_IS_VISUALS (visuals));
 #line 64 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	g_return_if_fail (SPIT_TRANSITIONS_IS_MOTION (motion));
-#line 438 "FadeEffect.c"
+#line 435 "FadeEffect.c"
 }
 
 
@@ -442,14 +439,14 @@ static void fade_effect_real_cancel (SpitTransitionsEffect* base) {
 	FadeEffect * self;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FADE_EFFECT, FadeEffect);
-#line 446 "FadeEffect.c"
+#line 443 "FadeEffect.c"
 }
 
 
 static void fade_effect_class_init (FadeEffectClass * klass) {
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_parent_class = g_type_class_peek_parent (klass);
-#line 453 "FadeEffect.c"
+#line 450 "FadeEffect.c"
 }
 
 
@@ -457,18 +454,18 @@ static void fade_effect_spit_transitions_effect_interface_init (SpitTransitionsE
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
 	fade_effect_spit_transitions_effect_parent_iface = g_type_interface_peek_parent (iface);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->get_fps = (void (*)(SpitTransitionsEffect*, gint*, gint*)) fade_effect_real_get_fps;
+	iface->get_fps = (void (*) (SpitTransitionsEffect *, gint*, gint*)) fade_effect_real_get_fps;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->start = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start;
+	iface->start = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*)) fade_effect_real_start;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->needs_clear_background = (gboolean (*)(SpitTransitionsEffect*)) fade_effect_real_needs_clear_background;
+	iface->needs_clear_background = (gboolean (*) (SpitTransitionsEffect *)) fade_effect_real_needs_clear_background;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->paint = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint;
+	iface->paint = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, cairo_t*, gint, gint, gint)) fade_effect_real_paint;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->advance = (void (*)(SpitTransitionsEffect*, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
+	iface->advance = (void (*) (SpitTransitionsEffect *, SpitTransitionsVisuals*, SpitTransitionsMotion*, gint)) fade_effect_real_advance;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-transitions/FadeEffect.vala"
-	iface->cancel = (void (*)(SpitTransitionsEffect*)) fade_effect_real_cancel;
-#line 472 "FadeEffect.c"
+	iface->cancel = (void (*) (SpitTransitionsEffect *)) fade_effect_real_cancel;
+#line 469 "FadeEffect.c"
 }