Merge branch 'feature/upstream' into develop

1 files changed, 85 insertions, 83 deletions

diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 5b62a91..c9fdbcb 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -259,11 +259,13 @@ struct _BatchImportJobClass {
 	gchar* (*get_basename) (BatchImportJob* self);
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+	GFile* (*get_associated_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 (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
+	gboolean (*recurse) (BatchImportJob* self);
 };
 
 struct _SpitDataImportsDataImportJob {
@@ -439,7 +441,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? spit_data_imports_data_import_source_ref (self) : NULL;
-#line 443 "DataImportJob.c"
+#line 445 "DataImportJob.c"
 }
 
 
@@ -487,21 +489,21 @@ SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType
 	self->priv->exposure_time = _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self;
-#line 491 "DataImportJob.c"
+#line 493 "DataImportJob.c"
 }
 
 
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source);
-#line 498 "DataImportJob.c"
+#line 500 "DataImportJob.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 505 "DataImportJob.c"
+#line 507 "DataImportJob.c"
 }
 
 
@@ -525,7 +527,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_tmp1_ = src_tags;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp1__length1 = src_tags_length1;
-#line 529 "DataImportJob.c"
+#line 531 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
@@ -537,14 +539,14 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 		src_tag_collection_length1 = _tmp1__length1;
 #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"
+#line 543 "DataImportJob.c"
 			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]);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			src_tag = _tmp2_;
-#line 548 "DataImportJob.c"
+#line 550 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
 				SpitDataImportsImportableTag* _tmp3_;
@@ -588,7 +590,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 				_tmp13_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp13_ != NULL) {
-#line 592 "DataImportJob.c"
+#line 594 "DataImportJob.c"
 					const gchar* _tmp14_;
 					gboolean _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -597,15 +599,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 					_tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp12_ = _tmp15_;
-#line 601 "DataImportJob.c"
+#line 603 "DataImportJob.c"
 				} else {
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp12_ = FALSE;
-#line 605 "DataImportJob.c"
+#line 607 "DataImportJob.c"
 				}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp12_) {
-#line 609 "DataImportJob.c"
+#line 611 "DataImportJob.c"
 					GeeSet* _tmp16_;
 					const gchar* _tmp17_;
 					GeeList* parents = NULL;
@@ -623,7 +625,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 					_tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_);
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					parents = _tmp19_;
-#line 627 "DataImportJob.c"
+#line 629 "DataImportJob.c"
 					{
 						GeeList* _parent_list = NULL;
 						GeeList* _tmp20_;
@@ -651,7 +653,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 						_parent_index = -1;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						while (TRUE) {
-#line 655 "DataImportJob.c"
+#line 657 "DataImportJob.c"
 							gint _tmp25_;
 							gint _tmp26_;
 							gint _tmp27_;
@@ -673,7 +675,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 							if (!(_tmp26_ < _tmp27_)) {
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 								break;
-#line 677 "DataImportJob.c"
+#line 679 "DataImportJob.c"
 							}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp28_ = _parent_list;
@@ -691,21 +693,21 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_free0 (parent);
-#line 695 "DataImportJob.c"
+#line 697 "DataImportJob.c"
 						}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (_parent_list);
-#line 699 "DataImportJob.c"
+#line 701 "DataImportJob.c"
 					}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (parents);
-#line 703 "DataImportJob.c"
+#line 705 "DataImportJob.c"
 				}
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 709 "DataImportJob.c"
+#line 711 "DataImportJob.c"
 			}
 		}
 	}
