Merge branch 'feature/upstream' into develop

1 files changed, 114 insertions, 114 deletions

diff --git a/src/Upgrades.c b/src/Upgrades.c
index a402c40..80ae01f 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.34.7, the Vala compiler
+/* Upgrades.c generated by valac 0.36.6, the Vala compiler
  * generated from Upgrades.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -443,10 +443,10 @@ static gpointer upgrades_parent_class = NULL;
 static Upgrades* upgrades_instance;
 static Upgrades* upgrades_instance = NULL;
 static gpointer mimics_removal_task_parent_class = NULL;
-static UpgradeTaskIface* mimics_removal_task_upgrade_task_parent_iface = NULL;
+static UpgradeTaskIface * mimics_removal_task_upgrade_task_parent_iface = NULL;
 static gpointer fixup_raw_thumbnails_task_parent_class = NULL;
 extern LibraryPhotoSourceCollection* library_photo_global;
-static UpgradeTaskIface* fixup_raw_thumbnails_task_upgrade_task_parent_iface = NULL;
+static UpgradeTaskIface * fixup_raw_thumbnails_task_upgrade_task_parent_iface = NULL;
 
 gpointer upgrades_ref (gpointer instance);
 void upgrades_unref (gpointer instance);
@@ -484,7 +484,7 @@ guint64 upgrades_get_step_count (Upgrades* self);
 void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target);
 void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* monitor_target);
 guint64 upgrade_task_get_step_count (UpgradeTask* self);
-static void upgrades_finalize (Upgrades* obj);
+static void upgrades_finalize (Upgrades * obj);
 #define MIMICS_REMOVAL_TASK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTaskPrivate))
 enum  {
 	MIMICS_REMOVAL_TASK_DUMMY_PROPERTY
@@ -494,7 +494,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base);
 guint64 count_files_in_directory (GFile* dir, GError** error);
 static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor monitor, void* monitor_target);
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
-static void mimics_removal_task_finalize (GObject* obj);
+static void mimics_removal_task_finalize (GObject * obj);
 enum  {
 	FIXUP_RAW_THUMBNAILS_TASK_DUMMY_PROPERTY
 };
@@ -574,12 +574,12 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 
 static Upgrades* upgrades_construct (GType object_type) {
 	Upgrades* self = NULL;
-	MimicsRemovalTask* _tmp0_ = NULL;
-	MimicsRemovalTask* _tmp1_ = NULL;
-	Application* _tmp2_ = NULL;
-	Application* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
+	MimicsRemovalTask* _tmp0_;
+	MimicsRemovalTask* _tmp1_;
+	Application* _tmp2_;
+	Application* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = (Upgrades*) g_type_create_instance (object_type);
 #line 17 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -603,8 +603,8 @@ static Upgrades* upgrades_construct (GType object_type) {
 #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (_tmp5_) {
 #line 606 "Upgrades.c"
-		FixupRawThumbnailsTask* _tmp6_ = NULL;
-		FixupRawThumbnailsTask* _tmp7_ = NULL;
+		FixupRawThumbnailsTask* _tmp6_;
+		FixupRawThumbnailsTask* _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp6_ = fixup_raw_thumbnails_task_new ();
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -629,8 +629,8 @@ static Upgrades* upgrades_new (void) {
 
 
 void upgrades_init (void) {
-	Upgrades* _tmp0_ = NULL;
-	Upgrades* _tmp1_ = NULL;
+	Upgrades* _tmp0_;
+	Upgrades* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_tmp0_ = upgrades_instance;
 #line 25 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -654,8 +654,8 @@ static gpointer _upgrades_ref0 (gpointer self) {
 
 Upgrades* upgrades_get_instance (void) {
 	Upgrades* result = NULL;
-	Upgrades* _tmp0_ = NULL;
-	Upgrades* _tmp1_ = NULL;
+	Upgrades* _tmp0_;
+	Upgrades* _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_tmp0_ = upgrades_instance;
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -670,7 +670,7 @@ Upgrades* upgrades_get_instance (void) {
 
 guint64 upgrades_get_step_count (Upgrades* self) {
 	guint64 result = 0ULL;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_val_if_fail (IS_UPGRADES (self), 0ULL);
 #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -696,12 +696,12 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 697 "Upgrades.c"
 	{
 		GeeLinkedList* _task_list = NULL;
-		GeeLinkedList* _tmp0_ = NULL;
-		GeeLinkedList* _tmp1_ = NULL;
+		GeeLinkedList* _tmp0_;
+		GeeLinkedList* _tmp1_;
 		gint _task_size = 0;
-		GeeLinkedList* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		GeeLinkedList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 		gint _task_index = 0;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = self->priv->task_list;
@@ -722,16 +722,16 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 725 "Upgrades.c"
-			gint _tmp5_ = 0;
-			gint _tmp6_ = 0;
-			gint _tmp7_ = 0;
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
 			UpgradeTask* task = NULL;
-			GeeLinkedList* _tmp8_ = NULL;
-			gint _tmp9_ = 0;
-			gpointer _tmp10_ = NULL;
-			UpgradeTask* _tmp11_ = NULL;
-			ProgressMonitor _tmp12_ = NULL;
-			void* _tmp12__target = NULL;
+			GeeLinkedList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			UpgradeTask* _tmp11_;
+			ProgressMonitor _tmp12_;
+			void* _tmp12__target;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp5_ = _task_index;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -774,11 +774,11 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 
 
 static void upgrades_add (Upgrades* self, UpgradeTask* task) {
-	guint64 _tmp0_ = 0ULL;
-	UpgradeTask* _tmp1_ = NULL;
-	guint64 _tmp2_ = 0ULL;
-	GeeLinkedList* _tmp3_ = NULL;
-	UpgradeTask* _tmp4_ = NULL;
+	guint64 _tmp0_;
+	UpgradeTask* _tmp1_;
+	guint64 _tmp2_;
+	GeeLinkedList* _tmp3_;
+	UpgradeTask* _tmp4_;
 #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (IS_UPGRADES (self));
 #line 44 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -843,7 +843,7 @@ static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_value
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (collect_values[0].v_pointer) {
 #line 846 "Upgrades.c"
-		Upgrades* object;
+		Upgrades * object;
 		object = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -870,7 +870,7 @@ static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_value
 
 
 static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Upgrades** object_p;
+	Upgrades ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (!object_p) {
@@ -922,7 +922,7 @@ gpointer value_get_upgrades (const GValue* value) {
 
 
 void value_set_upgrades (GValue* value, gpointer v_object) {
-	Upgrades* old;
+	Upgrades * old;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES));
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -953,7 +953,7 @@ void value_set_upgrades (GValue* value, gpointer v_object) {
 
 
 void value_take_upgrades (GValue* value, gpointer v_object) {
-	Upgrades* old;
+	Upgrades * old;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES));
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -993,7 +993,7 @@ static void upgrades_class_init (UpgradesClass * klass) {
 
 
 static void upgrades_instance_init (Upgrades * self) {
-	GeeLinkedList* _tmp0_ = NULL;
+	GeeLinkedList* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv = UPGRADES_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1008,7 +1008,7 @@ static void upgrades_instance_init (Upgrades * self) {
 }
 
 
-static void upgrades_finalize (Upgrades* obj) {
+static void upgrades_finalize (Upgrades * obj) {
 	Upgrades * self;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_UPGRADES, Upgrades);
@@ -1035,7 +1035,7 @@ GType upgrades_get_type (void) {
 
 
 gpointer upgrades_ref (gpointer instance) {
-	Upgrades* self;
+	Upgrades * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -1046,7 +1046,7 @@ gpointer upgrades_ref (gpointer instance) {
 
 
 void upgrades_unref (gpointer instance) {
-	Upgrades* self;
+	Upgrades * self;
 	self = instance;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1105,15 +1105,15 @@ GType upgrade_task_get_type (void) {
 static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	MimicsRemovalTask * self;
 	guint64 result = 0ULL;
-	guint64 _tmp6_ = 0ULL;
+	guint64 _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
 #line 1113 "Upgrades.c"
 	{
 		guint64 _tmp0_ = 0ULL;
-		GFile* _tmp1_ = NULL;
-		guint64 _tmp2_ = 0ULL;
+		GFile* _tmp1_;
+		guint64 _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp1_ = self->priv->mimic_dir;
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1123,18 +1123,18 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1126 "Upgrades.c"
-			goto __catch593_g_error;
+			goto __catch595_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally593;
-	__catch593_g_error:
+	goto __finally595;
+	__catch595_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		e = _inner_error_;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_g_error_free0 (e);
 #line 1151 "Upgrades.c"
 	}
-	__finally593:
+	__finally595:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1156 "Upgrades.c"
@@ -1179,11 +1179,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
 #line 1181 "Upgrades.c"
 	{
-		GFile* _tmp0_ = NULL;
-		ProgressMonitor _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
-		guint64 _tmp2_ = 0ULL;
-		GFile* _tmp3_ = NULL;
+		GFile* _tmp0_;
+		ProgressMonitor _tmp1_;
+		void* _tmp1__target;
+		guint64 _tmp2_;
+		GFile* _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = self->priv->mimic_dir;
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1197,7 +1197,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1200 "Upgrades.c"
-			goto __catch594_g_error;
+			goto __catch596_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1206,15 +1206,15 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1209 "Upgrades.c"
-			goto __catch594_g_error;
+			goto __catch596_g_error;
 		}
 	}
-	goto __finally594;
-	__catch594_g_error:
+	goto __finally596;
+	__catch596_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		e = _inner_error_;
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1229,7 +1229,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		_g_error_free0 (e);
 #line 1231 "Upgrades.c"
 	}
-	__finally594:
+	__finally596:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1275,17 +1275,17 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface *
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	mimics_removal_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->get_step_count = (guint64 (*)(UpgradeTask*)) mimics_removal_task_real_get_step_count;
+	iface->get_step_count = (guint64 (*) (UpgradeTask *)) mimics_removal_task_real_get_step_count;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) mimics_removal_task_real_execute;
+	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) mimics_removal_task_real_execute;
 #line 1282 "Upgrades.c"
 }
 
 
 static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv = MIMICS_REMOVAL_TASK_GET_PRIVATE (self);
 #line 68 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1304,7 +1304,7 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
 }
 
 
-static void mimics_removal_task_finalize (GObject* obj) {
+static void mimics_removal_task_finalize (GObject * obj) {
 	MimicsRemovalTask * self;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
@@ -1341,14 +1341,14 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 1342 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp3_;
 		gint _phr_size = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _phr_index = 0;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = photo_table_get_instance ();
@@ -1375,16 +1375,16 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 1378 "Upgrades.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			PhotoRow* phr = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
-			PhotoRow* _tmp13_ = NULL;
-			BackingPhotoRow* _tmp14_ = NULL;
-			PhotoFileFormat _tmp15_ = 0;
+			GeeArrayList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
+			PhotoRow* _tmp13_;
+			BackingPhotoRow* _tmp14_;
+			PhotoFileFormat _tmp15_;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp7_ = _phr_index;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1416,7 +1416,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) {
 #line 1419 "Upgrades.c"
-				gint _tmp16_ = 0;
+				gint _tmp16_;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp16_ = num_raw_files;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1448,14 +1448,14 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 1449 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
-		PhotoTable* _tmp0_ = NULL;
-		PhotoTable* _tmp1_ = NULL;
-		GeeArrayList* _tmp2_ = NULL;
-		GeeArrayList* _tmp3_ = NULL;
+		PhotoTable* _tmp0_;
+		PhotoTable* _tmp1_;
+		GeeArrayList* _tmp2_;
+		GeeArrayList* _tmp3_;
 		gint _phr_size = 0;
-		GeeArrayList* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
+		GeeArrayList* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
 		gint _phr_index = 0;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp0_ = photo_table_get_instance ();
@@ -1482,17 +1482,17 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
 #line 1485 "Upgrades.c"
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
+			gint _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			PhotoRow* phr = NULL;
-			GeeArrayList* _tmp10_ = NULL;
-			gint _tmp11_ = 0;
-			gpointer _tmp12_ = NULL;
+			GeeArrayList* _tmp10_;
+			gint _tmp11_;
+			gpointer _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			PhotoRow* _tmp14_ = NULL;
-			BackingPhotoRow* _tmp15_ = NULL;
-			PhotoFileFormat _tmp16_ = 0;
+			PhotoRow* _tmp14_;
+			BackingPhotoRow* _tmp15_;
+			PhotoFileFormat _tmp16_;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp7_ = _phr_index;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1524,8 +1524,8 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) {
 #line 1527 "Upgrades.c"
-				PhotoRow* _tmp17_ = NULL;
-				RawDeveloper _tmp18_ = 0;
+				PhotoRow* _tmp17_;
+				RawDeveloper _tmp18_;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp17_ = phr;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1541,11 +1541,11 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp13_) {
 #line 1544 "Upgrades.c"
-				LibraryPhotoSourceCollection* _tmp19_ = NULL;
-				PhotoRow* _tmp20_ = NULL;
-				PhotoID _tmp21_ = {0};
-				LibraryPhoto* _tmp22_ = NULL;
-				LibraryPhoto* _tmp23_ = NULL;
+				LibraryPhotoSourceCollection* _tmp19_;
+				PhotoRow* _tmp20_;
+				PhotoID _tmp21_;
+				LibraryPhoto* _tmp22_;
+				LibraryPhoto* _tmp23_;
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp19_ = library_photo_global;
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1601,9 +1601,9 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	fixup_raw_thumbnails_task_upgrade_task_parent_iface = g_type_interface_peek_parent (iface);
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->get_step_count = (guint64 (*)(UpgradeTask*)) fixup_raw_thumbnails_task_real_get_step_count;
+	iface->get_step_count = (guint64 (*) (UpgradeTask *)) fixup_raw_thumbnails_task_real_get_step_count;
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
-	iface->execute = (void (*)(UpgradeTask*, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
+	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
 #line 1608 "Upgrades.c"
 }