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

1 files changed, 211 insertions, 211 deletions

diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 8f75c81..5b62a91 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.34.7, the Vala compiler
+/* DataImportJob.c generated by valac 0.36.6, the Vala compiler
  * generated from DataImportJob.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -260,8 +260,8 @@ struct _BatchImportJobClass {
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
-	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
-	gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
 };
@@ -390,8 +390,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base);
 static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base);
 static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
 static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 GType photo_source_get_type (void) G_GNUC_CONST;
@@ -431,7 +431,7 @@ GType dateable_get_type (void) G_GNUC_CONST;
 void dateable_set_exposure_time (Dateable* self, time_t target_time);
 void photo_set_import_id (Photo* self, ImportID* import_id);
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj);
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -445,14 +445,14 @@ static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
 
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) {
 	SpitDataImportsDataImportJob* self = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	SpitDataImportsDataImportSource* _tmp1_ = NULL;
-	SpitDataImportsDataImportSource* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	SpitDataImportsDataImportSource* _tmp4_ = NULL;
-	guint64 _tmp5_ = 0ULL;
-	SpitDataImportsDataImportSource* _tmp6_ = NULL;
-	time_t _tmp7_ = 0;
+	SpitDataImportsDataImportSource* _tmp0_;
+	SpitDataImportsDataImportSource* _tmp1_;
+	SpitDataImportsDataImportSource* _tmp2_;
+	GFile* _tmp3_;
+	SpitDataImportsDataImportSource* _tmp4_;
+	guint64 _tmp5_;
+	SpitDataImportsDataImportSource* _tmp6_;
+	time_t _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -508,13 +508,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) {
 	HierarchicalTagIndex* result = NULL;
 	GeeSet* detected_htags = NULL;
-	GeeHashSet* _tmp0_ = NULL;
-	SpitDataImportsImportableTag** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	GeeHashSet* _tmp0_;
+	SpitDataImportsImportableTag** _tmp1_;
+	gint _tmp1__length1;
 	HierarchicalTagIndex* _tmp33_ = NULL;
-	GeeSet* _tmp34_ = NULL;
-	gint _tmp35_ = 0;
-	gint _tmp36_ = 0;
+	GeeSet* _tmp34_;
+	gint _tmp35_;
+	gint _tmp36_;
 #line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -538,7 +538,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
 #line 541 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp2_ = NULL;
+			SpitDataImportsImportableTag* _tmp2_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -547,19 +547,19 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 548 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gchar** _tmp5_ = NULL;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				gchar** _tmp8_ = NULL;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
+				SpitDataImportsImportableTag* _tmp3_;
+				gint _tmp4_;
+				gchar** _tmp5_;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				gchar** _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				gchar* _tmp10_;
+				gchar* _tmp11_;
 				gboolean _tmp12_ = FALSE;
-				const gchar* _tmp13_ = NULL;
+				const gchar* _tmp13_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp3_ = src_tag;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -589,8 +589,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp13_ != NULL) {
 #line 592 "DataImportJob.c"
-					const gchar* _tmp14_ = NULL;
-					gboolean _tmp15_ = FALSE;
+					const gchar* _tmp14_;
+					gboolean _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp14_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -606,11 +606,11 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp12_) {
 #line 609 "DataImportJob.c"
-					GeeSet* _tmp16_ = NULL;
-					const gchar* _tmp17_ = NULL;
+					GeeSet* _tmp16_;
+					const gchar* _tmp17_;
 					GeeList* parents = NULL;
-					const gchar* _tmp18_ = NULL;
-					GeeList* _tmp19_ = NULL;
+					const gchar* _tmp18_;
+					GeeList* _tmp19_;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp16_ = detected_htags;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -626,12 +626,12 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 627 "DataImportJob.c"
 					{
 						GeeList* _parent_list = NULL;
-						GeeList* _tmp20_ = NULL;
-						GeeList* _tmp21_ = NULL;
+						GeeList* _tmp20_;
+						GeeList* _tmp21_;
 						gint _parent_size = 0;
-						GeeList* _tmp22_ = NULL;
-						gint _tmp23_ = 0;
-						gint _tmp24_ = 0;
+						GeeList* _tmp22_;
+						gint _tmp23_;
+						gint _tmp24_;
 						gint _parent_index = 0;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp20_ = parents;
@@ -652,15 +652,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						while (TRUE) {
 #line 655 "DataImportJob.c"
-							gint _tmp25_ = 0;
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
+							gint _tmp25_;
+							gint _tmp26_;
+							gint _tmp27_;
 							gchar* parent = NULL;
-							GeeList* _tmp28_ = NULL;
-							gint _tmp29_ = 0;
-							gpointer _tmp30_ = NULL;
-							GeeSet* _tmp31_ = NULL;
-							const gchar* _tmp32_ = NULL;
+							GeeList* _tmp28_;
+							gint _tmp29_;
+							gpointer _tmp30_;
+							GeeSet* _tmp31_;
+							const gchar* _tmp32_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp25_ = _parent_index;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -718,8 +718,8 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp36_ > 0) {
 #line 721 "DataImportJob.c"
-		GeeSet* _tmp37_ = NULL;
-		HierarchicalTagIndex* _tmp38_ = NULL;
+		GeeSet* _tmp37_;
+		HierarchicalTagIndex* _tmp38_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp37_ = detected_htags;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -748,7 +748,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 
 time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) {
 	time_t result = 0;
-	time_t _tmp0_ = 0;
+	time_t _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), 0);
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -764,8 +764,8 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
 static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsDataImportSource* _tmp0_;
+	gchar* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -783,8 +783,8 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
 static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	SpitDataImportsDataImportSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitDataImportsDataImportSource* _tmp0_;
+	gchar* _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -815,8 +815,8 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -834,11 +834,11 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
 static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) {
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -870,8 +870,8 @@ static gpointer _batch_import_job_ref0 (gpointer self) {
 
 static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
 	SpitDataImportsDataImportJob * self;
-	BatchImportJob* _tmp0_ = NULL;
-	SpitDataImportsDataImportJob* _tmp1_ = NULL;
+	BatchImportJob* _tmp0_;
+	SpitDataImportsDataImportJob* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -888,12 +888,12 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
 	SpitDataImportsDataImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
 	gboolean result = FALSE;
-	guint64 _tmp0_ = 0ULL;
+	guint64 _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -928,21 +928,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 	SpitDataImportsDataImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	SpitDataImportsDataImportSource* _tmp2_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp3_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	SpitDataImportsImportableTag** _tmp6_ = NULL;
-	SpitDataImportsImportableTag** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	HierarchicalTagIndex* _tmp8_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	SpitDataImportsDataImportSource* _tmp2_;
+	SpitDataImportsImportableMediaItem* _tmp3_;
+	SpitDataImportsImportableMediaItem* _tmp4_;
+	gint _tmp5_;
+	SpitDataImportsImportableTag** _tmp6_;
+	SpitDataImportsImportableTag** _tmp7_;
+	gint _tmp7__length1;
+	HierarchicalTagIndex* _tmp8_;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1005,44 +1005,44 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	SpitDataImportsDataImportJob * self;
 	gboolean result = FALSE;
 	LibraryPhoto* photo = NULL;
-	MediaSource* _tmp0_ = NULL;
-	LibraryPhoto* _tmp1_ = NULL;
-	LibraryPhoto* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	LibraryPhoto* _tmp1_;
+	LibraryPhoto* _tmp2_;
 	SpitDataImportsImportableMediaItem* src_photo = NULL;
-	SpitDataImportsDataImportSource* _tmp3_ = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_ = NULL;
-	HierarchicalTagIndex* _tmp5_ = NULL;
+	SpitDataImportsDataImportSource* _tmp3_;
+	SpitDataImportsImportableMediaItem* _tmp4_;
+	HierarchicalTagIndex* _tmp5_;
 	SpitDataImportsImportableTag** src_tags = NULL;
-	SpitDataImportsImportableMediaItem* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	SpitDataImportsImportableTag** _tmp19_ = NULL;
-	gint src_tags_length1 = 0;
-	gint _src_tags_size_ = 0;
-	SpitDataImportsImportableTag** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
+	SpitDataImportsImportableMediaItem* _tmp17_;
+	gint _tmp18_;
+	SpitDataImportsImportableTag** _tmp19_;
+	gint src_tags_length1;
+	gint _src_tags_size_;
+	SpitDataImportsImportableTag** _tmp20_;
+	gint _tmp20__length1;
 	SpitDataImportsImportableEvent* src_event = NULL;
-	SpitDataImportsImportableMediaItem* _tmp61_ = NULL;
-	SpitDataImportsImportableEvent* _tmp62_ = NULL;
-	SpitDataImportsImportableEvent* _tmp63_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp61_;
+	SpitDataImportsImportableEvent* _tmp62_;
+	SpitDataImportsImportableEvent* _tmp63_;
 	Rating dst_rating = 0;
 	SpitDataImportsImportableRating* src_rating = NULL;
-	SpitDataImportsImportableMediaItem* _tmp74_ = NULL;
-	SpitDataImportsImportableRating* _tmp75_ = NULL;
-	SpitDataImportsImportableRating* _tmp76_ = NULL;
-	gboolean _tmp77_ = FALSE;
-	LibraryPhoto* _tmp83_ = NULL;
-	Rating _tmp84_ = 0;
+	SpitDataImportsImportableMediaItem* _tmp74_;
+	SpitDataImportsImportableRating* _tmp75_;
+	SpitDataImportsImportableRating* _tmp76_;
+	gboolean _tmp77_;
+	LibraryPhoto* _tmp83_;
+	Rating _tmp84_;
 	gchar* title = NULL;
-	SpitDataImportsImportableMediaItem* _tmp85_ = NULL;
-	gchar* _tmp86_ = NULL;
-	const gchar* _tmp87_ = NULL;
+	SpitDataImportsImportableMediaItem* _tmp85_;
+	gchar* _tmp86_;
+	const gchar* _tmp87_;
 	time_t* date_time = NULL;
-	SpitDataImportsImportableMediaItem* _tmp90_ = NULL;
-	time_t* _tmp91_ = NULL;
-	time_t* _tmp92_ = NULL;
-	LibraryPhoto* _tmp95_ = NULL;
-	BatchImportRoll* _tmp96_ = NULL;
-	ImportID _tmp97_ = {0};
+	SpitDataImportsImportableMediaItem* _tmp90_;
+	time_t* _tmp91_;
+	time_t* _tmp92_;
+	LibraryPhoto* _tmp95_;
+	BatchImportRoll* _tmp96_;
+	ImportID _tmp97_;
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1079,8 +1079,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp5_ != NULL) {
 #line 1081 "DataImportJob.c"
 		GeeCollection* paths = NULL;
-		HierarchicalTagIndex* _tmp6_ = NULL;
-		GeeCollection* _tmp7_ = NULL;
+		HierarchicalTagIndex* _tmp6_;
+		GeeCollection* _tmp7_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp6_ = self->priv->detected_htags;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1090,8 +1090,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 1091 "DataImportJob.c"
 		{
 			GeeIterator* _path_it = NULL;
-			GeeCollection* _tmp8_ = NULL;
-			GeeIterator* _tmp9_ = NULL;
+			GeeCollection* _tmp8_;
+			GeeIterator* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp8_ = paths;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1101,14 +1101,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
 #line 1104 "DataImportJob.c"
-				GeeIterator* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				GeeIterator* _tmp10_;
+				gboolean _tmp11_;
 				gchar* path = NULL;
-				GeeIterator* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				Tag* _tmp15_ = NULL;
-				Tag* _tmp16_ = NULL;
+				GeeIterator* _tmp12_;
+				gpointer _tmp13_;
+				const gchar* _tmp14_;
+				Tag* _tmp15_;
+				Tag* _tmp16_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp10_ = _path_it;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1172,7 +1172,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
 #line 1175 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp21_ = NULL;
+			SpitDataImportsImportableTag* _tmp21_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
@@ -1181,18 +1181,18 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 1182 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				gchar** _tmp24_ = NULL;
-				gchar** _tmp25_ = NULL;
-				gint _tmp25__length1 = 0;
-				gint _tmp26_ = 0;
-				gchar** _tmp27_ = NULL;
-				gchar** _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
-				gchar* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				const gchar* _tmp31_ = NULL;
+				SpitDataImportsImportableTag* _tmp22_;
+				gint _tmp23_;
+				gchar** _tmp24_;
+				gchar** _tmp25_;
+				gint _tmp25__length1;
+				gint _tmp26_;
+				gchar** _tmp27_;
+				gchar** _tmp28_;
+				gint _tmp28__length1;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				const gchar* _tmp31_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp22_ = src_tag;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1222,16 +1222,16 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp31_ != NULL) {
 #line 1225 "DataImportJob.c"
-					const gchar* _tmp32_ = NULL;
-					GeeList* _tmp33_ = NULL;
-					GeeList* _tmp34_ = NULL;
-					gint _tmp35_ = 0;
-					gint _tmp36_ = 0;
-					gboolean _tmp37_ = FALSE;
-					const gchar* _tmp57_ = NULL;
-					Tag* _tmp58_ = NULL;
-					Tag* _tmp59_ = NULL;
-					LibraryPhoto* _tmp60_ = NULL;
+					const gchar* _tmp32_;
+					GeeList* _tmp33_;
+					GeeList* _tmp34_;
+					gint _tmp35_;
+					gint _tmp36_;
+					gboolean _tmp37_;
+					const gchar* _tmp57_;
+					Tag* _tmp58_;
+					Tag* _tmp59_;
+					LibraryPhoto* _tmp60_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp32_ = prepped;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1249,8 +1249,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					if (_tmp37_) {
 #line 1252 "DataImportJob.c"
-						const gchar* _tmp38_ = NULL;
-						gboolean _tmp39_ = FALSE;
+						const gchar* _tmp38_;
+						gboolean _tmp39_;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp38_ = prepped;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1258,8 +1258,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp39_) {
 #line 1261 "DataImportJob.c"
-							const gchar* _tmp40_ = NULL;
-							gchar* _tmp41_ = NULL;
+							const gchar* _tmp40_;
+							gchar* _tmp41_;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp40_ = prepped;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1272,20 +1272,20 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						}
 					} else {
 						GeeList* parents = NULL;
-						const gchar* _tmp42_ = NULL;
-						GeeList* _tmp43_ = NULL;
-						GeeList* _tmp44_ = NULL;
-						gint _tmp45_ = 0;
-						gint _tmp46_ = 0;
+						const gchar* _tmp42_;
+						GeeList* _tmp43_;
+						GeeList* _tmp44_;
+						gint _tmp45_;
+						gint _tmp46_;
 						gchar* top_level_parent = NULL;
-						GeeList* _tmp47_ = NULL;
-						gpointer _tmp48_ = NULL;
+						GeeList* _tmp47_;
+						gpointer _tmp48_;
 						gchar* flat_top_level_parent = NULL;
-						const gchar* _tmp49_ = NULL;
-						gchar* _tmp50_ = NULL;
-						TagSourceCollection* _tmp51_ = NULL;
-						const gchar* _tmp52_ = NULL;
-						gboolean _tmp53_ = FALSE;
+						const gchar* _tmp49_;
+						gchar* _tmp50_;
+						TagSourceCollection* _tmp51_;
+						const gchar* _tmp52_;
+						gboolean _tmp53_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_tmp42_ = prepped;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1321,9 +1321,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp53_) {
 #line 1324 "DataImportJob.c"
-							const gchar* _tmp54_ = NULL;
-							Tag* _tmp55_ = NULL;
-							Tag* _tmp56_ = NULL;
+							const gchar* _tmp54_;
+							Tag* _tmp55_;
+							Tag* _tmp56_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp54_ = flat_top_level_parent;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1378,12 +1378,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp63_ != NULL) {
 #line 1380 "DataImportJob.c"
 		gchar* prepped = NULL;
-		SpitDataImportsImportableEvent* _tmp64_ = NULL;
-		gchar* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-		gchar* _tmp68_ = NULL;
-		const gchar* _tmp69_ = NULL;
+		SpitDataImportsImportableEvent* _tmp64_;
+		gchar* _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
+		gchar* _tmp68_;
+		const gchar* _tmp69_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp64_ = src_event;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1403,10 +1403,10 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		if (_tmp69_ != NULL) {
 #line 1406 "DataImportJob.c"
-			LibraryPhoto* _tmp70_ = NULL;
-			BatchImportRoll* _tmp71_ = NULL;
-			ViewCollection* _tmp72_ = NULL;
-			const gchar* _tmp73_ = NULL;
+			LibraryPhoto* _tmp70_;
+			BatchImportRoll* _tmp71_;
+			ViewCollection* _tmp72_;
+			const gchar* _tmp73_;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp70_ = photo;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1439,8 +1439,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		dst_rating = RATING_REJECTED;
 #line 1441 "DataImportJob.c"
 	} else {
-		SpitDataImportsImportableRating* _tmp78_ = NULL;
-		gboolean _tmp79_ = FALSE;
+		SpitDataImportsImportableRating* _tmp78_;
+		gboolean _tmp79_;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp78_ = src_rating;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1451,9 +1451,9 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			dst_rating = RATING_UNRATED;
 #line 1453 "DataImportJob.c"
 		} else {
-			SpitDataImportsImportableRating* _tmp80_ = NULL;
-			gint _tmp81_ = 0;
-			Rating _tmp82_ = 0;
+			SpitDataImportsImportableRating* _tmp80_;
+			gint _tmp81_;
+			Rating _tmp82_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp80_ = src_rating;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1482,8 +1482,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp87_ != NULL) {
 #line 1485 "DataImportJob.c"
-		LibraryPhoto* _tmp88_ = NULL;
-		const gchar* _tmp89_ = NULL;
+		LibraryPhoto* _tmp88_;
+		const gchar* _tmp89_;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp88_ = photo;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1503,8 +1503,8 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp92_ != NULL) {
 #line 1506 "DataImportJob.c"
-		LibraryPhoto* _tmp93_ = NULL;
-		time_t* _tmp94_ = NULL;
+		LibraryPhoto* _tmp93_;
+		time_t* _tmp94_;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp93_ = photo;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1546,12 +1546,12 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) {
 	gchar** result = NULL;
 	GeeList* components = NULL;
-	GeeLinkedList* _tmp0_ = NULL;
-	GeeList* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	gpointer* _tmp15_ = NULL;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	GeeLinkedList* _tmp0_;
+	GeeList* _tmp13_;
+	gint _tmp14_;
+	gpointer* _tmp15_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1563,8 +1563,8 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 #line 1564 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag* current_tag = NULL;
-		SpitDataImportsImportableTag* _tmp1_ = NULL;
-		SpitDataImportsImportableTag* _tmp2_ = NULL;
+		SpitDataImportsImportableTag* _tmp1_;
+		SpitDataImportsImportableTag* _tmp2_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp1_ = tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1579,18 +1579,18 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
 #line 1582 "DataImportJob.c"
-				SpitDataImportsImportableTag* _tmp6_ = NULL;
-				GeeList* _tmp7_ = NULL;
-				SpitDataImportsImportableTag* _tmp8_ = NULL;
-				gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				SpitDataImportsImportableTag* _tmp6_;
+				GeeList* _tmp7_;
+				SpitDataImportsImportableTag* _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (!_tmp3_) {
 #line 1592 "DataImportJob.c"
-					SpitDataImportsImportableTag* _tmp4_ = NULL;
-					SpitDataImportsImportableTag* _tmp5_ = NULL;
+					SpitDataImportsImportableTag* _tmp4_;
+					SpitDataImportsImportableTag* _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp4_ = current_tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1668,23 +1668,23 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportJobPrivate));
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_dest_identifier;
+	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_dest_identifier;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_source_identifier;
+	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_source_identifier;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_is_directory;
+	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_is_directory;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_basename;
+	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_basename;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) spit_data_imports_data_import_job_real_get_path;
+	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) spit_data_imports_data_import_job_real_get_path;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
+	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) spit_data_imports_data_import_job_real_set_associated;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) spit_data_imports_data_import_job_real_determine_file_size;
+	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) spit_data_imports_data_import_job_real_determine_file_size;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->prepare = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
+	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
+	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
 #line 1689 "DataImportJob.c"
 }
 
@@ -1700,7 +1700,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
 }
 
 
-static void spit_data_imports_data_import_job_finalize (BatchImportJob* obj) {
+static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
 	SpitDataImportsDataImportJob * self;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);