@@ -717,7 +719,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_tmp36_ = _tmp35_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp36_ > 0) {
-#line 721 "DataImportJob.c"
+#line 723 "DataImportJob.c"
 		GeeSet* _tmp37_;
 		HierarchicalTagIndex* _tmp38_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -728,13 +730,13 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 		_hierarchical_tag_index_unref0 (_tmp33_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp33_ = _tmp38_;
-#line 732 "DataImportJob.c"
+#line 734 "DataImportJob.c"
 	} else {
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_hierarchical_tag_index_unref0 (_tmp33_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp33_ = NULL;
-#line 738 "DataImportJob.c"
+#line 740 "DataImportJob.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	result = _tmp33_;
@@ -742,7 +744,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_g_object_unref0 (detected_htags);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 746 "DataImportJob.c"
+#line 748 "DataImportJob.c"
 }
 
 
@@ -757,7 +759,7 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 761 "DataImportJob.c"
+#line 763 "DataImportJob.c"
 }
 
 
@@ -776,7 +778,7 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 780 "DataImportJob.c"
+#line 782 "DataImportJob.c"
 }
 
 
@@ -795,7 +797,7 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
 	result = _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 799 "DataImportJob.c"
+#line 801 "DataImportJob.c"
 }
 
 
@@ -808,7 +810,7 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 	result = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 812 "DataImportJob.c"
+#line 814 "DataImportJob.c"
 }
 
 
@@ -827,7 +829,7 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 831 "DataImportJob.c"
+#line 833 "DataImportJob.c"
 }
 
 
@@ -857,14 +859,14 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b
 	result = _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 861 "DataImportJob.c"
+#line 863 "DataImportJob.c"
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 868 "DataImportJob.c"
+#line 870 "DataImportJob.c"
 }
 
 
@@ -884,7 +886,7 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
 	_batch_import_job_unref0 (self->priv->associated);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->associated = _tmp1_;
-#line 888 "DataImportJob.c"
+#line 890 "DataImportJob.c"
 }
 
 
@@ -910,21 +912,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
 	if (filesize) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*filesize = _vala_filesize;
-#line 914 "DataImportJob.c"
+#line 916 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (file) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file = _vala_file;
-#line 920 "DataImportJob.c"
+#line 922 "DataImportJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file);
-#line 924 "DataImportJob.c"
+#line 926 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 928 "DataImportJob.c"
+#line 930 "DataImportJob.c"
 }
 
 
@@ -983,21 +985,21 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob*
 	if (file_to_import) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file_to_import = _vala_file_to_import;
-#line 987 "DataImportJob.c"
+#line 989 "DataImportJob.c"
 	} else {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 991 "DataImportJob.c"
+#line 993 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (copy_to_library) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 997 "DataImportJob.c"
+#line 999 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1001 "DataImportJob.c"
+#line 1003 "DataImportJob.c"
 }
 
 
@@ -1065,7 +1067,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_g_object_unref0 (photo);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		return result;
-#line 1069 "DataImportJob.c"
+#line 1071 "DataImportJob.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp3_ = self->priv->import_source;
@@ -1077,7 +1079,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp5_ = self->priv->detected_htags;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp5_ != NULL) {
-#line 1081 "DataImportJob.c"
+#line 1083 "DataImportJob.c"
 		GeeCollection* paths = NULL;
 		HierarchicalTagIndex* _tmp6_;
 		GeeCollection* _tmp7_;
@@ -1087,7 +1089,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_);
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		paths = _tmp7_;
-#line 1091 "DataImportJob.c"
+#line 1093 "DataImportJob.c"
 		{
 			GeeIterator* _path_it = NULL;
 			GeeCollection* _tmp8_;
@@ -1100,7 +1102,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_path_it = _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1104 "DataImportJob.c"
+#line 1106 "DataImportJob.c"
 				GeeIterator* _tmp10_;
 				gboolean _tmp11_;
 				gchar* path = NULL;
@@ -1117,7 +1119,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				if (!_tmp11_) {
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1121 "DataImportJob.c"
+#line 1123 "DataImportJob.c"
 				}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp12_ = _path_it;
@@ -1135,15 +1137,15 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				_g_object_unref0 (_tmp16_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (path);
-#line 1139 "DataImportJob.c"
+#line 1141 "DataImportJob.c"
 			}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_g_object_unref0 (_path_it);
-#line 1143 "DataImportJob.c"
+#line 1145 "DataImportJob.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (paths);
-#line 1147 "DataImportJob.c"
+#line 1149 "DataImportJob.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp17_ = src_photo;
@@ -1159,7 +1161,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp20_ = src_tags;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp20__length1 = src_tags_length1;
-#line 1163 "DataImportJob.c"
+#line 1165 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
@@ -1171,14 +1173,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		src_tag_collection_length1 = _tmp20__length1;
 #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"
+#line 1177 "DataImportJob.c"
 			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]);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			src_tag = _tmp21_;
