Merge branch 'feature/upstream' into develop

1 files changed, 101 insertions, 104 deletions

diff --git a/thumbnailer/shotwell-video-thumbnailer.c b/thumbnailer/shotwell-video-thumbnailer.c
index 9eca431..c40d6c7 100644
--- a/thumbnailer/shotwell-video-thumbnailer.c
+++ b/thumbnailer/shotwell-video-thumbnailer.c
@@ -1,4 +1,4 @@
-/* shotwell-video-thumbnailer.c generated by valac 0.34.7, the Vala compiler
+/* shotwell-video-thumbnailer.c generated by valac 0.36.6, the Vala compiler
  * generated from shotwell-video-thumbnailer.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -69,7 +69,7 @@ enum  {
 gint shotwell_thumbnailer_main (gchar** args, int args_length1);
 ShotwellThumbnailer* shotwell_thumbnailer_new (void);
 ShotwellThumbnailer* shotwell_thumbnailer_construct (GType object_type);
-static void shotwell_thumbnailer_finalize (ShotwellThumbnailer* obj);
+static void shotwell_thumbnailer_finalize (ShotwellThumbnailer * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -92,25 +92,25 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	gint64 position = 0LL;
 	GstStateChangeReturn ret = 0;
 	GstRegistry* registry = NULL;
-	GstRegistry* _tmp0_ = NULL;
-	GstRegistry* _tmp1_ = NULL;
+	GstRegistry* _tmp0_;
+	GstRegistry* _tmp1_;
 	GstPluginFeature* feature = NULL;
-	GstRegistry* _tmp2_ = NULL;
-	GstPluginFeature* _tmp3_ = NULL;
-	GstPluginFeature* _tmp4_ = NULL;
-	GstRegistry* _tmp7_ = NULL;
-	GstPluginFeature* _tmp8_ = NULL;
-	GstPluginFeature* _tmp9_ = NULL;
-	gchar** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
+	GstRegistry* _tmp2_;
+	GstPluginFeature* _tmp3_;
+	GstPluginFeature* _tmp4_;
+	GstRegistry* _tmp7_;
+	GstPluginFeature* _tmp8_;
+	GstPluginFeature* _tmp9_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	gst_init (&args_length1, &args);
@@ -131,8 +131,8 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 29 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (_tmp4_ != NULL) {
 #line 134 "shotwell-video-thumbnailer.c"
-		GstRegistry* _tmp5_ = NULL;
-		GstPluginFeature* _tmp6_ = NULL;
+		GstRegistry* _tmp5_;
+		GstPluginFeature* _tmp6_;
 #line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp5_ = registry;
 #line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -154,8 +154,8 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (_tmp9_ != NULL) {
 #line 157 "shotwell-video-thumbnailer.c"
-		GstRegistry* _tmp10_ = NULL;
-		GstPluginFeature* _tmp11_ = NULL;
+		GstRegistry* _tmp10_;
+		GstPluginFeature* _tmp11_;
 #line 36 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp10_ = registry;
 #line 36 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -171,10 +171,10 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 39 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (_tmp12__length1 != 2) {
 #line 174 "shotwell-video-thumbnailer.c"
-		FILE* _tmp13_ = NULL;
-		gchar** _tmp14_ = NULL;
-		gint _tmp14__length1 = 0;
-		const gchar* _tmp15_ = NULL;
+		FILE* _tmp13_;
+		gchar** _tmp14_;
+		gint _tmp14__length1;
+		const gchar* _tmp15_;
 #line 40 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp13_ = stdout;
 #line 40 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -232,33 +232,33 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 233 "shotwell-video-thumbnailer.c"
 	{
 		GstElement* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		GstElement* _tmp25_ = NULL;
-		GstElement* _tmp26_ = NULL;
-		GstElement* _tmp27_ = NULL;
-		GstElement* _tmp28_ = NULL;
-		GstElement* _tmp29_ = NULL;
-		GstStateChangeReturn _tmp30_ = 0;
-		GstStateChangeReturn _tmp31_ = 0;
-		GstElement* _tmp35_ = NULL;
-		GstStateChangeReturn _tmp36_ = 0;
-		GstStateChangeReturn _tmp37_ = 0;
-		GstElement* _tmp39_ = NULL;
+		const gchar* _tmp24_;
+		GstElement* _tmp25_;
+		GstElement* _tmp26_;
+		GstElement* _tmp27_;
+		GstElement* _tmp28_;
+		GstElement* _tmp29_;
+		GstStateChangeReturn _tmp30_;
+		GstStateChangeReturn _tmp31_;
+		GstElement* _tmp35_;
+		GstStateChangeReturn _tmp36_;
+		GstStateChangeReturn _tmp37_;
+		GstElement* _tmp39_;
 		gint64 _tmp40_ = 0LL;
-		gboolean _tmp41_ = FALSE;
-		GstElement* _tmp43_ = NULL;
-		gint64 _tmp44_ = 0LL;
-		GstElement* _tmp45_ = NULL;
-		GstStateChangeReturn _tmp46_ = 0;
-		GstStateChangeReturn _tmp47_ = 0;
-		GstElement* _tmp49_ = NULL;
-		GdkPixbuf* _tmp50_ = NULL;
+		gboolean _tmp41_;
+		GstElement* _tmp43_;
+		gint64 _tmp44_;
+		GstElement* _tmp45_;
+		GstStateChangeReturn _tmp46_;
+		GstStateChangeReturn _tmp47_;
+		GstElement* _tmp49_;
+		GdkPixbuf* _tmp50_;
 		guint8* _tmp51_ = NULL;
 		gsize _tmp52_;
-		FILE* _tmp53_ = NULL;
-		guint8* _tmp54_ = NULL;
-		gint _tmp54__length1 = 0;
-		GstElement* _tmp55_ = NULL;
+		FILE* _tmp53_;
+		guint8* _tmp54_;
+		gint _tmp54__length1;
+		GstElement* _tmp55_;
 #line 49 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp24_ = descr;
 #line 49 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -301,7 +301,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 56 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp31_ == GST_STATE_CHANGE_FAILURE) {
 #line 304 "shotwell-video-thumbnailer.c"
-			FILE* _tmp32_ = NULL;
+			FILE* _tmp32_;
 #line 57 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp32_ = stderr;
 #line 57 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -328,13 +328,13 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 			return result;
 #line 330 "shotwell-video-thumbnailer.c"
 		} else {
-			GstStateChangeReturn _tmp33_ = 0;
+			GstStateChangeReturn _tmp33_;
 #line 59 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp33_ = ret;
 #line 59 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			if (_tmp33_ == GST_STATE_CHANGE_NO_PREROLL) {
 #line 337 "shotwell-video-thumbnailer.c"
-				FILE* _tmp34_ = NULL;
+				FILE* _tmp34_;
 #line 60 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 				_tmp34_ = stderr;
 #line 60 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -373,7 +373,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 68 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp37_ == GST_STATE_CHANGE_FAILURE) {
 #line 376 "shotwell-video-thumbnailer.c"
-			FILE* _tmp38_ = NULL;
+			FILE* _tmp38_;
 #line 69 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp38_ = stderr;
 #line 69 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -409,7 +409,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 74 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (!_tmp41_) {
 #line 412 "shotwell-video-thumbnailer.c"
-			FILE* _tmp42_ = NULL;
+			FILE* _tmp42_;
 #line 75 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp42_ = stderr;
 #line 75 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -455,7 +455,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 88 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp47_ == GST_STATE_CHANGE_FAILURE) {
 #line 458 "shotwell-video-thumbnailer.c"
-			FILE* _tmp48_ = NULL;
+			FILE* _tmp48_;
 #line 89 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp48_ = stderr;
 #line 89 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -489,7 +489,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 96 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp50_ = pixbuf;
 #line 96 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		gdk_pixbuf_save_to_buffer (_tmp50_, (gchar**) (&_tmp51_), &_tmp52_, "png", &_inner_error_, NULL);
+		gdk_pixbuf_save_to_buffer (_tmp50_, &_tmp51_, &_tmp52_, "png", &_inner_error_, NULL);
 #line 96 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		pngdata = (g_free (pngdata), NULL);
 #line 96 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -525,9 +525,9 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp56_ = NULL;
-		GError* _tmp57_ = NULL;
-		const gchar* _tmp58_ = NULL;
+		FILE* _tmp56_;
+		GError* _tmp57_;
+		const gchar* _tmp58_;
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		e = _inner_error_;
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -612,15 +612,12 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 
 
 int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,32,0)
-	g_thread_init (NULL);
-#endif
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
 #line 15 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return shotwell_thumbnailer_main (argv, argc);
-#line 624 "shotwell-video-thumbnailer.c"
+#line 621 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -630,21 +627,21 @@ ShotwellThumbnailer* shotwell_thumbnailer_construct (GType object_type) {
 	self = (ShotwellThumbnailer*) g_type_create_instance (object_type);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return self;
-#line 634 "shotwell-video-thumbnailer.c"
+#line 631 "shotwell-video-thumbnailer.c"
 }
 
 
 ShotwellThumbnailer* shotwell_thumbnailer_new (void) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return shotwell_thumbnailer_construct (TYPE_SHOTWELL_THUMBNAILER);
-#line 641 "shotwell-video-thumbnailer.c"
+#line 638 "shotwell-video-thumbnailer.c"
 }
 
 
 static void value_shotwell_thumbnailer_init (GValue* value) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	value->data[0].v_pointer = NULL;
-#line 648 "shotwell-video-thumbnailer.c"
+#line 645 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -653,7 +650,7 @@ static void value_shotwell_thumbnailer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (value->data[0].v_pointer);
-#line 657 "shotwell-video-thumbnailer.c"
+#line 654 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -663,11 +660,11 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		dest_value->data[0].v_pointer = shotwell_thumbnailer_ref (src_value->data[0].v_pointer);
-#line 667 "shotwell-video-thumbnailer.c"
+#line 664 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 671 "shotwell-video-thumbnailer.c"
+#line 668 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -675,66 +672,66 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
 static gpointer value_shotwell_thumbnailer_peek_pointer (const GValue* value) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return value->data[0].v_pointer;
-#line 679 "shotwell-video-thumbnailer.c"
+#line 676 "shotwell-video-thumbnailer.c"
 }
 
 
 static gchar* value_shotwell_thumbnailer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (collect_values[0].v_pointer) {
-#line 686 "shotwell-video-thumbnailer.c"
-		ShotwellThumbnailer* object;
+#line 683 "shotwell-video-thumbnailer.c"
+		ShotwellThumbnailer * object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 693 "shotwell-video-thumbnailer.c"
+#line 690 "shotwell-video-thumbnailer.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 697 "shotwell-video-thumbnailer.c"
+#line 694 "shotwell-video-thumbnailer.c"
 		}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = shotwell_thumbnailer_ref (object);
-#line 701 "shotwell-video-thumbnailer.c"
+#line 698 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 705 "shotwell-video-thumbnailer.c"
+#line 702 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return NULL;
-#line 709 "shotwell-video-thumbnailer.c"
+#line 706 "shotwell-video-thumbnailer.c"
 }
 
 
 static gchar* value_shotwell_thumbnailer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ShotwellThumbnailer** object_p;
+	ShotwellThumbnailer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (!object_p) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 720 "shotwell-video-thumbnailer.c"
+#line 717 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = NULL;
-#line 726 "shotwell-video-thumbnailer.c"
+#line 723 "shotwell-video-thumbnailer.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = value->data[0].v_pointer;
-#line 730 "shotwell-video-thumbnailer.c"
+#line 727 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 734 "shotwell-video-thumbnailer.c"
+#line 731 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return NULL;
-#line 738 "shotwell-video-thumbnailer.c"
+#line 735 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -748,7 +745,7 @@ GParamSpec* param_spec_shotwell_thumbnailer (const gchar* name, const gchar* nic
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return G_PARAM_SPEC (spec);
-#line 752 "shotwell-video-thumbnailer.c"
+#line 749 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -757,12 +754,12 @@ gpointer value_get_shotwell_thumbnailer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SHOTWELL_THUMBNAILER), NULL);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return value->data[0].v_pointer;
-#line 761 "shotwell-video-thumbnailer.c"
+#line 758 "shotwell-video-thumbnailer.c"
 }
 
 
 void value_set_shotwell_thumbnailer (GValue* value, gpointer v_object) {
-	ShotwellThumbnailer* old;
+	ShotwellThumbnailer * old;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SHOTWELL_THUMBNAILER));
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -777,23 +774,23 @@ void value_set_shotwell_thumbnailer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 781 "shotwell-video-thumbnailer.c"
+#line 778 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 785 "shotwell-video-thumbnailer.c"
+#line 782 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (old);
-#line 791 "shotwell-video-thumbnailer.c"
+#line 788 "shotwell-video-thumbnailer.c"
 	}
 }
 
 
 void value_take_shotwell_thumbnailer (GValue* value, gpointer v_object) {
-	ShotwellThumbnailer* old;
+	ShotwellThumbnailer * old;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SHOTWELL_THUMBNAILER));
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -806,17 +803,17 @@ void value_take_shotwell_thumbnailer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = v_object;
-#line 810 "shotwell-video-thumbnailer.c"
+#line 807 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 814 "shotwell-video-thumbnailer.c"
+#line 811 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (old);
-#line 820 "shotwell-video-thumbnailer.c"
+#line 817 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -826,24 +823,24 @@ static void shotwell_thumbnailer_class_init (ShotwellThumbnailerClass * klass) {
 	shotwell_thumbnailer_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	((ShotwellThumbnailerClass *) klass)->finalize = shotwell_thumbnailer_finalize;
-#line 830 "shotwell-video-thumbnailer.c"
+#line 827 "shotwell-video-thumbnailer.c"
 }
 
 
 static void shotwell_thumbnailer_instance_init (ShotwellThumbnailer * self) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	self->ref_count = 1;
-#line 837 "shotwell-video-thumbnailer.c"
+#line 834 "shotwell-video-thumbnailer.c"
 }
 
 
-static void shotwell_thumbnailer_finalize (ShotwellThumbnailer* obj) {
+static void shotwell_thumbnailer_finalize (ShotwellThumbnailer * obj) {
 	ShotwellThumbnailer * self;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_THUMBNAILER, ShotwellThumbnailer);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	g_signal_handlers_destroy (self);
-#line 847 "shotwell-video-thumbnailer.c"
+#line 844 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -862,18 +859,18 @@ GType shotwell_thumbnailer_get_type (void) {
 
 
 gpointer shotwell_thumbnailer_ref (gpointer instance) {
-	ShotwellThumbnailer* self;
+	ShotwellThumbnailer * self;
 	self = instance;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return instance;
-#line 872 "shotwell-video-thumbnailer.c"
+#line 869 "shotwell-video-thumbnailer.c"
 }
 
 
 void shotwell_thumbnailer_unref (gpointer instance) {
-	ShotwellThumbnailer* self;
+	ShotwellThumbnailer * self;
 	self = instance;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -881,7 +878,7 @@ void shotwell_thumbnailer_unref (gpointer instance) {
 		SHOTWELL_THUMBNAILER_GET_CLASS (self)->finalize (self);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 885 "shotwell-video-thumbnailer.c"
+#line 882 "shotwell-video-thumbnailer.c"
 	}
 }