-#line 1182 "DataImportJob.c"
+#line 1184 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
 				SpitDataImportsImportableTag* _tmp22_;
@@ -1221,7 +1223,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				_tmp31_ = prepped;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp31_ != NULL) {
-#line 1225 "DataImportJob.c"
+#line 1227 "DataImportJob.c"
 					const gchar* _tmp32_;
 					GeeList* _tmp33_;
 					GeeList* _tmp34_;
@@ -1248,7 +1250,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 					_g_object_unref0 (_tmp34_);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					if (_tmp37_) {
-#line 1252 "DataImportJob.c"
+#line 1254 "DataImportJob.c"
 						const gchar* _tmp38_;
 						gboolean _tmp39_;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1257,7 +1259,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING);
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp39_) {
-#line 1261 "DataImportJob.c"
+#line 1263 "DataImportJob.c"
 							const gchar* _tmp40_;
 							gchar* _tmp41_;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1268,7 +1270,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 							_g_free0 (prepped);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							prepped = _tmp41_;
-#line 1272 "DataImportJob.c"
+#line 1274 "DataImportJob.c"
 						}
 					} else {
 						GeeList* parents = NULL;
@@ -1320,7 +1322,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp53_) {
-#line 1324 "DataImportJob.c"
+#line 1326 "DataImportJob.c"
 							const gchar* _tmp54_;
 							Tag* _tmp55_;
 							Tag* _tmp56_;
@@ -1334,7 +1336,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 							tag_promote (_tmp56_);
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_object_unref0 (_tmp56_);
-#line 1338 "DataImportJob.c"
+#line 1340 "DataImportJob.c"
 						}
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_free0 (flat_top_level_parent);
@@ -1342,7 +1344,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_g_free0 (top_level_parent);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (parents);
-#line 1346 "DataImportJob.c"
+#line 1348 "DataImportJob.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp57_ = prepped;
@@ -1356,13 +1358,13 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 					tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (_tmp59_);
-#line 1360 "DataImportJob.c"
+#line 1362 "DataImportJob.c"
 				}
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 1366 "DataImportJob.c"
+#line 1368 "DataImportJob.c"
 			}
 		}
 	}
@@ -1376,7 +1378,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp63_ = src_event;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp63_ != NULL) {
-#line 1380 "DataImportJob.c"
+#line 1382 "DataImportJob.c"
 		gchar* prepped = NULL;
 		SpitDataImportsImportableEvent* _tmp64_;
 		gchar* _tmp65_;
@@ -1402,7 +1404,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp69_ = prepped;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		if (_tmp69_ != NULL) {
-#line 1406 "DataImportJob.c"
+#line 1408 "DataImportJob.c"
 			LibraryPhoto* _tmp70_;
 			BatchImportRoll* _tmp71_;
 			ViewCollection* _tmp72_;
@@ -1417,11 +1419,11 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_tmp73_ = prepped;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_);
-#line 1421 "DataImportJob.c"
+#line 1423 "DataImportJob.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_free0 (prepped);
-#line 1425 "DataImportJob.c"
+#line 1427 "DataImportJob.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp74_ = src_photo;
@@ -1437,7 +1439,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp77_) {
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		dst_rating = RATING_REJECTED;
-#line 1441 "DataImportJob.c"
+#line 1443 "DataImportJob.c"
 	} else {
 		SpitDataImportsImportableRating* _tmp78_;
 		gboolean _tmp79_;
@@ -1449,7 +1451,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		if (_tmp79_) {
 #line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			dst_rating = RATING_UNRATED;
-#line 1453 "DataImportJob.c"
+#line 1455 "DataImportJob.c"
 		} else {
 			SpitDataImportsImportableRating* _tmp80_;
 			gint _tmp81_;
@@ -1462,7 +1464,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_tmp82_ = rating_unserialize (_tmp81_);
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			dst_rating = _tmp82_;
-#line 1466 "DataImportJob.c"
+#line 1468 "DataImportJob.c"
 		}
 	}
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1481,7 +1483,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp87_ = title;
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp87_ != NULL) {
-#line 1485 "DataImportJob.c"
+#line 1487 "DataImportJob.c"
 		LibraryPhoto* _tmp88_;
 		const gchar* _tmp89_;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1490,7 +1492,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp89_ = title;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_);
-#line 1494 "DataImportJob.c"
+#line 1496 "DataImportJob.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp90_ = src_photo;
@@ -1502,7 +1504,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp92_ = date_time;
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp92_ != NULL) {
-#line 1506 "DataImportJob.c"
+#line 1508 "DataImportJob.c"
 		LibraryPhoto* _tmp93_;
 		time_t* _tmp94_;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1511,7 +1513,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp94_ = date_time;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_);
-#line 1515 "DataImportJob.c"
+#line 1517 "DataImportJob.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp95_ = photo;
@@ -1539,7 +1541,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_g_object_unref0 (photo);
 #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1543 "DataImportJob.c"
+#line 1545 "DataImportJob.c"
 }
 
 
@@ -1560,7 +1562,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1564 "DataImportJob.c"
+#line 1566 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag* current_tag = NULL;
 		SpitDataImportsImportableTag* _tmp1_;
@@ -1571,14 +1573,14 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 		_tmp2_ = _g_object_ref0 (_tmp1_);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		current_tag = _tmp2_;
-#line 1575 "DataImportJob.c"
+#line 1577 "DataImportJob.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp3_ = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1582 "DataImportJob.c"
+#line 1584 "DataImportJob.c"
 				SpitDataImportsImportableTag* _tmp6_;
 				GeeList* _tmp7_;
 				SpitDataImportsImportableTag* _tmp8_;
@@ -1588,7 +1590,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				gchar* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (!_tmp3_) {
-#line 1592 "DataImportJob.c"
+#line 1594 "DataImportJob.c"
 					SpitDataImportsImportableTag* _tmp4_;
 					SpitDataImportsImportableTag* _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1599,7 +1601,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 					_g_object_unref0 (current_tag);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					current_tag = _tmp5_;
-#line 1603 "DataImportJob.c"
+#line 1605 "DataImportJob.c"
 				}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp3_ = FALSE;
@@ -1609,7 +1611,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				if (!(_tmp6_ != NULL)) {
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1613 "DataImportJob.c"
+#line 1615 "DataImportJob.c"
 				}
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp7_ = components;
@@ -1629,12 +1631,12 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				_g_free0 (_tmp12_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (_tmp10_);
-#line 1633 "DataImportJob.c"
+#line 1635 "DataImportJob.c"
 			}
 		}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (current_tag);
-#line 1638 "DataImportJob.c"
+#line 1640 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp13_ = components;
@@ -1648,7 +1650,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	if (result_length1) {
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*result_length1 = _tmp16__length1;
-#line 1652 "DataImportJob.c"
+#line 1654 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	result = _tmp16_;
@@ -1656,7 +1658,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	_g_object_unref0 (components);
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1660 "DataImportJob.c"
+#line 1662 "DataImportJob.c"
 }
 
 
@@ -1685,7 +1687,7 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
 	((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;
-#line 1689 "DataImportJob.c"
+#line 1691 "DataImportJob.c"
 }
 
 
@@ -1696,7 +1698,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
 	self->priv->associated = NULL;
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->detected_htags = NULL;
-#line 1700 "DataImportJob.c"
+#line 1702 "DataImportJob.c"
 }
 
 
@@ -1714,7 +1716,7 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
 	_hierarchical_tag_index_unref0 (self->priv->detected_htags);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj);
-#line 1718 "DataImportJob.c"
+#line 1720 "DataImportJob.c"
 }