New upstream version 0.28.3upstream/0.28.3

1 files changed, 6369 insertions, 5785 deletions

diff --git a/src/BatchImport.c b/src/BatchImport.c
index 3ee9b44..8ee3b4f 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.36.6, the Vala compiler
+/* BatchImport.c generated by valac 0.40.4, the Vala compiler
  * generated from BatchImport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -192,6 +193,11 @@ typedef struct _PreparedFileClass PreparedFileClass;
 
 typedef struct _CompletedImportObject CompletedImportObject;
 typedef struct _CompletedImportObjectClass CompletedImportObjectClass;
+enum  {
+	BATCH_IMPORT_0_PROPERTY,
+	BATCH_IMPORT_NUM_PROPERTIES
+};
+static GParamSpec* batch_import_properties[BATCH_IMPORT_NUM_PROPERTIES];
 
 #define TYPE_APPLICATION (application_get_type ())
 #define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
@@ -681,10 +687,15 @@ enum  {
 	BATCH_IMPORT_FATAL_ERROR_SIGNAL,
 	BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL,
 	BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL,
-	BATCH_IMPORT_LAST_SIGNAL
+	BATCH_IMPORT_NUM_SIGNALS
 };
-static guint batch_import_signals[BATCH_IMPORT_LAST_SIGNAL] = {0};
+static guint batch_import_signals[BATCH_IMPORT_NUM_SIGNALS] = {0};
 typedef struct _DuplicatedFilePrivate DuplicatedFilePrivate;
+enum  {
+	DUPLICATED_FILE_0_PROPERTY,
+	DUPLICATED_FILE_NUM_PROPERTIES
+};
+static GParamSpec* duplicated_file_properties[DUPLICATED_FILE_NUM_PROPERTIES];
 #define _video_id_free0(var) ((var == NULL) ? NULL : (var = (video_id_free (var), NULL)))
 #define _photo_id_free0(var) ((var == NULL) ? NULL : (var = (photo_id_free (var), NULL)))
 
@@ -1122,304 +1133,299 @@ struct _BatchImportProcessPreparedFilesData {
 	GeeList* list;
 	GeeList* _prepared_file_list;
 	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 	gint _prepared_file_size;
-	GeeList* _tmp2_;
+	GeeList* _tmp1_;
+	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
 	gint _prepared_file_index;
+	gint _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-	gint _tmp7_;
 	PreparedFile* prepared_file;
-	GeeList* _tmp8_;
-	gint _tmp9_;
-	gpointer _tmp10_;
+	GeeList* _tmp7_;
+	gint _tmp8_;
+	gpointer _tmp9_;
 	BatchImportResult* import_result;
 	LibraryPhotoSourceCollectionState photo_state;
 	LibraryPhoto* photo;
-	LibraryPhotoSourceCollection* _tmp11_;
-	PreparedFile* _tmp12_;
-	GFile* _tmp13_;
-	LibraryPhotoSourceCollectionState _tmp14_;
+	LibraryPhotoSourceCollection* _tmp10_;
+	PreparedFile* _tmp11_;
+	GFile* _tmp12_;
+	LibraryPhotoSourceCollectionState _tmp13_;
+	LibraryPhoto* _tmp14_;
 	LibraryPhoto* _tmp15_;
-	LibraryPhoto* _tmp16_;
-	LibraryPhotoSourceCollectionState _tmp17_;
-	PreparedFile* _tmp18_;
-	BatchImportJob* _tmp19_;
-	PreparedFile* _tmp20_;
-	GFile* _tmp21_;
-	PreparedFile* _tmp22_;
-	GFile* _tmp23_;
+	LibraryPhotoSourceCollectionState _tmp16_;
+	PreparedFile* _tmp17_;
+	BatchImportJob* _tmp18_;
+	PreparedFile* _tmp19_;
+	GFile* _tmp20_;
+	PreparedFile* _tmp21_;
+	GFile* _tmp22_;
+	gchar* _tmp23_;
 	gchar* _tmp24_;
-	gchar* _tmp25_;
-	PreparedFile* _tmp26_;
-	GFile* _tmp27_;
+	PreparedFile* _tmp25_;
+	GFile* _tmp26_;
+	gchar* _tmp27_;
 	gchar* _tmp28_;
-	gchar* _tmp29_;
-	LibraryPhoto* _tmp30_;
+	LibraryPhoto* _tmp29_;
+	GFile* _tmp30_;
 	GFile* _tmp31_;
-	GFile* _tmp32_;
+	DuplicatedFile* _tmp32_;
 	DuplicatedFile* _tmp33_;
-	DuplicatedFile* _tmp34_;
-	BatchImportResult* _tmp35_;
-	LibraryPhotoSourceCollectionState _tmp36_;
-	LibraryPhoto* _tmp37_;
-	LibraryPhotoSourceCollectionState _tmp38_;
-	GEnumValue* _tmp39_;
+	BatchImportResult* _tmp34_;
+	LibraryPhotoSourceCollectionState _tmp35_;
+	LibraryPhoto* _tmp36_;
+	LibraryPhotoSourceCollectionState _tmp37_;
+	GEnumValue* _tmp38_;
+	BatchImportResult* _tmp39_;
 	BatchImportResult* _tmp40_;
-	BatchImportResult* _tmp41_;
 	VideoSourceCollectionState video_state;
 	Video* video;
-	VideoSourceCollection* _tmp42_;
-	PreparedFile* _tmp43_;
-	GFile* _tmp44_;
-	VideoSourceCollectionState _tmp45_;
+	VideoSourceCollection* _tmp41_;
+	PreparedFile* _tmp42_;
+	GFile* _tmp43_;
+	VideoSourceCollectionState _tmp44_;
+	Video* _tmp45_;
 	Video* _tmp46_;
-	Video* _tmp47_;
-	VideoSourceCollectionState _tmp48_;
-	PreparedFile* _tmp49_;
-	BatchImportJob* _tmp50_;
-	PreparedFile* _tmp51_;
-	GFile* _tmp52_;
-	PreparedFile* _tmp53_;
-	GFile* _tmp54_;
+	VideoSourceCollectionState _tmp47_;
+	PreparedFile* _tmp48_;
+	BatchImportJob* _tmp49_;
+	PreparedFile* _tmp50_;
+	GFile* _tmp51_;
+	PreparedFile* _tmp52_;
+	GFile* _tmp53_;
+	gchar* _tmp54_;
 	gchar* _tmp55_;
-	gchar* _tmp56_;
-	PreparedFile* _tmp57_;
-	GFile* _tmp58_;
+	PreparedFile* _tmp56_;
+	GFile* _tmp57_;
+	gchar* _tmp58_;
 	gchar* _tmp59_;
-	gchar* _tmp60_;
-	Video* _tmp61_;
+	Video* _tmp60_;
+	GFile* _tmp61_;
 	GFile* _tmp62_;
-	GFile* _tmp63_;
+	DuplicatedFile* _tmp63_;
 	DuplicatedFile* _tmp64_;
-	DuplicatedFile* _tmp65_;
-	BatchImportResult* _tmp66_;
-	VideoSourceCollectionState _tmp67_;
-	Video* _tmp68_;
-	VideoSourceCollectionState _tmp69_;
-	GEnumValue* _tmp70_;
+	BatchImportResult* _tmp65_;
+	VideoSourceCollectionState _tmp66_;
+	Video* _tmp67_;
+	VideoSourceCollectionState _tmp68_;
+	GEnumValue* _tmp69_;
+	BatchImportResult* _tmp70_;
 	BatchImportResult* _tmp71_;
-	BatchImportResult* _tmp72_;
-	gboolean _tmp73_;
-	PreparedFile* _tmp74_;
-	gboolean _tmp75_;
-	PreparedFile* _tmp76_;
-	GFile* _tmp77_;
-	PreparedFile* _tmp78_;
-	const gchar* _tmp79_;
-	gboolean _tmp80_;
+	gboolean _tmp72_;
+	PreparedFile* _tmp73_;
+	gboolean _tmp74_;
+	PreparedFile* _tmp75_;
+	GFile* _tmp76_;
+	PreparedFile* _tmp77_;
+	const gchar* _tmp78_;
 	VideoID* duplicate_ids;
-	VideoTable* _tmp81_;
-	VideoTable* _tmp82_;
+	VideoTable* _tmp79_;
+	VideoTable* _tmp80_;
+	PreparedFile* _tmp81_;
+	GFile* _tmp82_;
 	PreparedFile* _tmp83_;
-	GFile* _tmp84_;
-	PreparedFile* _tmp85_;
-	const gchar* _tmp86_;
-	gint _tmp87_;
-	VideoID* _tmp88_;
-	VideoID* _tmp89_;
-	gint _tmp89__length1;
+	const gchar* _tmp84_;
+	gint _tmp85_;
+	VideoID* _tmp86_;
+	VideoID* _tmp87_;
+	gint _tmp87__length1;
 	gint duplicate_ids_length1;
 	gint _duplicate_ids_size_;
-	VideoID* _tmp90_;
-	gint _tmp90__length1;
+	VideoID* _tmp88_;
+	gint _tmp88__length1;
 	DuplicatedFile* duplicated_file;
-	VideoID* _tmp91_;
-	gint _tmp91__length1;
-	VideoID _tmp92_;
-	DuplicatedFile* _tmp93_;
+	VideoID* _tmp89_;
+	gint _tmp89__length1;
+	VideoID _tmp90_;
+	DuplicatedFile* _tmp91_;
 	ImportResult result_code;
-	gboolean _tmp94_;
+	gboolean _tmp92_;
 	Video* dupe_video;
-	VideoSourceCollection* _tmp95_;
-	MediaSourceHoldingTank* _tmp96_;
-	MediaSourceHoldingTank* _tmp97_;
-	PreparedFile* _tmp98_;
-	GFile* _tmp99_;
-	MediaSource* _tmp100_;
-	Video* _tmp101_;
-	Video* _tmp102_;
-	VideoSourceCollection* _tmp103_;
-	MediaSourceHoldingTank* _tmp104_;
-	MediaSourceHoldingTank* _tmp105_;
-	PreparedFile* _tmp106_;
-	const gchar* _tmp107_;
-	MediaSource* _tmp108_;
-	Video* _tmp109_;
-	PreparedFile* _tmp110_;
-	GFile* _tmp111_;
-	gchar* _tmp112_;
-	gchar* _tmp113_;
-	Video* _tmp114_;
-	PreparedFile* _tmp115_;
-	GFile* _tmp116_;
-	Video* _tmp117_;
-	ImportManifest* _tmp118_;
-	GeeList* _tmp119_;
-	Video* _tmp120_;
-	Video* _tmp121_;
-	guint64 _tmp122_;
-	PreparedFile* _tmp123_;
-	BatchImportJob* _tmp124_;
-	PreparedFile* _tmp125_;
-	GFile* _tmp126_;
-	PreparedFile* _tmp127_;
-	GFile* _tmp128_;
-	gchar* _tmp129_;
+	VideoSourceCollection* _tmp93_;
+	MediaSourceHoldingTank* _tmp94_;
+	MediaSourceHoldingTank* _tmp95_;
+	PreparedFile* _tmp96_;
+	GFile* _tmp97_;
+	MediaSource* _tmp98_;
+	Video* _tmp99_;
+	Video* _tmp100_;
+	VideoSourceCollection* _tmp101_;
+	MediaSourceHoldingTank* _tmp102_;
+	MediaSourceHoldingTank* _tmp103_;
+	PreparedFile* _tmp104_;
+	const gchar* _tmp105_;
+	MediaSource* _tmp106_;
+	Video* _tmp107_;
+	PreparedFile* _tmp108_;
+	GFile* _tmp109_;
+	gchar* _tmp110_;
+	gchar* _tmp111_;
+	Video* _tmp112_;
+	PreparedFile* _tmp113_;
+	GFile* _tmp114_;
+	Video* _tmp115_;
+	ImportManifest* _tmp116_;
+	GeeList* _tmp117_;
+	Video* _tmp118_;
+	Video* _tmp119_;
+	PreparedFile* _tmp120_;
+	BatchImportJob* _tmp121_;
+	PreparedFile* _tmp122_;
+	GFile* _tmp123_;
+	PreparedFile* _tmp124_;
+	GFile* _tmp125_;
+	gchar* _tmp126_;
+	gchar* _tmp127_;
+	PreparedFile* _tmp128_;
+	GFile* _tmp129_;
 	gchar* _tmp130_;
-	PreparedFile* _tmp131_;
-	GFile* _tmp132_;
-	gchar* _tmp133_;
-	gchar* _tmp134_;
-	DuplicatedFile* _tmp135_;
-	ImportResult _tmp136_;
+	gchar* _tmp131_;
+	DuplicatedFile* _tmp132_;
+	ImportResult _tmp133_;
+	BatchImportResult* _tmp134_;
+	ImportResult _tmp135_;
+	ImportManifest* _tmp136_;
 	BatchImportResult* _tmp137_;
-	ImportResult _tmp138_;
-	ImportManifest* _tmp139_;
-	BatchImportResult* _tmp140_;
-	PreparedFile* _tmp141_;
-	GFile* _tmp142_;
-	GFile* _tmp143_;
-	gboolean _tmp144_;
-	PreparedFile* _tmp145_;
-	BatchImportJob* _tmp146_;
-	PreparedFile* _tmp147_;
-	GFile* _tmp148_;
-	PreparedFile* _tmp149_;
-	GFile* _tmp150_;
-	gchar* _tmp151_;
+	PreparedFile* _tmp138_;
+	GFile* _tmp139_;
+	GFile* _tmp140_;
+	gboolean _tmp141_;
+	PreparedFile* _tmp142_;
+	BatchImportJob* _tmp143_;
+	PreparedFile* _tmp144_;
+	GFile* _tmp145_;
+	PreparedFile* _tmp146_;
+	GFile* _tmp147_;
+	gchar* _tmp148_;
+	gchar* _tmp149_;
+	PreparedFile* _tmp150_;
+	GFile* _tmp151_;
 	gchar* _tmp152_;
-	PreparedFile* _tmp153_;
-	GFile* _tmp154_;
-	gchar* _tmp155_;
-	gchar* _tmp156_;
-	PreparedFile* _tmp157_;
-	GFile* _tmp158_;
-	GFile* _tmp159_;
-	DuplicatedFile* _tmp160_;
-	DuplicatedFile* _tmp161_;
-	BatchImportResult* _tmp162_;
-	PreparedFile* _tmp163_;
-	GFile* _tmp164_;
-	PreparedFile* _tmp165_;
-	const gchar* _tmp166_;
-	PreparedFile* _tmp167_;
-	PhotoFileFormat _tmp168_;
-	gboolean _tmp169_;
-	gboolean _tmp170_;
-	LibraryPhotoSourceCollection* _tmp171_;
-	PreparedFile* _tmp172_;
-	GFile* _tmp173_;
-	LibraryPhoto* _tmp174_;
-	gboolean _tmp175_;
-	LibraryPhoto* _tmp176_;
-	PreparedFile* _tmp177_;
-	const gchar* _tmp178_;
-	LibraryPhotoSourceCollection* _tmp179_;
+	gchar* _tmp153_;
+	PreparedFile* _tmp154_;
+	GFile* _tmp155_;
+	GFile* _tmp156_;
+	DuplicatedFile* _tmp157_;
+	DuplicatedFile* _tmp158_;
+	BatchImportResult* _tmp159_;
+	PreparedFile* _tmp160_;
+	GFile* _tmp161_;
+	PreparedFile* _tmp162_;
+	const gchar* _tmp163_;
+	PreparedFile* _tmp164_;
+	PhotoFileFormat _tmp165_;
+	gboolean _tmp166_;
+	LibraryPhotoSourceCollection* _tmp167_;
+	PreparedFile* _tmp168_;
+	GFile* _tmp169_;
+	LibraryPhoto* _tmp170_;
+	gboolean _tmp171_;
+	LibraryPhoto* _tmp172_;
+	PreparedFile* _tmp173_;
+	const gchar* _tmp174_;
+	LibraryPhotoSourceCollection* _tmp175_;
+	PreparedFile* _tmp176_;
+	const gchar* _tmp177_;
+	LibraryPhoto* _tmp178_;
+	LibraryPhoto* _tmp179_;
 	PreparedFile* _tmp180_;
-	const gchar* _tmp181_;
-	LibraryPhoto* _tmp182_;
-	LibraryPhoto* _tmp183_;
-	PreparedFile* _tmp184_;
-	GFile* _tmp185_;
-	gchar* _tmp186_;
-	gchar* _tmp187_;
+	GFile* _tmp181_;
+	gchar* _tmp182_;
+	gchar* _tmp183_;
+	LibraryPhoto* _tmp184_;
+	PreparedFile* _tmp185_;
+	GFile* _tmp186_;
+	LibraryPhoto* _tmp187_;
 	LibraryPhoto* _tmp188_;
-	PreparedFile* _tmp189_;
-	GFile* _tmp190_;
-	LibraryPhoto* _tmp191_;
-	LibraryPhoto* _tmp192_;
-	gboolean _tmp193_;
-	LibraryPhoto* _tmp194_;
-	gboolean _tmp195_;
-	LibraryPhotoSourceCollection* _tmp196_;
-	PreparedFile* _tmp197_;
-	GFile* _tmp198_;
-	LibraryPhoto* _tmp199_;
-	gboolean _tmp200_;
-	LibraryPhoto* _tmp201_;
-	PreparedFile* _tmp202_;
-	const gchar* _tmp203_;
-	LibraryPhotoSourceCollection* _tmp204_;
+	gboolean _tmp189_;
+	LibraryPhoto* _tmp190_;
+	gboolean _tmp191_;
+	LibraryPhotoSourceCollection* _tmp192_;
+	PreparedFile* _tmp193_;
+	GFile* _tmp194_;
+	LibraryPhoto* _tmp195_;
+	gboolean _tmp196_;
+	LibraryPhoto* _tmp197_;
+	PreparedFile* _tmp198_;
+	const gchar* _tmp199_;
+	LibraryPhotoSourceCollection* _tmp200_;
+	PreparedFile* _tmp201_;
+	const gchar* _tmp202_;
+	LibraryPhoto* _tmp203_;
+	LibraryPhoto* _tmp204_;
 	PreparedFile* _tmp205_;
-	const gchar* _tmp206_;
-	LibraryPhoto* _tmp207_;
-	LibraryPhoto* _tmp208_;
-	PreparedFile* _tmp209_;
-	GFile* _tmp210_;
-	gchar* _tmp211_;
-	gchar* _tmp212_;
+	GFile* _tmp206_;
+	gchar* _tmp207_;
+	gchar* _tmp208_;
+	LibraryPhoto* _tmp209_;
+	PreparedFile* _tmp210_;
+	GFile* _tmp211_;
+	LibraryPhoto* _tmp212_;
 	LibraryPhoto* _tmp213_;
 	PreparedFile* _tmp214_;
-	GFile* _tmp215_;
-	LibraryPhoto* _tmp216_;
-	LibraryPhoto* _tmp217_;
+	BatchImportJob* _tmp215_;
+	PreparedFile* _tmp216_;
+	GFile* _tmp217_;
 	PreparedFile* _tmp218_;
-	BatchImportJob* _tmp219_;
-	PreparedFile* _tmp220_;
-	GFile* _tmp221_;
+	GFile* _tmp219_;
+	gchar* _tmp220_;
+	gchar* _tmp221_;
 	PreparedFile* _tmp222_;
 	GFile* _tmp223_;
 	gchar* _tmp224_;
 	gchar* _tmp225_;
-	PreparedFile* _tmp226_;
-	GFile* _tmp227_;
-	gchar* _tmp228_;
-	gchar* _tmp229_;
-	BatchImportResult* _tmp230_;
-	ImportManifest* _tmp231_;
-	GeeList* _tmp232_;
-	LibraryPhoto* _tmp233_;
-	ImportManifest* _tmp234_;
-	BatchImportResult* _tmp235_;
-	LibraryPhoto* _tmp236_;
-	guint64 _tmp237_;
-	PreparedFile* _tmp238_;
-	GFile* _tmp239_;
-	gchar* _tmp240_;
-	gchar* _tmp241_;
+	BatchImportResult* _tmp226_;
+	ImportManifest* _tmp227_;
+	GeeList* _tmp228_;
+	LibraryPhoto* _tmp229_;
+	ImportManifest* _tmp230_;
+	BatchImportResult* _tmp231_;
+	LibraryPhoto* _tmp232_;
+	PreparedFile* _tmp233_;
+	GFile* _tmp234_;
+	gchar* _tmp235_;
+	gchar* _tmp236_;
 	PhotoID* photo_ids;
-	PhotoTable* _tmp242_;
-	PhotoTable* _tmp243_;
-	PreparedFile* _tmp244_;
-	GFile* _tmp245_;
-	PreparedFile* _tmp246_;
-	const gchar* _tmp247_;
-	PreparedFile* _tmp248_;
-	PhotoFileFormat _tmp249_;
-	gint _tmp250_;
-	PhotoID* _tmp251_;
-	PhotoID* _tmp252_;
-	gint _tmp252__length1;
+	PhotoTable* _tmp237_;
+	PhotoTable* _tmp238_;
+	PreparedFile* _tmp239_;
+	GFile* _tmp240_;
+	PreparedFile* _tmp241_;
+	const gchar* _tmp242_;
+	PreparedFile* _tmp243_;
+	PhotoFileFormat _tmp244_;
+	gint _tmp245_;
+	PhotoID* _tmp246_;
+	PhotoID* _tmp247_;
+	gint _tmp247__length1;
 	gint photo_ids_length1;
 	gint _photo_ids_size_;
-	PhotoID* _tmp253_;
-	gint _tmp253__length1;
+	PhotoID* _tmp248_;
+	gint _tmp248__length1;
 	DuplicatedFile* _vala1_duplicated_file;
-	PhotoID* _tmp254_;
-	gint _tmp254__length1;
-	PhotoID _tmp255_;
-	DuplicatedFile* _tmp256_;
-	PreparedFile* _tmp257_;
-	BatchImportJob* _tmp258_;
-	PreparedFile* _tmp259_;
-	GFile* _tmp260_;
-	PreparedFile* _tmp261_;
-	GFile* _tmp262_;
+	PhotoID* _tmp249_;
+	gint _tmp249__length1;
+	PhotoID _tmp250_;
+	DuplicatedFile* _tmp251_;
+	PreparedFile* _tmp252_;
+	BatchImportJob* _tmp253_;
+	PreparedFile* _tmp254_;
+	GFile* _tmp255_;
+	PreparedFile* _tmp256_;
+	GFile* _tmp257_;
+	gchar* _tmp258_;
+	gchar* _tmp259_;
+	PreparedFile* _tmp260_;
+	GFile* _tmp261_;
+	gchar* _tmp262_;
 	gchar* _tmp263_;
-	gchar* _tmp264_;
-	PreparedFile* _tmp265_;
-	GFile* _tmp266_;
-	gchar* _tmp267_;
-	gchar* _tmp268_;
-	DuplicatedFile* _tmp269_;
-	BatchImportResult* _tmp270_;
-	BatchImportResult* _tmp271_;
-	BatchImportResult* _tmp272_;
-	GeeList* _tmp273_;
-	PreparedFile* _tmp274_;
+	DuplicatedFile* _tmp264_;
+	BatchImportResult* _tmp265_;
+	BatchImportResult* _tmp266_;
+	BatchImportResult* _tmp267_;
+	GeeList* _tmp268_;
+	PreparedFile* _tmp269_;
 };
 
 struct _PrepareFilesJob {
@@ -1681,13 +1687,20 @@ GType import_result_get_type (void) G_GNUC_CONST;
 gchar* import_result_to_string (ImportResult self);
 gboolean import_result_is_abort (ImportResult self);
 gboolean import_result_is_nonuser_abort (ImportResult self);
-ImportResult import_result_convert_error (GError* err, ImportResult default_result);
+ImportResult import_result_convert_error (GError* err,
+                                          ImportResult default_result);
 GQuark gphoto_error_quark (void);
 gpointer batch_import_job_ref (gpointer instance);
 void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+                                 gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
 GType duplicated_file_get_type (void) G_GNUC_CONST;
@@ -1697,14 +1710,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 gpointer batch_import_roll_ref (gpointer instance);
 void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+                                  gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_batch_import_roll (const GValue* value);
 GType batch_import_roll_get_type (void) G_GNUC_CONST;
-enum  {
-	BATCH_IMPORT_JOB_DUMMY_PROPERTY
-};
 gchar* batch_import_job_get_dest_identifier (BatchImportJob* self);
 static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self);
 gchar* batch_import_job_get_source_identifier (BatchImportJob* self);
@@ -1719,14 +1735,32 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self);
 static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self);
 GFile* batch_import_job_get_associated_file (BatchImportJob* self);
 static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self);
-void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated);
-static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated);
-gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
-static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
-gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
-static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
-gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
-static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
+void batch_import_job_set_associated (BatchImportJob* self,
+                                      BatchImportJob* associated);
+static void batch_import_job_real_set_associated (BatchImportJob* self,
+                                           BatchImportJob* associated);
+gboolean batch_import_job_determine_file_size (BatchImportJob* self,
+                                               guint64* filesize,
+                                               GFile* * file_or_dir);
+static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self,
+                                                    guint64* filesize,
+                                                    GFile* * file_or_dir);
+gboolean batch_import_job_prepare (BatchImportJob* self,
+                                   GFile* * file_to_import,
+                                   gboolean* copy_to_library,
+                                   GError** error);
+static gboolean batch_import_job_real_prepare (BatchImportJob* self,
+                                        GFile* * file_to_import,
+                                        gboolean* copy_to_library,
+                                        GError** error);
+gboolean batch_import_job_complete (BatchImportJob* self,
+                                    MediaSource* source,
+                                    BatchImportRoll* import_roll,
+                                    GError** error);
+static gboolean batch_import_job_real_complete (BatchImportJob* self,
+                                         MediaSource* source,
+                                         BatchImportRoll* import_roll,
+                                         GError** error);
 time_t batch_import_job_get_exposure_time_override (BatchImportJob* self);
 static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self);
 gboolean batch_import_job_recurse (BatchImportJob* self);
@@ -1735,20 +1769,28 @@ BatchImportJob* batch_import_job_construct (GType object_type);
 static void batch_import_job_finalize (BatchImportJob * obj);
 GType file_import_job_get_type (void) G_GNUC_CONST;
 #define FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FILE_IMPORT_JOB, FileImportJobPrivate))
-enum  {
-	FILE_IMPORT_JOB_DUMMY_PROPERTY
-};
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_new (GFile* file_or_dir,
+                                    gboolean copy_to_library,
+                                    gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type,
+                                          GFile* file_or_dir,
+                                          gboolean copy_to_library,
+                                          gboolean recurse);
 static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base);
 static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base);
 static gboolean file_import_job_real_is_directory (BatchImportJob* base);
 gboolean query_is_directory (GFile* file);
 static gchar* file_import_job_real_get_basename (BatchImportJob* base);
 static gchar* file_import_job_real_get_path (BatchImportJob* base);
-static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
-static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error);
+static void file_import_job_real_set_associated (BatchImportJob* base,
+                                          BatchImportJob* associated);
+static gboolean file_import_job_real_determine_file_size (BatchImportJob* base,
+                                                   guint64* filesize,
+                                                   GFile* * file);
+static gboolean file_import_job_real_prepare (BatchImportJob* base,
+                                       GFile* * file_to_import,
+                                       gboolean* copy,
+                                       GError** error);
 GFile* file_import_job_get_file (FileImportJob* self);
 static gboolean file_import_job_real_recurse (BatchImportJob* base);
 static void file_import_job_finalize (BatchImportJob * obj);
@@ -1757,88 +1799,150 @@ ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
-enum  {
-	BATCH_IMPORT_ROLL_DUMMY_PROPERTY
-};
 ViewCollection* view_collection_new (const gchar* name);
-ViewCollection* view_collection_construct (GType object_type, const gchar* name);
+ViewCollection* view_collection_construct (GType object_type,
+                                           const gchar* name);
 BatchImportRoll* batch_import_roll_new (void);
 BatchImportRoll* batch_import_roll_construct (GType object_type);
 void import_id_generate (ImportID* result);
 static void batch_import_roll_finalize (BatchImportRoll * obj);
 gpointer batch_import_result_ref (gpointer instance);
 void batch_import_result_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_result (GValue* value, gpointer v_object);
-void value_take_batch_import_result (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_result (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_batch_import_result (GValue* value,
+                                    gpointer v_object);
+void value_take_batch_import_result (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_batch_import_result (const GValue* value);
 GType batch_import_result_get_type (void) G_GNUC_CONST;
-enum  {
-	BATCH_IMPORT_RESULT_DUMMY_PROPERTY
-};
-BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_);
-BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_);
-BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
-BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
+BatchImportResult* batch_import_result_new (BatchImportJob* job,
+                                            GFile* file,
+                                            const gchar* src_identifier,
+                                            const gchar* dest_identifier,
+                                            DuplicatedFile* duplicate_of,
+                                            ImportResult _result_);
+BatchImportResult* batch_import_result_construct (GType object_type,
+                                                  BatchImportJob* job,
+                                                  GFile* file,
+                                                  const gchar* src_identifier,
+                                                  const gchar* dest_identifier,
+                                                  DuplicatedFile* duplicate_of,
+                                                  ImportResult _result_);
+BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job,
+                                                       GFile* file,
+                                                       const gchar* src_identifier,
+                                                       const gchar* dest_identifier,
+                                                       GError* err,
+                                                       ImportResult default_result);
+BatchImportResult* batch_import_result_construct_from_error (GType object_type,
+                                                             BatchImportJob* job,
+                                                             GFile* file,
+                                                             const gchar* src_identifier,
+                                                             const gchar* dest_identifier,
+                                                             GError* err,
+                                                             ImportResult default_result);
 static void batch_import_result_finalize (BatchImportResult * obj);
 gpointer import_manifest_ref (gpointer instance);
 void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+                                gpointer v_object);
+void value_take_import_manifest (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_import_manifest (const GValue* value);
 GType import_manifest_get_type (void) G_GNUC_CONST;
-enum  {
-	IMPORT_MANIFEST_DUMMY_PROPERTY
-};
-ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported);
-ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported);
-void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result);
+ImportManifest* import_manifest_new (GeeList* prefailed,
+                                     GeeList* pre_already_imported);
+ImportManifest* import_manifest_construct (GType object_type,
+                                           GeeList* prefailed,
+                                           GeeList* pre_already_imported);
+void import_manifest_add_result (ImportManifest* self,
+                                 BatchImportResult* batch_result);
 static void import_manifest_finalize (ImportManifest * obj);
 GType batch_import_get_type (void) G_GNUC_CONST;
 gpointer prepared_file_ref (gpointer instance);
 void prepared_file_unref (gpointer instance);
-GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_prepared_file (GValue* value, gpointer v_object);
-void value_take_prepared_file (GValue* value, gpointer v_object);
+GParamSpec* param_spec_prepared_file (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags);
+void value_set_prepared_file (GValue* value,
+                              gpointer v_object);
+void value_take_prepared_file (GValue* value,
+                               gpointer v_object);
 gpointer value_get_prepared_file (const GValue* value);
 GType prepared_file_get_type (void) G_GNUC_CONST;
 gpointer completed_import_object_ref (gpointer instance);
 void completed_import_object_unref (gpointer instance);
-GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_completed_import_object (GValue* value, gpointer v_object);
-void value_take_completed_import_object (GValue* value, gpointer v_object);
+GParamSpec* param_spec_completed_import_object (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void value_set_completed_import_object (GValue* value,
+                                        gpointer v_object);
+void value_take_completed_import_object (GValue* value,
+                                         gpointer v_object);
 gpointer value_get_completed_import_object (const GValue* value);
 GType completed_import_object_get_type (void) G_GNUC_CONST;
 #define BATCH_IMPORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_BATCH_IMPORT, BatchImportPrivate))
-enum  {
-	BATCH_IMPORT_DUMMY_PROPERTY
-};
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
+GParamSpec* param_spec_application (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_application (GValue* value,
+                            gpointer v_object);
+void value_take_application (GValue* value,
+                             gpointer v_object);
 gpointer value_get_application (const GValue* value);
 GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void batch_import_user_halt (BatchImport* self);
-static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self);
+static void _batch_import_user_halt_application_exiting (Application* _sender,
+                                                  gboolean panicked,
+                                                  gpointer self);
 gpointer workers_ref (gpointer instance);
 void workers_unref (gpointer instance);
-GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_workers (GValue* value, gpointer v_object);
-void value_take_workers (GValue* value, gpointer v_object);
+GParamSpec* param_spec_workers (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags);
+void value_set_workers (GValue* value,
+                        gpointer v_object);
+void value_take_workers (GValue* value,
+                         gpointer v_object);
 gpointer value_get_workers (const GValue* value);
 GType workers_get_type (void) G_GNUC_CONST;
-Workers* workers_new (guint max_threads, gboolean exclusive);
-Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive);
+Workers* workers_new (guint max_threads,
+                      gboolean exclusive);
+Workers* workers_construct (GType object_type,
+                            guint max_threads,
+                            gboolean exclusive);
 guint workers_thread_per_cpu_minus_one (void);
 #define BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC 125
 #define BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES 100
@@ -1846,96 +1950,232 @@ guint workers_thread_per_cpu_minus_one (void);
 #define BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW 10
 #define BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC 125
 #define BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW ((3 * 1000) / BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC)
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
+BatchImport* batch_import_new (GeeIterable* jobs,
+                               const gchar* name,
+                               BatchImportImportReporter reporter,
+                               void* reporter_target,
+                               GeeArrayList* prefailed,
+                               GeeArrayList* pre_already_imported,
+                               GCancellable* cancellable,
+                               BatchImportRoll* import_roll,
+                               ImportManifest* skip_manifest);
+BatchImport* batch_import_construct (GType object_type,
+                                     GeeIterable* jobs,
+                                     const gchar* name,
+                                     BatchImportImportReporter reporter,
+                                     void* reporter_target,
+                                     GeeArrayList* prefailed,
+                                     GeeArrayList* pre_already_imported,
+                                     GCancellable* cancellable,
+                                     BatchImportRoll* import_roll,
+                                     ImportManifest* skip_manifest);
 guint file_hash (GFile* file);
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self);
-gboolean file_equal (GFile* a, GFile* b);
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static guint _file_hash_gee_hash_data_func (gconstpointer v,
+                                     gpointer self);
+gboolean file_equal (GFile* a,
+                     GFile* b);
+static gboolean _file_equal_gee_equal_data_func (gconstpointer a,
+                                          gconstpointer b,
+                                          gpointer self);
 GFile* media_source_get_file (MediaSource* self);
 static gboolean batch_import_display_imported_timer (BatchImport* self);
 static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self);
 gchar* batch_import_get_name (BatchImport* self);
 gboolean batch_import_get_untrash_duplicates (BatchImport* self);
-void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates);
+void batch_import_set_untrash_duplicates (BatchImport* self,
+                                          gboolean untrash_duplicates);
 gboolean batch_import_get_mark_duplicates_online (BatchImport* self);
-void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online);
-static void batch_import_log_status (BatchImport* self, const gchar* where);
-static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result);
-guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
-static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress);
+void batch_import_set_mark_duplicates_online (BatchImport* self,
+                                              gboolean mark_duplicates_online);
+static void batch_import_log_status (BatchImport* self,
+                              const gchar* where);
+static gboolean batch_import_report_failure (BatchImport* self,
+                                      BatchImportResult* import_result);
+guint64 query_total_file_size (GFile* file_or_dir,
+                               GCancellable* cancellable,
+                               GError** error);
+static void batch_import_report_progress (BatchImport* self,
+                                   guint64 increment_of_progress);
 gulong now_ms (void);
 gpointer background_job_ref (gpointer instance);
 void background_job_unref (gpointer instance);
-GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_background_job (GValue* value, gpointer v_object);
-void value_take_background_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_background_job (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_background_job (GValue* value,
+                               gpointer v_object);
+void value_take_background_job (GValue* value,
+                                gpointer v_object);
 gpointer value_get_background_job (const GValue* value);
 GType background_job_get_type (void) G_GNUC_CONST;
 GType background_import_job_get_type (void) G_GNUC_CONST;
-static gboolean batch_import_report_failures (BatchImport* self, BackgroundImportJob* background_job);
+static gboolean batch_import_report_failures (BatchImport* self,
+                                       BackgroundImportJob* background_job);
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void batch_import_report_completed (BatchImport* self, const gchar* where);
+static void batch_import_report_completed (BatchImport* self,
+                                    const gchar* where);
 static void batch_import_flush_ready_sources (BatchImport* self);
 static void batch_import_file_import_complete (BatchImport* self);
 void batch_import_schedule (BatchImport* self);
-void workers_enqueue (Workers* self, BackgroundJob* job);
-static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self);
-static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
-WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset);
-WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset);
+void workers_enqueue (Workers* self,
+                      BackgroundJob* job);
+static void batch_import_on_work_sniffed_out (BatchImport* self,
+                                       BackgroundJob* j);
+static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job,
+                                                            gpointer self);
+static void batch_import_on_sniffer_cancelled (BatchImport* self,
+                                        BackgroundJob* j);
+static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job,
+                                                               gpointer self);
+WorkSniffer* work_sniffer_new (BatchImport* owner,
+                               GeeIterable* jobs,
+                               CompletionCallback callback,
+                               void* callback_target,
+                               GCancellable* cancellable,
+                               CancellationCallback cancellation,
+                               void* cancellation_target,
+                               GeeHashSet* skipset);
+WorkSniffer* work_sniffer_construct (GType object_type,
+                                     BatchImport* owner,
+                                     GeeIterable* jobs,
+                                     CompletionCallback callback,
+                                     void* callback_target,
+                                     GCancellable* cancellable,
+                                     CancellationCallback cancellation,
+                                     void* cancellation_target,
+                                     GeeHashSet* skipset);
 GType work_sniffer_get_type (void) G_GNUC_CONST;
 static gboolean batch_import_on_sniffer_working (BatchImport* self);
 static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self);
 gpointer file_to_prepare_ref (gpointer instance);
 void file_to_prepare_unref (gpointer instance);
-GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_file_to_prepare (GValue* value, gpointer v_object);
-void value_take_file_to_prepare (GValue* value, gpointer v_object);
+GParamSpec* param_spec_file_to_prepare (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_file_to_prepare (GValue* value,
+                                gpointer v_object);
+void value_take_file_to_prepare (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_file_to_prepare (const GValue* value);
 GType file_to_prepare_get_type (void) G_GNUC_CONST;
 GType prepare_files_job_get_type (void) G_GNUC_CONST;
 gpointer notification_object_ref (gpointer instance);
 void notification_object_unref (gpointer instance);
-GParamSpec* param_spec_notification_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_notification_object (GValue* value, gpointer v_object);
-void value_take_notification_object (GValue* value, gpointer v_object);
+GParamSpec* param_spec_notification_object (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_notification_object (GValue* value,
+                                    gpointer v_object);
+void value_take_notification_object (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_notification_object (const GValue* value);
 GType notification_object_get_type (void) G_GNUC_CONST;
-static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user);
-static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self);
-static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self);
-static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
-PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target);
-PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target);
+static void batch_import_on_file_prepared (BatchImport* self,
+                                    BackgroundJob* j,
+                                    NotificationObject* user);
+static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job,
+                                                           NotificationObject* user,
+                                                           gpointer self);
+static void batch_import_on_files_prepared (BatchImport* self,
+                                     BackgroundJob* j);
+static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job,
+                                                          gpointer self);
+static void batch_import_on_file_prepare_cancelled (BatchImport* self,
+                                             BackgroundJob* j);
+static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job,
+                                                                    gpointer self);
+PrepareFilesJob* prepare_files_job_new (BatchImport* owner,
+                                        GeeList* files_to_prepare,
+                                        NotificationCallback notification,
+                                        void* notification_target,
+                                        CompletionCallback callback,
+                                        void* callback_target,
+                                        GCancellable* cancellable,
+                                        CancellationCallback cancellation,
+                                        void* cancellation_target);
+PrepareFilesJob* prepare_files_job_construct (GType object_type,
+                                              BatchImport* owner,
+                                              GeeList* files_to_prepare,
+                                              NotificationCallback notification,
+                                              void* notification_target,
+                                              CompletionCallback callback,
+                                              void* callback_target,
+                                              GCancellable* cancellable,
+                                              CancellationCallback cancellation,
+                                              void* cancellation_target);
 static void batch_import_flush_import_jobs (BatchImport* self);
 gint workers_get_pending_job_count (Workers* self);
-static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self);
-static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
-ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target);
-ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target);
+static void batch_import_on_thumbnail_writer_completed (BatchImport* self,
+                                                 BackgroundJob* j);
+static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job,
+                                                                      gpointer self);
+static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self,
+                                                 BackgroundJob* j);
+static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job,
+                                                                        gpointer self);
+ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner,
+                                              CompletedImportObject* completed_import_source,
+                                              CompletionCallback callback,
+                                              void* callback_target,
+                                              GCancellable* cancellable,
+                                              CancellationCallback cancel_callback,
+                                              void* cancel_callback_target);
+ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type,
+                                                    BatchImport* owner,
+                                                    CompletedImportObject* completed_import_source,
+                                                    CompletionCallback callback,
+                                                    void* callback_target,
+                                                    GCancellable* cancellable,
+                                                    CancellationCallback cancel_callback,
+                                                    void* cancel_callback_target);
 GType thumbnail_writer_job_get_type (void) G_GNUC_CONST;
-static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self);
-static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j);
-static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self);
-PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target);
-PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target);
+static void batch_import_on_import_files_completed (BatchImport* self,
+                                             BackgroundJob* j);
+static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job,
+                                                                  gpointer self);
+static void batch_import_on_import_files_cancelled (BatchImport* self,
+                                             BackgroundJob* j);
+static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job,
+                                                                    gpointer self);
+PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner,
+                                                     PreparedFile* prepared_file,
+                                                     ImportID* import_id,
+                                                     CompletionCallback callback,
+                                                     void* callback_target,
+                                                     GCancellable* cancellable,
+                                                     CancellationCallback cancellation,
+                                                     void* cancellation_target);
+PreparedFileImportJob* prepared_file_import_job_construct (GType object_type,
+                                                           BatchImport* owner,
+                                                           PreparedFile* prepared_file,
+                                                           ImportID* import_id,
+                                                           CompletionCallback callback,
+                                                           void* callback_target,
+                                                           GCancellable* cancellable,
+                                                           CancellationCallback cancellation,
+                                                           void* cancellation_target);
 GType prepared_file_import_job_get_type (void) G_GNUC_CONST;
-static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file);
+static GFile* batch_import_get_in_current_import (BatchImport* self,
+                                           PreparedFile* prepared_file);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 GType interlocked_notification_object_get_type (void) G_GNUC_CONST;
 GType prepared_file_cluster_get_type (void) G_GNUC_CONST;
-static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_);
-static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_);
+static void batch_import_process_prepared_files (BatchImport* self,
+                                          GeeList* list,
+                                          GAsyncReadyCallback _callback_,
+                                          gpointer _user_data_);
+static void batch_import_process_prepared_files_finish (BatchImport* self,
+                                                 GAsyncResult* _res_);
 static void batch_import_process_prepared_files_data_free (gpointer _data);
-static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data);
+static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object,
+                                                              GAsyncResult *res,
+                                                              void *user_data);
 static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_);
 static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self);
 GType library_photo_source_collection_state_get_type (void) G_GNUC_CONST;
@@ -1946,7 +2186,9 @@ GType source_collection_get_type (void) G_GNUC_CONST;
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
-LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self, GFile* file, LibraryPhotoSourceCollectionState* state);
+LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSourceCollection* self,
+                                                                 GFile* file,
+                                                                 LibraryPhotoSourceCollectionState* state);
 DuplicatedFile* duplicated_file_create_from_file (GFile* file);
 GFile* media_source_get_master_file (MediaSource* self);
 void media_source_mark_online (MediaSource* self);
@@ -1955,100 +2197,175 @@ GType video_source_collection_state_get_type (void) G_GNUC_CONST;
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 GType video_source_collection_get_type (void) G_GNUC_CONST;
-Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, GFile* file, VideoSourceCollectionState* state);
+Video* video_source_collection_get_state_by_file (VideoSourceCollection* self,
+                                                  GFile* file,
+                                                  VideoSourceCollectionState* state);
 const gchar* video_source_collection_state_to_string (VideoSourceCollectionState self);
-gboolean video_is_duplicate (GFile* file, const gchar* full_md5);
+gboolean video_is_duplicate (GFile* file,
+                             const gchar* full_md5);
 GType video_id_get_type (void) G_GNUC_CONST;
 VideoID* video_id_dup (const VideoID* self);
 void video_id_free (VideoID* self);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_database_table (GValue* value, gpointer v_object);
-void value_take_database_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_database_table (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_database_table (GValue* value,
+                               gpointer v_object);
+void value_take_database_table (GValue* value,
+                                gpointer v_object);
 gpointer value_get_database_table (const GValue* value);
 GType database_table_get_type (void) G_GNUC_CONST;
 GType video_table_get_type (void) G_GNUC_CONST;
 VideoTable* video_table_get_instance (void);
-VideoID* video_table_get_duplicate_ids (VideoTable* self, GFile* file, const gchar* md5, int* result_length1);
+VideoID* video_table_get_duplicate_ids (VideoTable* self,
+                                        GFile* file,
+                                        const gchar* md5,
+                                        int* result_length1);
 DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id);
 gpointer source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+                                    gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_source_holding_tank (const GValue* value);
 GType source_holding_tank_get_type (void) G_GNUC_CONST;
 GType database_source_holding_tank_get_type (void) G_GNUC_CONST;
 GType media_source_holding_tank_get_type (void) G_GNUC_CONST;
 MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self);
-MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file);
-MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5);
+MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self,
+                                                             GFile* file);
+MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self,
+                                                     const gchar* md5);
 GType monitorable_get_type (void) G_GNUC_CONST;
-void monitorable_set_master_file (Monitorable* self, GFile* file);
+void monitorable_set_master_file (Monitorable* self,
+                                  GFile* file);
 guint64 media_source_get_filesize (MediaSource* self);
-gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
-LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self, GFile* file);
-LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5);
+gboolean photo_is_duplicate (GFile* file,
+                             const gchar* thumbnail_md5,
+                             const gchar* full_md5,
+                             PhotoFileFormat file_format);
+LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoSourceCollection* self,
+                                                                   GFile* file);
+LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSourceCollection* self,
+                                                                  const gchar* md5);
 void media_source_untrash (MediaSource* self);
 void photo_remove_all_transformations (Photo* self);
-LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self, GFile* file);
-LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self, const gchar* md5);
+LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoSourceCollection* self,
+                                                                   GFile* file);
+LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSourceCollection* self,
+                                                                  const gchar* md5);
 GType photo_id_get_type (void) G_GNUC_CONST;
 PhotoID* photo_id_dup (const PhotoID* self);
 void photo_id_free (PhotoID* self);
 GType photo_table_get_type (void) G_GNUC_CONST;
 PhotoTable* photo_table_get_instance (void);
-PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format, int* result_length1);
+PhotoID* photo_table_get_duplicate_ids (PhotoTable* self,
+                                        GFile* file,
+                                        const gchar* thumbnail_md5,
+                                        const gchar* md5,
+                                        PhotoFileFormat file_format,
+                                        int* result_length1);
 DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id);
-static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller);
+static void batch_import_done_preparing_files (BatchImport* self,
+                                        BackgroundJob* j,
+                                        const gchar* caller);
 gpointer ready_for_import_ref (gpointer instance);
 void ready_for_import_unref (gpointer instance);
-GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_ready_for_import (GValue* value, gpointer v_object);
-void value_take_ready_for_import (GValue* value, gpointer v_object);
+GParamSpec* param_spec_ready_for_import (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_ready_for_import (GValue* value,
+                                 gpointer v_object);
+void value_take_ready_for_import (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_ready_for_import (const GValue* value);
 GType ready_for_import_get_type (void) G_GNUC_CONST;
 gpointer photo_import_params_ref (gpointer instance);
 void photo_import_params_unref (gpointer instance);
-GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_import_params (GValue* value, gpointer v_object);
-void value_take_photo_import_params (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_import_params (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_photo_import_params (GValue* value,
+                                    gpointer v_object);
+void value_take_photo_import_params (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_photo_import_params (const GValue* value);
 GType photo_import_params_get_type (void) G_GNUC_CONST;
 gpointer video_import_params_ref (gpointer instance);
 void video_import_params_unref (gpointer instance);
-GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_video_import_params (GValue* value, gpointer v_object);
-void value_take_video_import_params (GValue* value, gpointer v_object);
+GParamSpec* param_spec_video_import_params (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_video_import_params (GValue* value,
+                                    gpointer v_object);
+void value_take_video_import_params (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_video_import_params (const GValue* value);
 GType video_import_params_get_type (void) G_GNUC_CONST;
 GType tombstone_get_type (void) G_GNUC_CONST;
 GType tombstone_source_collection_get_type (void) G_GNUC_CONST;
-Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self, GFile* file);
-void tombstone_source_collection_resurrect (TombstoneSourceCollection* self, Tombstone* tombstone);
-ImportResult video_import_create (VideoImportParams* params, Video* * video);
-ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhoto* * photo);
+Tombstone* tombstone_source_collection_locate (TombstoneSourceCollection* self,
+                                               GFile* file);
+void tombstone_source_collection_resurrect (TombstoneSourceCollection* self,
+                                            Tombstone* tombstone);
+ImportResult video_import_create (VideoImportParams* params,
+                                  Video* * video);
+ImportResult library_photo_import_create (PhotoImportParams* params,
+                                          LibraryPhoto* * photo);
 GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST;
 gpointer thumbnails_ref (gpointer instance);
 void thumbnails_unref (gpointer instance);
-GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_thumbnails (GValue* value, gpointer v_object);
-void value_take_thumbnails (GValue* value, gpointer v_object);
+GParamSpec* param_spec_thumbnails (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_thumbnails (GValue* value,
+                           gpointer v_object);
+void value_take_thumbnails (GValue* value,
+                            gpointer v_object);
 gpointer value_get_thumbnails (const GValue* value);
 GType thumbnails_get_type (void) G_GNUC_CONST;
 gpointer photo_row_ref (gpointer instance);
 void photo_row_unref (gpointer instance);
-GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_row (GValue* value, gpointer v_object);
-void value_take_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_row (const gchar* name,
+                                  const gchar* nick,
+                                  const gchar* blurb,
+                                  GType object_type,
+                                  GParamFlags flags);
+void value_set_photo_row (GValue* value,
+                          gpointer v_object);
+void value_take_photo_row (GValue* value,
+                           gpointer v_object);
 gpointer value_get_photo_row (const GValue* value);
 GType photo_row_get_type (void) G_GNUC_CONST;
 gpointer backing_photo_row_ref (gpointer instance);
 void backing_photo_row_unref (gpointer instance);
-GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_backing_photo_row (GValue* value, gpointer v_object);
-void value_take_backing_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_photo_row (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_backing_photo_row (GValue* value,
+                                  gpointer v_object);
+void value_take_backing_photo_row (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_backing_photo_row (const GValue* value);
 GType backing_photo_row_get_type (void) G_GNUC_CONST;
 BackingPhotoRow* backing_photo_row_new (void);
@@ -2061,27 +2378,48 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 GType orientation_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
-void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error);
+void photo_add_backing_photo_for_development (Photo* self,
+                                              RawDeveloper d,
+                                              BackingPhotoRow* bpr,
+                                              gboolean notify,
+                                              GError** error);
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
-void photo_set_default_raw_developer (Photo* self, RawDeveloper d);
-void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
+gboolean photo_is_raw_developer_available (Photo* self,
+                                           RawDeveloper d);
+void photo_set_default_raw_developer (Photo* self,
+                                      RawDeveloper d);
+void photo_set_raw_developer (Photo* self,
+                              RawDeveloper d,
+                              gboolean notify);
 Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self);
-CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result);
-CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result);
+CompletedImportObject* completed_import_object_new (MediaSource* source,
+                                                    Thumbnails* thumbnails,
+                                                    BatchImportJob* original_job,
+                                                    BatchImportResult* import_result);
+CompletedImportObject* completed_import_object_construct (GType object_type,
+                                                          MediaSource* source,
+                                                          Thumbnails* thumbnails,
+                                                          BatchImportJob* original_job,
+                                                          BatchImportResult* import_result);
 BatchImportResult* ready_for_import_abort (ReadyForImport* self);
 gchar* data_object_to_string (DataObject* self);
 void library_photo_import_failed (LibraryPhoto* photo);
 void video_import_failed (Video* video);
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+                                          gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+                                           gpointer v_object);
 gpointer value_get_media_collection_registry (const GValue* value);
 GType media_collection_registry_get_type (void) G_GNUC_CONST;
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
@@ -2090,185 +2428,342 @@ GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType event_source_collection_get_type (void) G_GNUC_CONST;
 void data_collection_freeze_notifications (DataCollection* self);
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
-void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media);
-void event_generate_many_events (GeeCollection* sources, ViewCollection* events_so_far);
+void media_source_collection_import_many (MediaSourceCollection* self,
+                                          GeeCollection* media);
+void event_generate_many_events (GeeCollection* sources,
+                                 ViewCollection* events_so_far);
 void data_collection_thaw_notifications (DataCollection* self);
 void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self);
 guint64 media_source_get_master_filesize (MediaSource* self);
-static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
+                                                      GValue * return_value,
+                                                      guint n_param_values,
+                                                      const GValue * param_values,
+                                                      gpointer invocation_hint,
+                                                      gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure,
+                                                GValue * return_value,
+                                                guint n_param_values,
+                                                const GValue * param_values,
+                                                gpointer invocation_hint,
+                                                gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure,
+                                                        GValue * return_value,
+                                                        guint n_param_values,
+                                                        const GValue * param_values,
+                                                        gpointer invocation_hint,
+                                                        gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure,
+                                                                      GValue * return_value,
+                                                                      guint n_param_values,
+                                                                      const GValue * param_values,
+                                                                      gpointer invocation_hint,
+                                                                      gpointer marshal_data);
 static void batch_import_finalize (GObject * obj);
 #define DUPLICATED_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DUPLICATED_FILE, DuplicatedFilePrivate))
-enum  {
-	DUPLICATED_FILE_DUMMY_PROPERTY
-};
 static DuplicatedFile* duplicated_file_new (void);
 static DuplicatedFile* duplicated_file_construct (GType object_type);
 gboolean photo_id_is_valid (PhotoID *self);
 gboolean video_id_is_valid (VideoID *self);
 GFile* duplicated_file_get_file (DuplicatedFile* self);
-LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id);
-Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* video_id);
+LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self,
+                                                     PhotoID* photo_id);
+Video* video_source_collection_fetch (VideoSourceCollection* self,
+                                      VideoID* video_id);
 static void duplicated_file_finalize (GObject * obj);
-enum  {
-	BACKGROUND_IMPORT_JOB_DUMMY_PROPERTY
-};
-BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target);
+BackgroundImportJob* background_import_job_construct (GType object_type,
+                                                      BatchImport* owner,
+                                                      CompletionCallback callback,
+                                                      void* callback_target,
+                                                      GCancellable* cancellable,
+                                                      CancellationCallback cancellation,
+                                                      void* cancellation_target);
 gpointer abstract_semaphore_ref (gpointer instance);
 void abstract_semaphore_unref (gpointer instance);
-GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_abstract_semaphore (GValue* value, gpointer v_object);
-void value_take_abstract_semaphore (GValue* value, gpointer v_object);
+GParamSpec* param_spec_abstract_semaphore (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_abstract_semaphore (GValue* value,
+                                   gpointer v_object);
+void value_take_abstract_semaphore (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_abstract_semaphore (const GValue* value);
 GType abstract_semaphore_get_type (void) G_GNUC_CONST;
-BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
+BackgroundJob* background_job_construct (GType object_type,
+                                         GObject* owner,
+                                         CompletionCallback callback,
+                                         void* callback_target,
+                                         GCancellable* cancellable,
+                                         CancellationCallback cancellation,
+                                         void* cancellation_target,
+                                         AbstractSemaphore* completion_semaphore);
 ImportResult background_import_job_abort_check (BackgroundImportJob* self);
 gboolean background_job_is_cancelled (BackgroundJob* self);
-void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_);
-void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_);
-void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result);
+void background_import_job_abort (BackgroundImportJob* self,
+                                  ImportResult _result_);
+void background_import_job_report_failure (BackgroundImportJob* self,
+                                           BatchImportJob* job,
+                                           GFile* file,
+                                           const gchar* src_identifier,
+                                           const gchar* dest_identifier,
+                                           ImportResult _result_);
+void background_import_job_report_error (BackgroundImportJob* self,
+                                         BatchImportJob* job,
+                                         GFile* file,
+                                         const gchar* src_identifier,
+                                         const gchar* dest_identifier,
+                                         GError* err,
+                                         ImportResult default_result);
 static void background_import_job_finalize (BackgroundJob * obj);
-enum  {
-	FILE_TO_PREPARE_DUMMY_PROPERTY
-};
-FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library);
-FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library);
-void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a);
+FileToPrepare* file_to_prepare_new (BatchImportJob* job,
+                                    GFile* file,
+                                    gboolean copy_to_library);
+FileToPrepare* file_to_prepare_construct (GType object_type,
+                                          BatchImportJob* job,
+                                          GFile* file,
+                                          gboolean copy_to_library);
+void file_to_prepare_set_associated (FileToPrepare* self,
+                                     FileToPrepare* a);
 gchar* file_to_prepare_get_parent_path (FileToPrepare* self);
 gchar* file_to_prepare_get_path (FileToPrepare* self);
 gchar* file_to_prepare_get_basename (FileToPrepare* self);
 gboolean file_to_prepare_is_directory (FileToPrepare* self);
 static void file_to_prepare_finalize (FileToPrepare * obj);
 #define WORK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WORK_SNIFFER, WorkSnifferPrivate))
-enum  {
-	WORK_SNIFFER_DUMMY_PROPERTY
-};
 static void work_sniffer_real_execute (BackgroundJob* base);
-static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error);
-static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
-gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
+static void work_sniffer_sniff_job (WorkSniffer* self,
+                             BatchImportJob* job,
+                             GError** error);
+static gint __lambda11_ (WorkSniffer* self,
+                  FileToPrepare* a,
+                  FileToPrepare* b);
+gint utf8_cs_compare (void* a,
+                      void* b);
+static gint ___lambda11__gcompare_data_func (gconstpointer a,
+                                      gconstpointer b,
+                                      gpointer self);
+void disassemble_filename (const gchar* basename,
+                           gchar* * name,
+                           gchar* * ext);
 gboolean is_string_empty (const gchar* s);
 gpointer photo_file_format_properties_ref (gpointer instance);
 void photo_file_format_properties_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
-void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_format_properties (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags);
+void value_set_photo_file_format_properties (GValue* value,
+                                             gpointer v_object);
+void value_take_photo_file_format_properties (GValue* value,
+                                              gpointer v_object);
 gpointer value_get_photo_file_format_properties (const GValue* value);
 GType photo_file_format_properties_get_type (void) G_GNUC_CONST;
 GType raw_file_format_properties_get_type (void) G_GNUC_CONST;
 RawFileFormatProperties* raw_file_format_properties_get_instance (void);
-gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext);
-static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired);
+gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self,
+                                                               const gchar* ext);
+static gboolean work_sniffer_is_paired (WorkSniffer* self,
+                                 FileToPrepare* raw,
+                                 FileToPrepare* maybe_paired);
 GType jfif_file_format_properties_get_type (void) G_GNUC_CONST;
 JfifFileFormatProperties* jfif_file_format_properties_get_instance (void);
-void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error);
+void work_sniffer_search_dir (WorkSniffer* self,
+                              BatchImportJob* job,
+                              GFile* dir,
+                              gboolean copy_to_library,
+                              gboolean recurse,
+                              GError** error);
 GCancellable* background_job_get_cancellable (BackgroundJob* self);
 gboolean photo_is_file_image (GFile* file);
 gboolean photo_file_format_is_file_supported (GFile* file);
 gboolean video_reader_is_supported_video_file (GFile* file);
 static void work_sniffer_finalize (BackgroundJob * obj);
-enum  {
-	PREPARED_FILE_DUMMY_PROPERTY
-};
-PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video);
-PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video);
+PreparedFile* prepared_file_new (BatchImportJob* job,
+                                 GFile* file,
+                                 GFile* associated_file,
+                                 const gchar* source_id,
+                                 const gchar* dest_id,
+                                 gboolean copy_to_library,
+                                 const gchar* exif_md5,
+                                 const gchar* thumbnail_md5,
+                                 const gchar* full_md5,
+                                 PhotoFileFormat file_format,
+                                 guint64 filesize,
+                                 gboolean is_video);
+PreparedFile* prepared_file_construct (GType object_type,
+                                       BatchImportJob* job,
+                                       GFile* file,
+                                       GFile* associated_file,
+                                       const gchar* source_id,
+                                       const gchar* dest_id,
+                                       gboolean copy_to_library,
+                                       const gchar* exif_md5,
+                                       const gchar* thumbnail_md5,
+                                       const gchar* full_md5,
+                                       PhotoFileFormat file_format,
+                                       guint64 filesize,
+                                       gboolean is_video);
 static void prepared_file_finalize (PreparedFile * obj);
-enum  {
-	PREPARED_FILE_CLUSTER_DUMMY_PROPERTY
-};
 PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list);
-PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list);
+PreparedFileCluster* prepared_file_cluster_construct (GType object_type,
+                                                      GeeArrayList* list);
 InterlockedNotificationObject* interlocked_notification_object_construct (GType object_type);
 static void prepared_file_cluster_finalize (NotificationObject * obj);
 #define PREPARE_FILES_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARE_FILES_JOB, PrepareFilesJobPrivate))
-enum  {
-	PREPARE_FILES_JOB_DUMMY_PROPERTY
-};
 GFile* app_dirs_get_import_dir (void);
 static gint prepare_files_job_get_test_variable (const gchar* name);
-void background_job_set_notification_priority (BackgroundJob* self, gint priority);
+void background_job_set_notification_priority (BackgroundJob* self,
+                                               gint priority);
 static void prepare_files_job_real_execute (BackgroundJob* base);
-static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library);
-static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file);
-void background_job_notify (BackgroundJob* self, NotificationCallback callback, void* callback_target, NotificationObject* user);
-gchar* md5_file (GFile* file, GError** error);
+static gboolean prepare_files_job_create_file (PrepareFilesJob* self,
+                                        BatchImportJob* job,
+                                        GFile* * file,
+                                        gboolean* copy_to_library);
+static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self,
+                                             BatchImportJob* job,
+                                             GFile* file,
+                                             GFile* associated_file,
+                                             gboolean copy_to_library,
+                                             PreparedFile* * prepared_file);
+void background_job_notify (BackgroundJob* self,
+                            NotificationCallback callback,
+                            void* callback_target,
+                            NotificationObject* user);
+gchar* md5_file (GFile* file,
+                 GError** error);
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file);
 gpointer photo_file_adapter_ref (gpointer instance);
 void photo_file_adapter_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_adapter (GValue* value, gpointer v_object);
-void value_take_photo_file_adapter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_file_adapter (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_photo_file_adapter (GValue* value,
+                                   gpointer v_object);
+void value_take_photo_file_adapter (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_photo_file_adapter (const GValue* value);
 GType photo_file_adapter_get_type (void) G_GNUC_CONST;
 GType photo_file_reader_get_type (void) G_GNUC_CONST;
-PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath);
+PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self,
+                                                  const gchar* filepath);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+                               gpointer v_object);
+void value_take_media_metadata (GValue* value,
+                                gpointer v_object);
 gpointer value_get_media_metadata (const GValue* value);
 GType media_metadata_get_type (void) G_GNUC_CONST;
 GType photo_metadata_get_type (void) G_GNUC_CONST;
-PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
+PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self,
+                                                GError** error);
 gchar* photo_metadata_exif_hash (PhotoMetadata* self);
 gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
 static void prepare_files_job_finalize (BackgroundJob * obj);
-enum  {
-	READY_FOR_IMPORT_DUMMY_PROPERTY
-};
-ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result);
-ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result);
+ReadyForImport* ready_for_import_new (GFile* final_file,
+                                      PreparedFile* prepared_file,
+                                      PhotoImportParams* photo_import_params,
+                                      VideoImportParams* video_import_params,
+                                      BatchImportResult* batch_result);
+ReadyForImport* ready_for_import_construct (GType object_type,
+                                            GFile* final_file,
+                                            PreparedFile* prepared_file,
+                                            PhotoImportParams* photo_import_params,
+                                            VideoImportParams* video_import_params,
+                                            BatchImportResult* batch_result);
 gpointer video_row_ref (gpointer instance);
 void video_row_unref (gpointer instance);
-GParamSpec* param_spec_video_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_video_row (GValue* value, gpointer v_object);
-void value_take_video_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_video_row (const gchar* name,
+                                  const gchar* nick,
+                                  const gchar* blurb,
+                                  GType object_type,
+                                  GParamFlags flags);
+void value_set_video_row (GValue* value,
+                          gpointer v_object);
+void value_take_video_row (GValue* value,
+                           gpointer v_object);
 gpointer value_get_video_row (const GValue* value);
 GType video_row_get_type (void) G_GNUC_CONST;
 static void ready_for_import_finalize (ReadyForImport * obj);
 #define PREPARED_FILE_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJobPrivate))
-enum  {
-	PREPARED_FILE_IMPORT_JOB_DUMMY_PROPERTY
-};
-void background_job_set_completion_priority (BackgroundJob* self, gint priority);
+void background_job_set_completion_priority (BackgroundJob* self,
+                                             gint priority);
 static void prepared_file_import_job_real_execute (BackgroundJob* base);
-GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error);
+GFile* library_files_duplicate (GFile* src,
+                                GFileProgressCallback progress_callback,
+                                void* progress_callback_target,
+                                gboolean blacklist,
+                                GError** error);
 Thumbnails* thumbnails_new (void);
 Thumbnails* thumbnails_construct (GType object_type);
-VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
-VideoImportParams* video_import_params_construct (GType object_type, GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override);
+VideoImportParams* video_import_params_new (GFile* file,
+                                            ImportID* import_id,
+                                            const gchar* md5,
+                                            Thumbnails* thumbnails,
+                                            time_t exposure_time_override);
+VideoImportParams* video_import_params_construct (GType object_type,
+                                                  GFile* file,
+                                                  ImportID* import_id,
+                                                  const gchar* md5,
+                                                  Thumbnails* thumbnails,
+                                                  time_t exposure_time_override);
 ImportResult video_reader_prepare_for_import (VideoImportParams* params);
-PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
-PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails);
+PhotoImportParams* photo_import_params_new (GFile* file,
+                                            GFile* final_associated_file,
+                                            ImportID* import_id,
+                                            PhotoFileSnifferOptions sniffer_options,
+                                            const gchar* exif_md5,
+                                            const gchar* thumbnail_md5,
+                                            const gchar* full_md5,
+                                            Thumbnails* thumbnails);
+PhotoImportParams* photo_import_params_construct (GType object_type,
+                                                  GFile* file,
+                                                  GFile* final_associated_file,
+                                                  ImportID* import_id,
+                                                  PhotoFileSnifferOptions sniffer_options,
+                                                  const gchar* exif_md5,
+                                                  const gchar* thumbnail_md5,
+                                                  const gchar* full_md5,
+                                                  Thumbnails* thumbnails);
 ImportResult photo_prepare_for_import (PhotoImportParams* params);
 static void prepared_file_import_job_finalize (BackgroundJob * obj);
-enum  {
-	COMPLETED_IMPORT_OBJECT_DUMMY_PROPERTY
-};
 GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
-GdkPixbuf* thumbnails_get (Thumbnails* self, ThumbnailCacheSize size);
+GdkPixbuf* thumbnails_get (Thumbnails* self,
+                           ThumbnailCacheSize size);
 static void completed_import_object_finalize (CompletedImportObject * obj);
-enum  {
-	THUMBNAIL_WRITER_JOB_DUMMY_PROPERTY
-};
 static void thumbnail_writer_job_real_execute (BackgroundJob* base);
-void thumbnail_cache_import_thumbnails (ThumbnailSource* source, Thumbnails* thumbnails, gboolean force, GError** error);
+void thumbnail_cache_import_thumbnails (ThumbnailSource* source,
+                                        Thumbnails* thumbnails,
+                                        gboolean force,
+                                        GError** error);
 static void thumbnail_writer_job_finalize (BackgroundJob * obj);
 
 
-gchar* import_result_to_string (ImportResult self) {
+gchar*
+import_result_to_string (ImportResult self)
+{
 	gchar* result = NULL;
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (self) {
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 2272 "BatchImport.c"
+#line 2767 "BatchImport.c"
 		{
 			gchar* _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2277,11 +2772,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2281 "BatchImport.c"
+#line 2776 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_ERROR:
-#line 2285 "BatchImport.c"
+#line 2780 "BatchImport.c"
 		{
 			gchar* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2290,11 +2785,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2294 "BatchImport.c"
+#line 2789 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DECODE_ERROR:
-#line 2298 "BatchImport.c"
+#line 2793 "BatchImport.c"
 		{
 			gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2303,11 +2798,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2307 "BatchImport.c"
+#line 2802 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DATABASE_ERROR:
-#line 2311 "BatchImport.c"
+#line 2806 "BatchImport.c"
 		{
 			gchar* _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2316,11 +2811,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2320 "BatchImport.c"
+#line 2815 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2324 "BatchImport.c"
+#line 2819 "BatchImport.c"
 		{
 			gchar* _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2329,11 +2824,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2333 "BatchImport.c"
+#line 2828 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_A_FILE:
-#line 2337 "BatchImport.c"
+#line 2832 "BatchImport.c"
 		{
 			gchar* _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2342,11 +2837,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2346 "BatchImport.c"
+#line 2841 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 2350 "BatchImport.c"
+#line 2845 "BatchImport.c"
 		{
 			gchar* _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2355,11 +2850,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2359 "BatchImport.c"
+#line 2854 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 2363 "BatchImport.c"
+#line 2858 "BatchImport.c"
 		{
 			gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2368,11 +2863,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2372 "BatchImport.c"
+#line 2867 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 2376 "BatchImport.c"
+#line 2871 "BatchImport.c"
 		{
 			gchar* _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2381,11 +2876,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2385 "BatchImport.c"
+#line 2880 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2389 "BatchImport.c"
+#line 2884 "BatchImport.c"
 		{
 			gchar* _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2394,11 +2889,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2398 "BatchImport.c"
+#line 2893 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FULL:
-#line 2402 "BatchImport.c"
+#line 2897 "BatchImport.c"
 		{
 			gchar* _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2407,11 +2902,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2411 "BatchImport.c"
+#line 2906 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 2415 "BatchImport.c"
+#line 2910 "BatchImport.c"
 		{
 			gchar* _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2420,11 +2915,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2424 "BatchImport.c"
+#line 2919 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 2428 "BatchImport.c"
+#line 2923 "BatchImport.c"
 		{
 			gchar* _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2433,11 +2928,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2437 "BatchImport.c"
+#line 2932 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 2441 "BatchImport.c"
+#line 2936 "BatchImport.c"
 		{
 			gchar* _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2446,7 +2941,7 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2450 "BatchImport.c"
+#line 2945 "BatchImport.c"
 		}
 		default:
 		{
@@ -2457,13 +2952,15 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp14_;
 #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2461 "BatchImport.c"
+#line 2956 "BatchImport.c"
 		}
 	}
 }
 
 
-gboolean import_result_is_abort (ImportResult self) {
+gboolean
+import_result_is_abort (ImportResult self)
+{
 	gboolean result = FALSE;
 #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (self) {
@@ -2473,13 +2970,13 @@ gboolean import_result_is_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FAILURE:
 #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2477 "BatchImport.c"
+#line 2974 "BatchImport.c"
 		{
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2483 "BatchImport.c"
+#line 2980 "BatchImport.c"
 		}
 		default:
 		{
@@ -2487,13 +2984,15 @@ gboolean import_result_is_abort (ImportResult self) {
 			result = FALSE;
 #line 80 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2491 "BatchImport.c"
+#line 2988 "BatchImport.c"
 		}
 	}
 }
 
 
-gboolean import_result_is_nonuser_abort (ImportResult self) {
+gboolean
+import_result_is_nonuser_abort (ImportResult self)
+{
 	gboolean result = FALSE;
 #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (self) {
@@ -2501,13 +3000,13 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FULL:
 #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2505 "BatchImport.c"
+#line 3004 "BatchImport.c"
 		{
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2511 "BatchImport.c"
+#line 3010 "BatchImport.c"
 		}
 		default:
 		{
@@ -2515,101 +3014,99 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 			result = FALSE;
 #line 91 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2519 "BatchImport.c"
+#line 3018 "BatchImport.c"
 		}
 	}
 }
 
 
-static gpointer _g_error_copy0 (gpointer self) {
+static gpointer
+_g_error_copy0 (gpointer self)
+{
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2528 "BatchImport.c"
+#line 3029 "BatchImport.c"
 }
 
 
-ImportResult import_result_convert_error (GError* err, ImportResult default_result) {
+ImportResult
+import_result_convert_error (GError* err,
+                             ImportResult default_result)
+{
 	ImportResult result = 0;
-	GError* _tmp0_;
-	ImportResult _tmp32_;
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = err;
-#line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp0_->domain == G_FILE_ERROR) {
-#line 2540 "BatchImport.c"
+	if (err->domain == G_FILE_ERROR) {
+#line 3040 "BatchImport.c"
 		GError* ferr = NULL;
+		GError* _tmp0_;
 		GError* _tmp1_;
-		GError* _tmp2_;
-		GError* _tmp3_;
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp1_ = err;
+		_tmp0_ = _g_error_copy0 ((GError*) err);
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = _g_error_copy0 ((GError*) _tmp1_);
-#line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		ferr = _tmp2_;
+		ferr = _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = ferr;
+		_tmp1_ = ferr;
 #line 99 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (g_error_matches (_tmp3_, G_FILE_ERROR, G_FILE_ERROR_NOSPC)) {
+		if (g_error_matches (_tmp1_, G_FILE_ERROR, G_FILE_ERROR_NOSPC)) {
 #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_DISK_FULL;
 #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (ferr);
 #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2561 "BatchImport.c"
+#line 3058 "BatchImport.c"
 		} else {
-			GError* _tmp4_;
+			GError* _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = ferr;
+			_tmp2_ = ferr;
 #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (g_error_matches (_tmp4_, G_FILE_ERROR, G_FILE_ERROR_IO)) {
+			if (g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_IO)) {
 #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				result = IMPORT_RESULT_DISK_FAILURE;
 #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (ferr);
 #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2574 "BatchImport.c"
+#line 3071 "BatchImport.c"
 			} else {
-				GError* _tmp5_;
+				GError* _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp5_ = ferr;
+				_tmp3_ = ferr;
 #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (g_error_matches (_tmp5_, G_FILE_ERROR, G_FILE_ERROR_ISDIR)) {
+				if (g_error_matches (_tmp3_, G_FILE_ERROR, G_FILE_ERROR_ISDIR)) {
 #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					result = IMPORT_RESULT_NOT_A_FILE;
 #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (ferr);
 #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2587 "BatchImport.c"
+#line 3084 "BatchImport.c"
 				} else {
-					GError* _tmp6_;
+					GError* _tmp4_;
 #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp6_ = ferr;
+					_tmp4_ = ferr;
 #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_ACCES)) {
+					if (g_error_matches (_tmp4_, G_FILE_ERROR, G_FILE_ERROR_ACCES)) {
 #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						result = IMPORT_RESULT_FILE_WRITE_ERROR;
 #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_error_free0 (ferr);
 #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2600 "BatchImport.c"
+#line 3097 "BatchImport.c"
 					} else {
-						GError* _tmp7_;
+						GError* _tmp5_;
 #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp7_ = ferr;
+						_tmp5_ = ferr;
 #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (g_error_matches (_tmp7_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
+						if (g_error_matches (_tmp5_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
 #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							result = IMPORT_RESULT_FILE_WRITE_ERROR;
 #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_error_free0 (ferr);
 #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2613 "BatchImport.c"
+#line 3110 "BatchImport.c"
 						} else {
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							result = IMPORT_RESULT_FILE_ERROR;
@@ -2617,7 +3114,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ferr);
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2621 "BatchImport.c"
+#line 3118 "BatchImport.c"
 						}
 					}
 				}
@@ -2625,100 +3122,94 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 		}
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (ferr);
-#line 2629 "BatchImport.c"
+#line 3126 "BatchImport.c"
 	} else {
-		GError* _tmp8_;
-#line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = err;
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp8_->domain == G_IO_ERROR) {
-#line 2636 "BatchImport.c"
+		if (err->domain == G_IO_ERROR) {
+#line 3130 "BatchImport.c"
 			GError* ioerr = NULL;
-			GError* _tmp9_;
-			GError* _tmp10_;
-			GError* _tmp11_;
+			GError* _tmp6_;
+			GError* _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = err;
+			_tmp6_ = _g_error_copy0 ((GError*) err);
 #line 112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = _g_error_copy0 ((GError*) _tmp9_);
-#line 112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			ioerr = _tmp10_;
+			ioerr = _tmp6_;
 #line 114 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp11_ = ioerr;
+			_tmp7_ = ioerr;
 #line 114 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (g_error_matches (_tmp11_, G_IO_ERROR, G_IO_ERROR_NO_SPACE)) {
+			if (g_error_matches (_tmp7_, G_IO_ERROR, G_IO_ERROR_NO_SPACE)) {
 #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				result = IMPORT_RESULT_DISK_FULL;
 #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (ioerr);
 #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2657 "BatchImport.c"
+#line 3148 "BatchImport.c"
 			} else {
-				GError* _tmp12_;
+				GError* _tmp8_;
 #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = ioerr;
+				_tmp8_ = ioerr;
 #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_FAILED)) {
+				if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_FAILED)) {
 #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					result = IMPORT_RESULT_DISK_FAILURE;
 #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (ioerr);
 #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2670 "BatchImport.c"
+#line 3161 "BatchImport.c"
 				} else {
-					GError* _tmp13_;
+					GError* _tmp9_;
 #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp13_ = ioerr;
+					_tmp9_ = ioerr;
 #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (g_error_matches (_tmp13_, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY)) {
+					if (g_error_matches (_tmp9_, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY)) {
 #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						result = IMPORT_RESULT_NOT_A_FILE;
 #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_error_free0 (ioerr);
 #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2683 "BatchImport.c"
+#line 3174 "BatchImport.c"
 					} else {
-						GError* _tmp14_;
+						GError* _tmp10_;
 #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp14_ = ioerr;
+						_tmp10_ = ioerr;
 #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (g_error_matches (_tmp14_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+						if (g_error_matches (_tmp10_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							result = IMPORT_RESULT_USER_ABORT;
 #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_error_free0 (ioerr);
 #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2696 "BatchImport.c"
+#line 3187 "BatchImport.c"
 						} else {
-							GError* _tmp15_;
+							GError* _tmp11_;
 #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp15_ = ioerr;
+							_tmp11_ = ioerr;
 #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							if (g_error_matches (_tmp15_, G_IO_ERROR, G_IO_ERROR_READ_ONLY)) {
+							if (g_error_matches (_tmp11_, G_IO_ERROR, G_IO_ERROR_READ_ONLY)) {
 #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								result = IMPORT_RESULT_FILE_WRITE_ERROR;
 #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_g_error_free0 (ioerr);
 #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2709 "BatchImport.c"
+#line 3200 "BatchImport.c"
 							} else {
-								GError* _tmp16_;
+								GError* _tmp12_;
 #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								_tmp16_ = ioerr;
+								_tmp12_ = ioerr;
 #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								if (g_error_matches (_tmp16_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
+								if (g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									result = IMPORT_RESULT_FILE_WRITE_ERROR;
 #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									_g_error_free0 (ioerr);
 #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2722 "BatchImport.c"
+#line 3213 "BatchImport.c"
 								} else {
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									result = IMPORT_RESULT_FILE_ERROR;
@@ -2726,7 +3217,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (ioerr);
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2730 "BatchImport.c"
+#line 3221 "BatchImport.c"
 								}
 							}
 						}
@@ -2735,138 +3226,110 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 			}
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (ioerr);
-#line 2739 "BatchImport.c"
+#line 3230 "BatchImport.c"
 		} else {
-			GError* _tmp17_;
-#line 128 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp17_ = err;
 #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp17_->domain == GPHOTO_ERROR) {
+			if (err->domain == GPHOTO_ERROR) {
 #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				result = IMPORT_RESULT_CAMERA_ERROR;
 #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2750 "BatchImport.c"
+#line 3238 "BatchImport.c"
 			} else {
-				GError* _tmp18_;
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = err;
-#line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp18_->domain == GDK_PIXBUF_ERROR) {
-#line 2757 "BatchImport.c"
+				if (err->domain == GDK_PIXBUF_ERROR) {
+#line 3242 "BatchImport.c"
 					GError* pixbuferr = NULL;
-					GError* _tmp19_;
-					GError* _tmp20_;
-					GError* _tmp21_;
-#line 131 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp19_ = err;
+					GError* _tmp13_;
+					GError* _tmp14_;
 #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp20_ = _g_error_copy0 ((GError*) _tmp19_);
+					_tmp13_ = _g_error_copy0 ((GError*) err);
 #line 131 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					pixbuferr = _tmp20_;
+					pixbuferr = _tmp13_;
 #line 133 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp21_ = pixbuferr;
+					_tmp14_ = pixbuferr;
 #line 133 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (g_error_matches (_tmp21_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE)) {
+					if (g_error_matches (_tmp14_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE)) {
 #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						result = IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE;
 #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_error_free0 (pixbuferr);
 #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2778 "BatchImport.c"
+#line 3260 "BatchImport.c"
 					} else {
-						GError* _tmp22_;
+						GError* _tmp15_;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp22_ = pixbuferr;
+						_tmp15_ = pixbuferr;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (g_error_matches (_tmp22_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) {
-#line 2785 "BatchImport.c"
-							ImportResult _tmp23_;
+						if (g_error_matches (_tmp15_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) {
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp23_ = default_result;
-#line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							result = _tmp23_;
+							result = default_result;
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_error_free0 (pixbuferr);
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2795 "BatchImport.c"
+#line 3273 "BatchImport.c"
 						} else {
-							GError* _tmp24_;
+							GError* _tmp16_;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp24_ = pixbuferr;
+							_tmp16_ = pixbuferr;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							if (g_error_matches (_tmp24_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) {
-#line 2802 "BatchImport.c"
-								ImportResult _tmp25_;
+							if (g_error_matches (_tmp16_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) {
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								_tmp25_ = default_result;
-#line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								result = _tmp25_;
+								result = default_result;
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_g_error_free0 (pixbuferr);
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2812 "BatchImport.c"
+#line 3286 "BatchImport.c"
 							} else {
-								GError* _tmp26_;
+								GError* _tmp17_;
 #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								_tmp26_ = pixbuferr;
+								_tmp17_ = pixbuferr;
 #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala"
-								if (g_error_matches (_tmp26_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE)) {
+								if (g_error_matches (_tmp17_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE)) {
 #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
 #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									_g_error_free0 (pixbuferr);
 #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2825 "BatchImport.c"
+#line 3299 "BatchImport.c"
 								} else {
-									GError* _tmp27_;
+									GError* _tmp18_;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
-									_tmp27_ = pixbuferr;
+									_tmp18_ = pixbuferr;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
-									if (g_error_matches (_tmp27_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) {
-#line 2832 "BatchImport.c"
-										ImportResult _tmp28_;
-#line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
-										_tmp28_ = default_result;
+									if (g_error_matches (_tmp18_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) {
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
-										result = _tmp28_;
+										result = default_result;
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										_g_error_free0 (pixbuferr);
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										return result;
-#line 2842 "BatchImport.c"
+#line 3312 "BatchImport.c"
 									} else {
-										GError* _tmp29_;
+										GError* _tmp19_;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
-										_tmp29_ = pixbuferr;
+										_tmp19_ = pixbuferr;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
-										if (g_error_matches (_tmp29_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) {
-#line 2849 "BatchImport.c"
-											ImportResult _tmp30_;
+										if (g_error_matches (_tmp19_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) {
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
-											_tmp30_ = default_result;
-#line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
-											result = _tmp30_;
+											result = default_result;
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											_g_error_free0 (pixbuferr);
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2859 "BatchImport.c"
+#line 3325 "BatchImport.c"
 										} else {
-											ImportResult _tmp31_;
-#line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-											_tmp31_ = default_result;
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-											result = _tmp31_;
+											result = default_result;
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											_g_error_free0 (pixbuferr);
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2870 "BatchImport.c"
+#line 3333 "BatchImport.c"
 										}
 									}
 								}
@@ -2875,22 +3338,22 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					}
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (pixbuferr);
-#line 2879 "BatchImport.c"
+#line 3342 "BatchImport.c"
 				}
 			}
 		}
 	}
 #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp32_ = default_result;
-#line 149 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = _tmp32_;
+	result = default_result;
 #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 2890 "BatchImport.c"
+#line 3351 "BatchImport.c"
 }
 
 
-GType import_result_get_type (void) {
+GType
+import_result_get_type (void)
+{
 	static volatile gsize import_result_type_id__volatile = 0;
 	if (g_once_init_enter (&import_result_type_id__volatile)) {
 		static const GEnumValue values[] = {{IMPORT_RESULT_SUCCESS, "IMPORT_RESULT_SUCCESS", "success"}, {IMPORT_RESULT_FILE_ERROR, "IMPORT_RESULT_FILE_ERROR", "file-error"}, {IMPORT_RESULT_DECODE_ERROR, "IMPORT_RESULT_DECODE_ERROR", "decode-error"}, {IMPORT_RESULT_DATABASE_ERROR, "IMPORT_RESULT_DATABASE_ERROR", "database-error"}, {IMPORT_RESULT_USER_ABORT, "IMPORT_RESULT_USER_ABORT", "user-abort"}, {IMPORT_RESULT_NOT_A_FILE, "IMPORT_RESULT_NOT_A_FILE", "not-a-file"}, {IMPORT_RESULT_PHOTO_EXISTS, "IMPORT_RESULT_PHOTO_EXISTS", "photo-exists"}, {IMPORT_RESULT_UNSUPPORTED_FORMAT, "IMPORT_RESULT_UNSUPPORTED_FORMAT", "unsupported-format"}, {IMPORT_RESULT_NOT_AN_IMAGE, "IMPORT_RESULT_NOT_AN_IMAGE", "not-an-image"}, {IMPORT_RESULT_DISK_FAILURE, "IMPORT_RESULT_DISK_FAILURE", "disk-failure"}, {IMPORT_RESULT_DISK_FULL, "IMPORT_RESULT_DISK_FULL", "disk-full"}, {IMPORT_RESULT_CAMERA_ERROR, "IMPORT_RESULT_CAMERA_ERROR", "camera-error"}, {IMPORT_RESULT_FILE_WRITE_ERROR, "IMPORT_RESULT_FILE_WRITE_ERROR", "file-write-error"}, {IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE, "IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE", "pixbuf-corrupt-image"}, {0, NULL, NULL}};
@@ -2902,192 +3365,249 @@ GType import_result_get_type (void) {
 }
 
 
-static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self) {
+static gchar*
+batch_import_job_real_get_dest_identifier (BatchImportJob* self)
+{
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_dest_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2911 "BatchImport.c"
+#line 3376 "BatchImport.c"
 }
 
 
-gchar* batch_import_job_get_dest_identifier (BatchImportJob* self) {
+gchar*
+batch_import_job_get_dest_identifier (BatchImportJob* self)
+{
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_dest_identifier (self);
-#line 2920 "BatchImport.c"
+#line 3387 "BatchImport.c"
 }
 
 
-static gchar* batch_import_job_real_get_source_identifier (BatchImportJob* self) {
+static gchar*
+batch_import_job_real_get_source_identifier (BatchImportJob* self)
+{
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_source_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2929 "BatchImport.c"
+#line 3398 "BatchImport.c"
 }
 
 
-gchar* batch_import_job_get_source_identifier (BatchImportJob* self) {
+gchar*
+batch_import_job_get_source_identifier (BatchImportJob* self)
+{
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_source_identifier (self);
-#line 2938 "BatchImport.c"
+#line 3409 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_is_directory (BatchImportJob* self) {
+static gboolean
+batch_import_job_real_is_directory (BatchImportJob* self)
+{
 	gboolean _tmp0_ = FALSE;
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 2948 "BatchImport.c"
+#line 3421 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_is_directory (BatchImportJob* self) {
+gboolean
+batch_import_job_is_directory (BatchImportJob* self)
+{
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self);
-#line 2957 "BatchImport.c"
+#line 3432 "BatchImport.c"
 }
 
 
-static gchar* batch_import_job_real_get_basename (BatchImportJob* self) {
+static gchar*
+batch_import_job_real_get_basename (BatchImportJob* self)
+{
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2966 "BatchImport.c"
+#line 3443 "BatchImport.c"
 }
 
 
-gchar* batch_import_job_get_basename (BatchImportJob* self) {
+gchar*
+batch_import_job_get_basename (BatchImportJob* self)
+{
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self);
-#line 2975 "BatchImport.c"
+#line 3454 "BatchImport.c"
 }
 
 
-static gchar* batch_import_job_real_get_path (BatchImportJob* self) {
+static gchar*
+batch_import_job_real_get_path (BatchImportJob* self)
+{
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2984 "BatchImport.c"
+#line 3465 "BatchImport.c"
 }
 
 
-gchar* batch_import_job_get_path (BatchImportJob* self) {
+gchar*
+batch_import_job_get_path (BatchImportJob* self)
+{
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self);
-#line 2993 "BatchImport.c"
+#line 3476 "BatchImport.c"
 }
 
 
-static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self) {
+static DuplicatedFile*
+batch_import_job_real_get_duplicated_file (BatchImportJob* self)
+{
 	DuplicatedFile* result = NULL;
 #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = NULL;
 #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3003 "BatchImport.c"
+#line 3488 "BatchImport.c"
 }
 
 
-DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) {
+DuplicatedFile*
+batch_import_job_get_duplicated_file (BatchImportJob* self)
+{
 #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self);
-#line 3012 "BatchImport.c"
+#line 3499 "BatchImport.c"
 }
 
 
-static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self) {
+static GFile*
+batch_import_job_real_get_associated_file (BatchImportJob* self)
+{
 	GFile* result = NULL;
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = NULL;
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3022 "BatchImport.c"
+#line 3511 "BatchImport.c"
 }
 
 
-GFile* batch_import_job_get_associated_file (BatchImportJob* self) {
+GFile*
+batch_import_job_get_associated_file (BatchImportJob* self)
+{
 #line 175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 175 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_associated_file (self);
-#line 3031 "BatchImport.c"
+#line 3522 "BatchImport.c"
 }
 
 
-static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated) {
+static void
+batch_import_job_real_set_associated (BatchImportJob* self,
+                                      BatchImportJob* associated)
+{
 #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return;
-#line 3040 "BatchImport.c"
+#line 3534 "BatchImport.c"
 }
 
 
-void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated) {
+void
+batch_import_job_set_associated (BatchImportJob* self,
+                                 BatchImportJob* associated)
+{
 #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (self));
 #line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated);
-#line 3049 "BatchImport.c"
+#line 3546 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
+static gboolean
+batch_import_job_real_determine_file_size (BatchImportJob* self,
+                                           guint64* filesize,
+                                           GFile* * file_or_dir)
+{
 	gboolean _tmp0_ = FALSE;
 #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3059 "BatchImport.c"
+#line 3560 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
+gboolean
+batch_import_job_determine_file_size (BatchImportJob* self,
+                                      guint64* filesize,
+                                      GFile* * file_or_dir)
+{
 #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir);
-#line 3068 "BatchImport.c"
+#line 3573 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean
+batch_import_job_real_prepare (BatchImportJob* self,
+                               GFile* * file_to_import,
+                               gboolean* copy_to_library,
+                               GError** error)
+{
 	gboolean _tmp0_ = FALSE;
 #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3078 "BatchImport.c"
+#line 3588 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
+gboolean
+batch_import_job_prepare (BatchImportJob* self,
+                          GFile* * file_to_import,
+                          gboolean* copy_to_library,
+                          GError** error)
+{
 #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error);
-#line 3087 "BatchImport.c"
+#line 3602 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+static gboolean
+batch_import_job_real_complete (BatchImportJob* self,
+                                MediaSource* source,
+                                BatchImportRoll* import_roll,
+                                GError** error)
+{
 	gboolean result = FALSE;
 #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
@@ -3097,165 +3617,205 @@ static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSourc
 	result = FALSE;
 #line 201 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3101 "BatchImport.c"
+#line 3621 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+gboolean
+batch_import_job_complete (BatchImportJob* self,
+                           MediaSource* source,
+                           BatchImportRoll* import_roll,
+                           GError** error)
+{
 #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error);
-#line 3110 "BatchImport.c"
+#line 3635 "BatchImport.c"
 }
 
 
-static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self) {
+static time_t
+batch_import_job_real_get_exposure_time_override (BatchImportJob* self)
+{
 	time_t result = 0;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = (time_t) 0;
 #line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3120 "BatchImport.c"
+#line 3647 "BatchImport.c"
 }
 
 
-time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) {
+time_t
+batch_import_job_get_exposure_time_override (BatchImportJob* self)
+{
 #line 206 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0);
 #line 206 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self);
-#line 3129 "BatchImport.c"
+#line 3658 "BatchImport.c"
 }
 
 
-static gboolean batch_import_job_real_recurse (BatchImportJob* self) {
+static gboolean
+batch_import_job_real_recurse (BatchImportJob* self)
+{
 	gboolean result = FALSE;
 #line 211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
 #line 211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3139 "BatchImport.c"
+#line 3670 "BatchImport.c"
 }
 
 
-gboolean batch_import_job_recurse (BatchImportJob* self) {
+gboolean
+batch_import_job_recurse (BatchImportJob* self)
+{
 #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->recurse (self);
-#line 3148 "BatchImport.c"
+#line 3681 "BatchImport.c"
 }
 
 
-BatchImportJob* batch_import_job_construct (GType object_type) {
+BatchImportJob*
+batch_import_job_construct (GType object_type)
+{
 	BatchImportJob* self = NULL;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportJob*) g_type_create_instance (object_type);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3158 "BatchImport.c"
+#line 3693 "BatchImport.c"
 }
 
 
-static void value_batch_import_job_init (GValue* value) {
+static void
+value_batch_import_job_init (GValue* value)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3165 "BatchImport.c"
+#line 3702 "BatchImport.c"
 }
 
 
-static void value_batch_import_job_free_value (GValue* value) {
+static void
+value_batch_import_job_free_value (GValue* value)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (value->data[0].v_pointer);
-#line 3174 "BatchImport.c"
+#line 3713 "BatchImport.c"
 	}
 }
 
 
-static void value_batch_import_job_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_batch_import_job_copy_value (const GValue* src_value,
+                                   GValue* dest_value)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer);
-#line 3184 "BatchImport.c"
+#line 3726 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3188 "BatchImport.c"
+#line 3730 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_batch_import_job_peek_pointer (const GValue* value) {
+static gpointer
+value_batch_import_job_peek_pointer (const GValue* value)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3196 "BatchImport.c"
+#line 3740 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_job_collect_value (GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3203 "BatchImport.c"
+#line 3752 "BatchImport.c"
 		BatchImportJob * object;
 		object = collect_values[0].v_pointer;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3210 "BatchImport.c"
+#line 3759 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.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 3214 "BatchImport.c"
+#line 3763 "BatchImport.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_job_ref (object);
-#line 3218 "BatchImport.c"
+#line 3767 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3222 "BatchImport.c"
+#line 3771 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3226 "BatchImport.c"
+#line 3775 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_job_lcopy_value (const GValue* value,
+                                    guint n_collect_values,
+                                    GTypeCValue* collect_values,
+                                    guint collect_flags)
+{
 	BatchImportJob ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3237 "BatchImport.c"
+#line 3791 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3243 "BatchImport.c"
+#line 3797 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3247 "BatchImport.c"
+#line 3801 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_job_ref (value->data[0].v_pointer);
-#line 3251 "BatchImport.c"
+#line 3805 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3255 "BatchImport.c"
+#line 3809 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_batch_import_job (const gchar* name,
+                             const gchar* nick,
+                             const gchar* blurb,
+                             GType object_type,
+                             GParamFlags flags)
+{
 	ParamSpecBatchImportJob* spec;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_JOB), NULL);
@@ -3265,20 +3825,25 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3269 "BatchImport.c"
+#line 3829 "BatchImport.c"
 }
 
 
-gpointer value_get_batch_import_job (const GValue* value) {
+gpointer
+value_get_batch_import_job (const GValue* value)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3278 "BatchImport.c"
+#line 3840 "BatchImport.c"
 }
 
 
-void value_set_batch_import_job (GValue* value, gpointer v_object) {
+void
+value_set_batch_import_job (GValue* value,
+                            gpointer v_object)
+{
 	BatchImportJob * old;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB));
@@ -3294,22 +3859,25 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_ref (value->data[0].v_pointer);
-#line 3298 "BatchImport.c"
+#line 3863 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3302 "BatchImport.c"
+#line 3867 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3308 "BatchImport.c"
+#line 3873 "BatchImport.c"
 	}
 }
 
 
-void value_take_batch_import_job (GValue* value, gpointer v_object) {
+void
+value_take_batch_import_job (GValue* value,
+                             gpointer v_object)
+{
 	BatchImportJob * old;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB));
@@ -3323,22 +3891,24 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3327 "BatchImport.c"
+#line 3895 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3331 "BatchImport.c"
+#line 3899 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3337 "BatchImport.c"
+#line 3905 "BatchImport.c"
 	}
 }
 
 
-static void batch_import_job_class_init (BatchImportJobClass * klass) {
+static void
+batch_import_job_class_init (BatchImportJobClass * klass)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3369,28 +3939,34 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) {
 	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) batch_import_job_real_get_exposure_time_override;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) batch_import_job_real_recurse;
-#line 3373 "BatchImport.c"
+#line 3943 "BatchImport.c"
 }
 
 
-static void batch_import_job_instance_init (BatchImportJob * self) {
+static void
+batch_import_job_instance_init (BatchImportJob * self)
+{
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3380 "BatchImport.c"
+#line 3952 "BatchImport.c"
 }
 
 
-static void batch_import_job_finalize (BatchImportJob * obj) {
+static void
+batch_import_job_finalize (BatchImportJob * obj)
+{
 	BatchImportJob * self;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 3390 "BatchImport.c"
+#line 3964 "BatchImport.c"
 }
 
 
-GType batch_import_job_get_type (void) {
+GType
+batch_import_job_get_type (void)
+{
 	static volatile gsize batch_import_job_type_id__volatile = 0;
 	if (g_once_init_enter (&batch_import_job_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_batch_import_job_init, value_batch_import_job_free_value, value_batch_import_job_copy_value, value_batch_import_job_peek_pointer, "p", value_batch_import_job_collect_value, "p", value_batch_import_job_lcopy_value };
@@ -3404,18 +3980,22 @@ GType batch_import_job_get_type (void) {
 }
 
 
-gpointer batch_import_job_ref (gpointer instance) {
+gpointer
+batch_import_job_ref (gpointer instance)
+{
 	BatchImportJob * self;
 	self = instance;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 3415 "BatchImport.c"
+#line 3993 "BatchImport.c"
 }
 
 
-void batch_import_job_unref (gpointer instance) {
+void
+batch_import_job_unref (gpointer instance)
+{
 	BatchImportJob * self;
 	self = instance;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3424,58 +4004,62 @@ void batch_import_job_unref (gpointer instance) {
 		BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3428 "BatchImport.c"
+#line 4008 "BatchImport.c"
 	}
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 3436 "BatchImport.c"
+#line 4018 "BatchImport.c"
 }
 
 
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) {
+FileImportJob*
+file_import_job_construct (GType object_type,
+                           GFile* file_or_dir,
+                           gboolean copy_to_library,
+                           gboolean recurse)
+{
 	FileImportJob* self = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file_or_dir), NULL);
 #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (FileImportJob*) batch_import_job_construct (object_type);
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = file_or_dir;
-#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (file_or_dir);
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file_or_dir);
 #line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->file_or_dir = _tmp1_;
+	self->priv->file_or_dir = _tmp0_;
 #line 223 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = copy_to_library;
-#line 223 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->copy_to_library = _tmp2_;
-#line 224 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = recurse;
+	self->priv->copy_to_library = copy_to_library;
 #line 224 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->_recurse = _tmp3_;
+	self->priv->_recurse = recurse;
 #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3468 "BatchImport.c"
+#line 4046 "BatchImport.c"
 }
 
 
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) {
+FileImportJob*
+file_import_job_new (GFile* file_or_dir,
+                     gboolean copy_to_library,
+                     gboolean recurse)
+{
 #line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library, recurse);
-#line 3475 "BatchImport.c"
+#line 4057 "BatchImport.c"
 }
 
 
-static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
+static gchar*
+file_import_job_real_get_dest_identifier (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gchar* result = NULL;
 	GFile* _tmp0_;
@@ -3490,11 +4074,13 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	result = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3494 "BatchImport.c"
+#line 4078 "BatchImport.c"
 }
 
 
-static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base) {
+static gchar*
+file_import_job_real_get_source_identifier (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gchar* result = NULL;
 	GFile* _tmp0_;
@@ -3509,30 +4095,31 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base)
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3513 "BatchImport.c"
+#line 4099 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
+static gboolean
+file_import_job_real_is_directory (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gboolean result = FALSE;
 	GFile* _tmp0_;
-	gboolean _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
 #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = query_is_directory (_tmp0_);
-#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = _tmp1_;
+	result = query_is_directory (_tmp0_);
 #line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3532 "BatchImport.c"
+#line 4117 "BatchImport.c"
 }
 
 
-static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
+static gchar*
+file_import_job_real_get_basename (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gchar* result = NULL;
 	GFile* _tmp0_;
@@ -3547,90 +4134,95 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
 	result = _tmp1_;
 #line 240 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3551 "BatchImport.c"
+#line 4138 "BatchImport.c"
 }
 
 
-static gchar* file_import_job_real_get_path (BatchImportJob* base) {
+static gchar*
+file_import_job_real_get_path (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp1_) {
-#line 3566 "BatchImport.c"
-		GFile* _tmp2_;
-		gchar* _tmp3_;
+	if (batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob))) {
+#line 4152 "BatchImport.c"
+		GFile* _tmp1_;
+		gchar* _tmp2_;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = self->priv->file_or_dir;
+		_tmp1_ = self->priv->file_or_dir;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = g_file_get_path (_tmp2_);
+		_tmp2_ = g_file_get_path (_tmp1_);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp3_;
-#line 3577 "BatchImport.c"
+		_tmp0_ = _tmp2_;
+#line 4163 "BatchImport.c"
 	} else {
+		GFile* _tmp3_;
 		GFile* _tmp4_;
 		GFile* _tmp5_;
-		GFile* _tmp6_;
-		gchar* _tmp7_;
+		gchar* _tmp6_;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = self->priv->file_or_dir;
+		_tmp3_ = self->priv->file_or_dir;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = g_file_get_parent (_tmp4_);
+		_tmp4_ = g_file_get_parent (_tmp3_);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = g_file_get_path (_tmp6_);
+		_tmp6_ = g_file_get_path (_tmp5_);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp7_;
+		_tmp0_ = _tmp6_;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp6_);
-#line 3597 "BatchImport.c"
+		_g_object_unref0 (_tmp5_);
+#line 4183 "BatchImport.c"
 	}
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3603 "BatchImport.c"
+#line 4189 "BatchImport.c"
 }
 
 
-static gpointer _batch_import_job_ref0 (gpointer self) {
+static gpointer
+_batch_import_job_ref0 (gpointer self)
+{
 #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 3610 "BatchImport.c"
+#line 4198 "BatchImport.c"
 }
 
 
-static void file_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
+static void
+file_import_job_real_set_associated (BatchImportJob* base,
+                                     BatchImportJob* associated)
+{
 	FileImportJob * self;
-	BatchImportJob* _tmp0_;
-	FileImportJob* _tmp1_;
+	FileImportJob* _tmp0_;
 #line 247 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
 #line 247 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
 #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = associated;
-#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FILE_IMPORT_JOB) ? ((FileImportJob*) _tmp0_) : NULL);
+	_tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, TYPE_FILE_IMPORT_JOB) ? ((FileImportJob*) associated) : NULL);
 #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->priv->associated);
 #line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->associated = _tmp1_;
-#line 3630 "BatchImport.c"
+	self->priv->associated = _tmp0_;
+#line 4218 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
+static gboolean
+file_import_job_real_determine_file_size (BatchImportJob* base,
+                                          guint64* filesize,
+                                          GFile* * file)
+{
 	FileImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
@@ -3655,25 +4247,30 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base,
 	if (filesize) {
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*filesize = _vala_filesize;
-#line 3659 "BatchImport.c"
+#line 4251 "BatchImport.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file) {
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 3665 "BatchImport.c"
+#line 4257 "BatchImport.c"
 	} else {
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 3669 "BatchImport.c"
+#line 4261 "BatchImport.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3673 "BatchImport.c"
+#line 4265 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error) {
+static gboolean
+file_import_job_real_prepare (BatchImportJob* base,
+                              GFile* * file_to_import,
+                              gboolean* copy,
+                              GError** error)
+{
 	FileImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy = FALSE;
@@ -3701,25 +4298,27 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * fil
 	if (file_to_import) {
 #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file_to_import = _vala_file_to_import;
-#line 3705 "BatchImport.c"
+#line 4302 "BatchImport.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 3709 "BatchImport.c"
+#line 4306 "BatchImport.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy) {
 #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy = _vala_copy;
-#line 3715 "BatchImport.c"
+#line 4312 "BatchImport.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3719 "BatchImport.c"
+#line 4316 "BatchImport.c"
 }
 
 
-GFile* file_import_job_get_file (FileImportJob* self) {
+GFile*
+file_import_job_get_file (FileImportJob* self)
+{
 	GFile* result = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
@@ -3733,11 +4332,13 @@ GFile* file_import_job_get_file (FileImportJob* self) {
 	result = _tmp1_;
 #line 266 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3737 "BatchImport.c"
+#line 4336 "BatchImport.c"
 }
 
 
-static gboolean file_import_job_real_recurse (BatchImportJob* base) {
+static gboolean
+file_import_job_real_recurse (BatchImportJob* base)
+{
 	FileImportJob * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -3749,11 +4350,13 @@ static gboolean file_import_job_real_recurse (BatchImportJob* base) {
 	result = _tmp0_;
 #line 270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3753 "BatchImport.c"
+#line 4354 "BatchImport.c"
 }
 
 
-static void file_import_job_class_init (FileImportJobClass * klass) {
+static void
+file_import_job_class_init (FileImportJobClass * klass)
+{
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3778,20 +4381,24 @@ static void file_import_job_class_init (FileImportJobClass * klass) {
 	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) file_import_job_real_prepare;
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) file_import_job_real_recurse;
-#line 3782 "BatchImport.c"
+#line 4385 "BatchImport.c"
 }
 
 
-static void file_import_job_instance_init (FileImportJob * self) {
+static void
+file_import_job_instance_init (FileImportJob * self)
+{
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self);
 #line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->associated = NULL;
-#line 3791 "BatchImport.c"
+#line 4396 "BatchImport.c"
 }
 
 
-static void file_import_job_finalize (BatchImportJob * obj) {
+static void
+file_import_job_finalize (BatchImportJob * obj)
+{
 	FileImportJob * self;
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_IMPORT_JOB, FileImportJob);
@@ -3801,11 +4408,13 @@ static void file_import_job_finalize (BatchImportJob * obj) {
 	_batch_import_job_unref0 (self->priv->associated);
 #line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj);
-#line 3805 "BatchImport.c"
+#line 4412 "BatchImport.c"
 }
 
 
-GType file_import_job_get_type (void) {
+GType
+file_import_job_get_type (void)
+{
 	static volatile gsize file_import_job_type_id__volatile = 0;
 	if (g_once_init_enter (&file_import_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FileImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) file_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FileImportJob), 0, (GInstanceInitFunc) file_import_job_instance_init, NULL };
@@ -3817,7 +4426,9 @@ GType file_import_job_get_type (void) {
 }
 
 
-BatchImportRoll* batch_import_roll_construct (GType object_type) {
+BatchImportRoll*
+batch_import_roll_construct (GType object_type)
+{
 	BatchImportRoll* self = NULL;
 	ImportID _tmp0_ = {0};
 #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -3828,115 +4439,142 @@ BatchImportRoll* batch_import_roll_construct (GType object_type) {
 	self->import_id = _tmp0_;
 #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3832 "BatchImport.c"
+#line 4443 "BatchImport.c"
 }
 
 
-BatchImportRoll* batch_import_roll_new (void) {
+BatchImportRoll*
+batch_import_roll_new (void)
+{
 #line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL);
-#line 3839 "BatchImport.c"
+#line 4452 "BatchImport.c"
 }
 
 
-static void value_batch_import_roll_init (GValue* value) {
+static void
+value_batch_import_roll_init (GValue* value)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3846 "BatchImport.c"
+#line 4461 "BatchImport.c"
 }
 
 
-static void value_batch_import_roll_free_value (GValue* value) {
+static void
+value_batch_import_roll_free_value (GValue* value)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (value->data[0].v_pointer);
-#line 3855 "BatchImport.c"
+#line 4472 "BatchImport.c"
 	}
 }
 
 
-static void value_batch_import_roll_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_batch_import_roll_copy_value (const GValue* src_value,
+                                    GValue* dest_value)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer);
-#line 3865 "BatchImport.c"
+#line 4485 "BatchImport.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3869 "BatchImport.c"
+#line 4489 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_batch_import_roll_peek_pointer (const GValue* value) {
+static gpointer
+value_batch_import_roll_peek_pointer (const GValue* value)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3877 "BatchImport.c"
+#line 4499 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_roll_collect_value (GValue* value,
+                                       guint n_collect_values,
+                                       GTypeCValue* collect_values,
+                                       guint collect_flags)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3884 "BatchImport.c"
+#line 4511 "BatchImport.c"
 		BatchImportRoll * object;
 		object = collect_values[0].v_pointer;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3891 "BatchImport.c"
+#line 4518 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.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 3895 "BatchImport.c"
+#line 4522 "BatchImport.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_roll_ref (object);
-#line 3899 "BatchImport.c"
+#line 4526 "BatchImport.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3903 "BatchImport.c"
+#line 4530 "BatchImport.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3907 "BatchImport.c"
+#line 4534 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_roll_lcopy_value (const GValue* value,
+                                     guint n_collect_values,
+                                     GTypeCValue* collect_values,
+                                     guint collect_flags)
+{
 	BatchImportRoll ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3918 "BatchImport.c"
+#line 4550 "BatchImport.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3924 "BatchImport.c"
+#line 4556 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3928 "BatchImport.c"
+#line 4560 "BatchImport.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_roll_ref (value->data[0].v_pointer);
-#line 3932 "BatchImport.c"
+#line 4564 "BatchImport.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3936 "BatchImport.c"
+#line 4568 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_batch_import_roll (const gchar* name,
+                              const gchar* nick,
+                              const gchar* blurb,
+                              GType object_type,
+                              GParamFlags flags)
+{
 	ParamSpecBatchImportRoll* spec;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_ROLL), NULL);
@@ -3946,20 +4584,25 @@ GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3950 "BatchImport.c"
+#line 4588 "BatchImport.c"
 }
 
 
-gpointer value_get_batch_import_roll (const GValue* value) {
+gpointer
+value_get_batch_import_roll (const GValue* value)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL);
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3959 "BatchImport.c"
+#line 4599 "BatchImport.c"
 }
 
 
-void value_set_batch_import_roll (GValue* value, gpointer v_object) {
+void
+value_set_batch_import_roll (GValue* value,
+                             gpointer v_object)
+{
 	BatchImportRoll * old;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
@@ -3975,22 +4618,25 @@ void value_set_batch_import_roll (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_ref (value->data[0].v_pointer);
-#line 3979 "BatchImport.c"
+#line 4622 "BatchImport.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3983 "BatchImport.c"
+#line 4626 "BatchImport.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 3989 "BatchImport.c"
+#line 4632 "BatchImport.c"
 	}
 }
 
 
-void value_take_batch_import_roll (GValue* value, gpointer v_object) {
+void
+value_take_batch_import_roll (GValue* value,
+                              gpointer v_object)
+{
 	BatchImportRoll * old;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
@@ -4004,31 +4650,35 @@ void value_take_batch_import_roll (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4008 "BatchImport.c"
+#line 4654 "BatchImport.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4012 "BatchImport.c"
+#line 4658 "BatchImport.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 4018 "BatchImport.c"
+#line 4664 "BatchImport.c"
 	}
 }
 
 
-static void batch_import_roll_class_init (BatchImportRollClass * klass) {
+static void
+batch_import_roll_class_init (BatchImportRollClass * klass)
+{
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_roll_parent_class = g_type_class_peek_parent (klass);
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize;
-#line 4028 "BatchImport.c"
+#line 4676 "BatchImport.c"
 }
 
 
-static void batch_import_roll_instance_init (BatchImportRoll * self) {
+static void
+batch_import_roll_instance_init (BatchImportRoll * self)
+{
 	ViewCollection* _tmp0_;
 #line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = view_collection_new ("BatchImportRoll generated events");
@@ -4036,11 +4686,13 @@ static void batch_import_roll_instance_init (BatchImportRoll * self) {
 	self->generated_events = _tmp0_;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 4040 "BatchImport.c"
+#line 4690 "BatchImport.c"
 }
 
 
-static void batch_import_roll_finalize (BatchImportRoll * obj) {
+static void
+batch_import_roll_finalize (BatchImportRoll * obj)
+{
 	BatchImportRoll * self;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_ROLL, BatchImportRoll);
@@ -4048,11 +4700,13 @@ static void batch_import_roll_finalize (BatchImportRoll * obj) {
 	g_signal_handlers_destroy (self);
 #line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_collection_unref0 (self->generated_events);
-#line 4052 "BatchImport.c"
+#line 4704 "BatchImport.c"
 }
 
 
-GType batch_import_roll_get_type (void) {
+GType
+batch_import_roll_get_type (void)
+{
 	static volatile gsize batch_import_roll_type_id__volatile = 0;
 	if (g_once_init_enter (&batch_import_roll_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_batch_import_roll_init, value_batch_import_roll_free_value, value_batch_import_roll_copy_value, value_batch_import_roll_peek_pointer, "p", value_batch_import_roll_collect_value, "p", value_batch_import_roll_lcopy_value };
@@ -4066,18 +4720,22 @@ GType batch_import_roll_get_type (void) {
 }
 
 
-gpointer batch_import_roll_ref (gpointer instance) {
+gpointer
+batch_import_roll_ref (gpointer instance)
+{
 	BatchImportRoll * self;
 	self = instance;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4077 "BatchImport.c"
+#line 4733 "BatchImport.c"
 }
 
 
-void batch_import_roll_unref (gpointer instance) {
+void
+batch_import_roll_unref (gpointer instance)
+{
 	BatchImportRoll * self;
 	self = instance;
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4086,24 +4744,26 @@ void batch_import_roll_unref (gpointer instance) {
 		BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self);
 #line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4090 "BatchImport.c"
+#line 4748 "BatchImport.c"
 	}
 }
 
 
-BatchImportResult* batch_import_result_construct (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
+BatchImportResult*
+batch_import_result_construct (GType object_type,
+                               BatchImportJob* job,
+                               GFile* file,
+                               const gchar* src_identifier,
+                               const gchar* dest_identifier,
+                               DuplicatedFile* duplicate_of,
+                               ImportResult _result_)
+{
 	BatchImportResult* self = NULL;
 	BatchImportJob* _tmp0_;
-	BatchImportJob* _tmp1_;
-	GFile* _tmp2_;
-	GFile* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	DuplicatedFile* _tmp8_;
-	DuplicatedFile* _tmp9_;
-	ImportResult _tmp10_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	DuplicatedFile* _tmp4_;
 #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4117,78 +4777,73 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport
 #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportResult*) g_type_create_instance (object_type);
 #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = job;
-#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
+	_tmp0_ = _batch_import_job_ref0 (job);
 #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
 #line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->job = _tmp1_;
+	self->job = _tmp0_;
 #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = file;
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (file);
 #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
 #line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->file = _tmp3_;
-#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = src_identifier;
+	self->file = _tmp1_;
 #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (src_identifier);
 #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->src_identifier);
 #line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->src_identifier = _tmp5_;
+	self->src_identifier = _tmp2_;
 #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = dest_identifier;
-#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_tmp3_ = g_strdup (dest_identifier);
 #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_identifier);
 #line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->dest_identifier = _tmp7_;
-#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = duplicate_of;
+	self->dest_identifier = _tmp3_;
 #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
+	_tmp4_ = _g_object_ref0 (duplicate_of);
 #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->duplicate_of);
 #line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->duplicate_of = _tmp9_;
+	self->duplicate_of = _tmp4_;
 #line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = _result_;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->result = _tmp10_;
+	self->result = _result_;
 #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4166 "BatchImport.c"
+#line 4814 "BatchImport.c"
 }
 
 
-BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
+BatchImportResult*
+batch_import_result_new (BatchImportJob* job,
+                         GFile* file,
+                         const gchar* src_identifier,
+                         const gchar* dest_identifier,
+                         DuplicatedFile* duplicate_of,
+                         ImportResult _result_)
+{
 #line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_);
-#line 4173 "BatchImport.c"
+#line 4828 "BatchImport.c"
 }
 
 
-BatchImportResult* batch_import_result_construct_from_error (GType object_type, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
+BatchImportResult*
+batch_import_result_construct_from_error (GType object_type,
+                                          BatchImportJob* job,
+                                          GFile* file,
+                                          const gchar* src_identifier,
+                                          const gchar* dest_identifier,
+                                          GError* err,
+                                          ImportResult default_result)
+{
 	BatchImportResult* self = NULL;
 	BatchImportJob* _tmp0_;
-	BatchImportJob* _tmp1_;
-	GFile* _tmp2_;
-	GFile* _tmp3_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	const gchar* _tmp4_;
 	gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	GError* _tmp8_;
-	ImportResult _tmp9_;
-	ImportResult _tmp10_;
-	GError* _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4200,166 +4855,182 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type,
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportResult*) g_type_create_instance (object_type);
 #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = job;
-#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
+	_tmp0_ = _batch_import_job_ref0 (job);
 #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
 #line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->job = _tmp1_;
+	self->job = _tmp0_;
 #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = file;
-#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (file);
 #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
 #line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->file = _tmp3_;
-#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = src_identifier;
+	self->file = _tmp1_;
 #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = g_strdup (_tmp4_);
+	_tmp2_ = g_strdup (src_identifier);
 #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->src_identifier);
 #line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->src_identifier = _tmp5_;
+	self->src_identifier = _tmp2_;
 #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = dest_identifier;
-#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_tmp3_ = g_strdup (dest_identifier);
 #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_identifier);
 #line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->dest_identifier = _tmp7_;
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = err;
+	self->dest_identifier = _tmp3_;
 #line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = default_result;
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = import_result_convert_error (_tmp8_, _tmp9_);
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->result = _tmp10_;
-#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = err;
+	self->result = import_result_convert_error (err, default_result);
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = _tmp11_->message;
+	_tmp4_ = err->message;
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = g_strdup (_tmp12_);
+	_tmp5_ = g_strdup (_tmp4_);
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->errmsg);
 #line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->errmsg = _tmp13_;
+	self->errmsg = _tmp5_;
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4255 "BatchImport.c"
+#line 4894 "BatchImport.c"
 }
 
 
-BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
+BatchImportResult*
+batch_import_result_new_from_error (BatchImportJob* job,
+                                    GFile* file,
+                                    const gchar* src_identifier,
+                                    const gchar* dest_identifier,
+                                    GError* err,
+                                    ImportResult default_result)
+{
 #line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result);
-#line 4262 "BatchImport.c"
+#line 4908 "BatchImport.c"
 }
 
 
-static void value_batch_import_result_init (GValue* value) {
+static void
+value_batch_import_result_init (GValue* value)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4269 "BatchImport.c"
+#line 4917 "BatchImport.c"
 }
 
 
-static void value_batch_import_result_free_value (GValue* value) {
+static void
+value_batch_import_result_free_value (GValue* value)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (value->data[0].v_pointer);
-#line 4278 "BatchImport.c"
+#line 4928 "BatchImport.c"
 	}
 }
 
 
-static void value_batch_import_result_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_batch_import_result_copy_value (const GValue* src_value,
+                                      GValue* dest_value)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer);
-#line 4288 "BatchImport.c"
+#line 4941 "BatchImport.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4292 "BatchImport.c"
+#line 4945 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_batch_import_result_peek_pointer (const GValue* value) {
+static gpointer
+value_batch_import_result_peek_pointer (const GValue* value)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4300 "BatchImport.c"
+#line 4955 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_result_collect_value (GValue* value,
+                                         guint n_collect_values,
+                                         GTypeCValue* collect_values,
+                                         guint collect_flags)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 4307 "BatchImport.c"
+#line 4967 "BatchImport.c"
 		BatchImportResult * object;
 		object = collect_values[0].v_pointer;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4314 "BatchImport.c"
+#line 4974 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.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 4318 "BatchImport.c"
+#line 4978 "BatchImport.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_result_ref (object);
-#line 4322 "BatchImport.c"
+#line 4982 "BatchImport.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4326 "BatchImport.c"
+#line 4986 "BatchImport.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4330 "BatchImport.c"
+#line 4990 "BatchImport.c"
 }
 
 
-static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_batch_import_result_lcopy_value (const GValue* value,
+                                       guint n_collect_values,
+                                       GTypeCValue* collect_values,
+                                       guint collect_flags)
+{
 	BatchImportResult ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4341 "BatchImport.c"
+#line 5006 "BatchImport.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 4347 "BatchImport.c"
+#line 5012 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4351 "BatchImport.c"
+#line 5016 "BatchImport.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_result_ref (value->data[0].v_pointer);
-#line 4355 "BatchImport.c"
+#line 5020 "BatchImport.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4359 "BatchImport.c"
+#line 5024 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_batch_import_result (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags)
+{
 	ParamSpecBatchImportResult* spec;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_RESULT), NULL);
@@ -4369,20 +5040,25 @@ GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4373 "BatchImport.c"
+#line 5044 "BatchImport.c"
 }
 
 
-gpointer value_get_batch_import_result (const GValue* value) {
+gpointer
+value_get_batch_import_result (const GValue* value)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL);
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4382 "BatchImport.c"
+#line 5055 "BatchImport.c"
 }
 
 
-void value_set_batch_import_result (GValue* value, gpointer v_object) {
+void
+value_set_batch_import_result (GValue* value,
+                               gpointer v_object)
+{
 	BatchImportResult * old;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
@@ -4398,22 +5074,25 @@ void value_set_batch_import_result (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_ref (value->data[0].v_pointer);
-#line 4402 "BatchImport.c"
+#line 5078 "BatchImport.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4406 "BatchImport.c"
+#line 5082 "BatchImport.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4412 "BatchImport.c"
+#line 5088 "BatchImport.c"
 	}
 }
 
 
-void value_take_batch_import_result (GValue* value, gpointer v_object) {
+void
+value_take_batch_import_result (GValue* value,
+                                gpointer v_object)
+{
 	BatchImportResult * old;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
@@ -4427,40 +5106,46 @@ void value_take_batch_import_result (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4431 "BatchImport.c"
+#line 5110 "BatchImport.c"
 	} else {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4435 "BatchImport.c"
+#line 5114 "BatchImport.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4441 "BatchImport.c"
+#line 5120 "BatchImport.c"
 	}
 }
 
 
-static void batch_import_result_class_init (BatchImportResultClass * klass) {
+static void
+batch_import_result_class_init (BatchImportResultClass * klass)
+{
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_result_parent_class = g_type_class_peek_parent (klass);
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize;
-#line 4451 "BatchImport.c"
+#line 5132 "BatchImport.c"
 }
 
 
-static void batch_import_result_instance_init (BatchImportResult * self) {
+static void
+batch_import_result_instance_init (BatchImportResult * self)
+{
 #line 298 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->errmsg = NULL;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 4460 "BatchImport.c"
+#line 5143 "BatchImport.c"
 }
 
 
-static void batch_import_result_finalize (BatchImportResult * obj) {
+static void
+batch_import_result_finalize (BatchImportResult * obj)
+{
 	BatchImportResult * self;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_RESULT, BatchImportResult);
@@ -4478,11 +5163,13 @@ static void batch_import_result_finalize (BatchImportResult * obj) {
 	_g_free0 (self->errmsg);
 #line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->duplicate_of);
-#line 4482 "BatchImport.c"
+#line 5167 "BatchImport.c"
 }
 
 
-GType batch_import_result_get_type (void) {
+GType
+batch_import_result_get_type (void)
+{
 	static volatile gsize batch_import_result_type_id__volatile = 0;
 	if (g_once_init_enter (&batch_import_result_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_batch_import_result_init, value_batch_import_result_free_value, value_batch_import_result_copy_value, value_batch_import_result_peek_pointer, "p", value_batch_import_result_collect_value, "p", value_batch_import_result_lcopy_value };
@@ -4496,18 +5183,22 @@ GType batch_import_result_get_type (void) {
 }
 
 
-gpointer batch_import_result_ref (gpointer instance) {
+gpointer
+batch_import_result_ref (gpointer instance)
+{
 	BatchImportResult * self;
 	self = instance;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4507 "BatchImport.c"
+#line 5196 "BatchImport.c"
 }
 
 
-void batch_import_result_unref (gpointer instance) {
+void
+batch_import_result_unref (gpointer instance)
+{
 	BatchImportResult * self;
 	self = instance;
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4516,16 +5207,18 @@ void batch_import_result_unref (gpointer instance) {
 		BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self);
 #line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4520 "BatchImport.c"
+#line 5211 "BatchImport.c"
 	}
 }
 
 
-ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported) {
+ImportManifest*
+import_manifest_construct (GType object_type,
+                           GeeList* prefailed,
+                           GeeList* pre_already_imported)
+{
 	ImportManifest* self = NULL;
 	GTimer* _tmp0_;
-	GeeList* _tmp1_;
-	GeeList* _tmp23_;
 #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((prefailed == NULL) || GEE_IS_LIST (prefailed), NULL);
 #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4539,277 +5232,272 @@ ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed
 #line 338 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->timer = _tmp0_;
 #line 339 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = prefailed;
-#line 339 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp1_ != NULL) {
-#line 4546 "BatchImport.c"
+	if (prefailed != NULL) {
+#line 5237 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp2_;
-			GeeList* _tmp3_;
+			GeeList* _tmp1_;
 			gint _job_size = 0;
-			GeeList* _tmp4_;
-			gint _tmp5_;
-			gint _tmp6_;
+			GeeList* _tmp2_;
+			gint _tmp3_;
+			gint _tmp4_;
 			gint _job_index = 0;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = prefailed;
-#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp3_ = _g_object_ref0 (_tmp2_);
+			_tmp1_ = _g_object_ref0 (prefailed);
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_list = _tmp3_;
+			_job_list = _tmp1_;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = _job_list;
+			_tmp2_ = _job_list;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = _tmp5_;
+			_tmp4_ = _tmp3_;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_size = _tmp6_;
+			_job_size = _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_job_index = -1;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4574 "BatchImport.c"
+#line 5262 "BatchImport.c"
+				gint _tmp5_;
+				gint _tmp6_;
 				gint _tmp7_;
-				gint _tmp8_;
-				gint _tmp9_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp10_;
-				gint _tmp11_;
-				gpointer _tmp12_;
+				GeeList* _tmp8_;
+				gint _tmp9_;
+				gpointer _tmp10_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp13_;
-				BatchImportJob* _tmp14_;
-				gchar* _tmp15_;
+				BatchImportJob* _tmp11_;
+				BatchImportJob* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				BatchImportJob* _tmp15_;
 				gchar* _tmp16_;
-				BatchImportJob* _tmp17_;
-				gchar* _tmp18_;
-				gchar* _tmp19_;
+				gchar* _tmp17_;
+				BatchImportResult* _tmp18_;
+				BatchImportResult* _tmp19_;
 				BatchImportResult* _tmp20_;
-				BatchImportResult* _tmp21_;
-				BatchImportResult* _tmp22_;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp7_ = _job_index;
+				_tmp5_ = _job_index;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_job_index = _tmp7_ + 1;
+				_job_index = _tmp5_ + 1;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp8_ = _job_index;
+				_tmp6_ = _job_index;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp9_ = _job_size;
+				_tmp7_ = _job_size;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp8_ < _tmp9_)) {
+				if (!(_tmp6_ < _tmp7_)) {
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4605 "BatchImport.c"
+#line 5293 "BatchImport.c"
 				}
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp10_ = _job_list;
+				_tmp8_ = _job_list;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = _job_index;
+				_tmp9_ = _job_index;
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
+				_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				job = (BatchImportJob*) _tmp12_;
+				job = (BatchImportJob*) _tmp10_;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp13_ = job;
+				_tmp11_ = job;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp14_ = job;
+				_tmp12_ = job;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp15_ = batch_import_job_get_source_identifier (_tmp14_);
+				_tmp13_ = batch_import_job_get_source_identifier (_tmp12_);
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp16_ = _tmp15_;
+				_tmp14_ = _tmp13_;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp17_ = job;
+				_tmp15_ = job;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = batch_import_job_get_dest_identifier (_tmp17_);
+				_tmp16_ = batch_import_job_get_dest_identifier (_tmp15_);
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp19_ = _tmp18_;
+				_tmp17_ = _tmp16_;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp20_ = batch_import_result_new (_tmp13_, NULL, _tmp16_, _tmp19_, NULL, IMPORT_RESULT_FILE_ERROR);
+				_tmp18_ = batch_import_result_new (_tmp11_, NULL, _tmp14_, _tmp17_, NULL, IMPORT_RESULT_FILE_ERROR);
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp21_ = _tmp20_;
+				_tmp19_ = _tmp18_;
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp19_);
+				_g_free0 (_tmp17_);
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp16_);
+				_g_free0 (_tmp14_);
 #line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_result = _tmp21_;
+				batch_result = _tmp19_;
 #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp22_ = batch_result;
+				_tmp20_ = batch_result;
 #line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				import_manifest_add_result (self, _tmp22_);
+				import_manifest_add_result (self, _tmp20_);
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (batch_result);
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4647 "BatchImport.c"
+#line 5335 "BatchImport.c"
 			}
 #line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4651 "BatchImport.c"
+#line 5339 "BatchImport.c"
 		}
 	}
 #line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp23_ = pre_already_imported;
-#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp23_ != NULL) {
-#line 4658 "BatchImport.c"
+	if (pre_already_imported != NULL) {
+#line 5344 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp24_;
-			GeeList* _tmp25_;
+			GeeList* _tmp21_;
 			gint _job_size = 0;
-			GeeList* _tmp26_;
-			gint _tmp27_;
-			gint _tmp28_;
+			GeeList* _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
 			gint _job_index = 0;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = pre_already_imported;
-#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = _g_object_ref0 (_tmp24_);
+			_tmp21_ = _g_object_ref0 (pre_already_imported);
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_list = _tmp25_;
+			_job_list = _tmp21_;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = _job_list;
+			_tmp22_ = _job_list;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp28_ = _tmp27_;
+			_tmp24_ = _tmp23_;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_size = _tmp28_;
+			_job_size = _tmp24_;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_job_index = -1;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4686 "BatchImport.c"
-				gint _tmp29_;
-				gint _tmp30_;
-				gint _tmp31_;
+#line 5369 "BatchImport.c"
+				gint _tmp25_;
+				gint _tmp26_;
+				gint _tmp27_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp32_;
-				gint _tmp33_;
-				gpointer _tmp34_;
+				GeeList* _tmp28_;
+				gint _tmp29_;
+				gpointer _tmp30_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp35_;
-				BatchImportJob* _tmp36_;
-				gchar* _tmp37_;
+				BatchImportJob* _tmp31_;
+				BatchImportJob* _tmp32_;
+				gchar* _tmp33_;
+				gchar* _tmp34_;
+				GFile* _tmp35_;
+				GFile* _tmp36_;
+				BatchImportJob* _tmp37_;
 				gchar* _tmp38_;
-				GFile* _tmp39_;
-				GFile* _tmp40_;
-				BatchImportJob* _tmp41_;
+				gchar* _tmp39_;
+				BatchImportJob* _tmp40_;
+				gchar* _tmp41_;
 				gchar* _tmp42_;
-				gchar* _tmp43_;
-				BatchImportJob* _tmp44_;
-				gchar* _tmp45_;
-				gchar* _tmp46_;
-				BatchImportJob* _tmp47_;
-				DuplicatedFile* _tmp48_;
-				DuplicatedFile* _tmp49_;
-				BatchImportResult* _tmp50_;
-				BatchImportResult* _tmp51_;
-				BatchImportResult* _tmp52_;
+				BatchImportJob* _tmp43_;
+				DuplicatedFile* _tmp44_;
+				DuplicatedFile* _tmp45_;
+				BatchImportResult* _tmp46_;
+				BatchImportResult* _tmp47_;
+				BatchImportResult* _tmp48_;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp29_ = _job_index;
+				_tmp25_ = _job_index;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_job_index = _tmp29_ + 1;
+				_job_index = _tmp25_ + 1;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp30_ = _job_index;
+				_tmp26_ = _job_index;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp31_ = _job_size;
+				_tmp27_ = _job_size;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp30_ < _tmp31_)) {
+				if (!(_tmp26_ < _tmp27_)) {
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4725 "BatchImport.c"
+#line 5408 "BatchImport.c"
 				}
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = _job_list;
+				_tmp28_ = _job_list;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp33_ = _job_index;
+				_tmp29_ = _job_index;
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp34_ = gee_list_get (_tmp32_, _tmp33_);
+				_tmp30_ = gee_list_get (_tmp28_, _tmp29_);
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				job = (BatchImportJob*) _tmp34_;
+				job = (BatchImportJob*) _tmp30_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp35_ = job;
+				_tmp31_ = job;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp36_ = job;
+				_tmp32_ = job;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp37_ = batch_import_job_get_basename (_tmp36_);
+				_tmp33_ = batch_import_job_get_basename (_tmp32_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp38_ = _tmp37_;
+				_tmp34_ = _tmp33_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp39_ = g_file_new_for_path (_tmp38_);
+				_tmp35_ = g_file_new_for_path (_tmp34_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp40_ = _tmp39_;
+				_tmp36_ = _tmp35_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp41_ = job;
+				_tmp37_ = job;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp42_ = batch_import_job_get_source_identifier (_tmp41_);
+				_tmp38_ = batch_import_job_get_source_identifier (_tmp37_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp43_ = _tmp42_;
+				_tmp39_ = _tmp38_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp44_ = job;
+				_tmp40_ = job;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp45_ = batch_import_job_get_dest_identifier (_tmp44_);
+				_tmp41_ = batch_import_job_get_dest_identifier (_tmp40_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp46_ = _tmp45_;
+				_tmp42_ = _tmp41_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp47_ = job;
+				_tmp43_ = job;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp48_ = batch_import_job_get_duplicated_file (_tmp47_);
+				_tmp44_ = batch_import_job_get_duplicated_file (_tmp43_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp49_ = _tmp48_;
+				_tmp45_ = _tmp44_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp50_ = batch_import_result_new (_tmp35_, _tmp40_, _tmp43_, _tmp46_, _tmp49_, IMPORT_RESULT_PHOTO_EXISTS);
+				_tmp46_ = batch_import_result_new (_tmp31_, _tmp36_, _tmp39_, _tmp42_, _tmp45_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp51_ = _tmp50_;
+				_tmp47_ = _tmp46_;
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp49_);
+				_g_object_unref0 (_tmp45_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp46_);
+				_g_free0 (_tmp42_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp43_);
+				_g_free0 (_tmp39_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp40_);
+				_g_object_unref0 (_tmp36_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp38_);
+				_g_free0 (_tmp34_);
 #line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_result = _tmp51_;
+				batch_result = _tmp47_;
 #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp52_ = batch_result;
+				_tmp48_ = batch_result;
 #line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				import_manifest_add_result (self, _tmp52_);
+				import_manifest_add_result (self, _tmp48_);
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (batch_result);
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4789 "BatchImport.c"
+#line 5472 "BatchImport.c"
 			}
 #line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4793 "BatchImport.c"
+#line 5476 "BatchImport.c"
 		}
 	}
 #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4798 "BatchImport.c"
+#line 5481 "BatchImport.c"
 }
 
 
-ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) {
+ImportManifest*
+import_manifest_new (GeeList* prefailed,
+                     GeeList* pre_already_imported)
+{
 #line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported);
-#line 4805 "BatchImport.c"
+#line 5491 "BatchImport.c"
 }
 
 
-void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_result) {
+void
+import_manifest_add_result (ImportManifest* self,
+                            BatchImportResult* batch_result)
+{
 	gboolean reported = FALSE;
-	BatchImportResult* _tmp0_;
-	ImportResult _tmp1_;
-	gboolean _tmp26_;
+	ImportResult _tmp0_;
+	gboolean _tmp13_;
 #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (self));
 #line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -4817,308 +5505,292 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 #line 362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	reported = TRUE;
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = batch_result;
-#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _tmp0_->result;
+	_tmp0_ = batch_result->result;
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	switch (_tmp1_) {
+	switch (_tmp0_) {
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 4828 "BatchImport.c"
+#line 5514 "BatchImport.c"
 		{
-			GeeList* _tmp2_;
-			BatchImportResult* _tmp3_;
-#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = self->success;
+			GeeList* _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp3_ = batch_result;
+			_tmp1_ = self->success;
 #line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 366 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4840 "BatchImport.c"
+#line 5523 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 4844 "BatchImport.c"
+#line 5527 "BatchImport.c"
 		{
-			gboolean _tmp4_ = FALSE;
-			BatchImportResult* _tmp5_;
-			GFile* _tmp6_;
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = batch_result;
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = _tmp5_->file;
+			gboolean _tmp2_ = FALSE;
+			GFile* _tmp3_;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp6_ != NULL) {
-#line 4855 "BatchImport.c"
-				BatchImportResult* _tmp7_;
-				GFile* _tmp8_;
-				gboolean _tmp9_;
+			_tmp3_ = batch_result->file;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp7_ = batch_result;
+			if (_tmp3_ != NULL) {
+#line 5535 "BatchImport.c"
+				GFile* _tmp4_;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp8_ = _tmp7_->file;
+				_tmp4_ = batch_result->file;
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp9_ = query_is_directory (_tmp8_);
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp4_ = !_tmp9_;
-#line 4867 "BatchImport.c"
+				_tmp2_ = !query_is_directory (_tmp4_);
+#line 5541 "BatchImport.c"
 			} else {
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp4_ = FALSE;
-#line 4871 "BatchImport.c"
+				_tmp2_ = FALSE;
+#line 5545 "BatchImport.c"
 			}
 #line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp4_) {
-#line 4875 "BatchImport.c"
-				GeeList* _tmp10_;
-				BatchImportResult* _tmp11_;
-#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp10_ = self->aborted;
+			if (_tmp2_) {
+#line 5549 "BatchImport.c"
+				GeeList* _tmp5_;
 #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = batch_result;
+				_tmp5_ = self->aborted;
 #line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 4884 "BatchImport.c"
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
+#line 5555 "BatchImport.c"
 			} else {
 #line 372 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				reported = FALSE;
-#line 4888 "BatchImport.c"
+#line 5559 "BatchImport.c"
 			}
 #line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4892 "BatchImport.c"
+#line 5563 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 4896 "BatchImport.c"
+#line 5567 "BatchImport.c"
 		{
-			GeeList* _tmp12_;
-			BatchImportResult* _tmp13_;
-#line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = self->skipped_photos;
+			GeeList* _tmp6_;
 #line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp13_ = batch_result;
+			_tmp6_ = self->skipped_photos;
 #line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4908 "BatchImport.c"
+#line 5576 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_A_FILE:
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 4914 "BatchImport.c"
+#line 5582 "BatchImport.c"
 		{
-			GeeList* _tmp14_;
-			BatchImportResult* _tmp15_;
-#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = self->skipped_files;
+			GeeList* _tmp7_;
 #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp15_ = batch_result;
+			_tmp7_ = self->skipped_files;
 #line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 382 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4926 "BatchImport.c"
+#line 5591 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 4930 "BatchImport.c"
+#line 5595 "BatchImport.c"
 		{
-			GeeList* _tmp16_;
-			BatchImportResult* _tmp17_;
-#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp16_ = self->already_imported;
+			GeeList* _tmp8_;
 #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp17_ = batch_result;
+			_tmp8_ = self->already_imported;
 #line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4942 "BatchImport.c"
+#line 5604 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 4946 "BatchImport.c"
+#line 5608 "BatchImport.c"
 		{
-			GeeList* _tmp18_;
-			BatchImportResult* _tmp19_;
-#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = self->camera_failed;
+			GeeList* _tmp9_;
 #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = batch_result;
+			_tmp9_ = self->camera_failed;
 #line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4958 "BatchImport.c"
+#line 5617 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 4962 "BatchImport.c"
+#line 5621 "BatchImport.c"
 		{
-			GeeList* _tmp20_;
-			BatchImportResult* _tmp21_;
-#line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = self->write_failed;
+			GeeList* _tmp10_;
 #line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp21_ = batch_result;
+			_tmp10_ = self->write_failed;
 #line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4974 "BatchImport.c"
+#line 5630 "BatchImport.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 4978 "BatchImport.c"
+#line 5634 "BatchImport.c"
 		{
-			GeeList* _tmp22_;
-			BatchImportResult* _tmp23_;
+			GeeList* _tmp11_;
 #line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp22_ = self->corrupt_files;
+			_tmp11_ = self->corrupt_files;
 #line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = batch_result;
-#line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4990 "BatchImport.c"
+#line 5643 "BatchImport.c"
 		}
 		default:
 		{
-			GeeList* _tmp24_;
-			BatchImportResult* _tmp25_;
-#line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = self->failed;
+			GeeList* _tmp12_;
 #line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = batch_result;
+			_tmp12_ = self->failed;
 #line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
 #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 5004 "BatchImport.c"
+#line 5654 "BatchImport.c"
 		}
 	}
 #line 405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp26_ = reported;
+	_tmp13_ = reported;
 #line 405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp26_) {
-#line 5011 "BatchImport.c"
-		GeeList* _tmp27_;
-		BatchImportResult* _tmp28_;
-#line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = self->all;
+	if (_tmp13_) {
+#line 5661 "BatchImport.c"
+		GeeList* _tmp14_;
 #line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = batch_result;
+		_tmp14_ = self->all;
 #line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 5020 "BatchImport.c"
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), batch_result);
+#line 5667 "BatchImport.c"
 	}
 }
 
 
-static void value_import_manifest_init (GValue* value) {
+static void
+value_import_manifest_init (GValue* value)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5028 "BatchImport.c"
+#line 5677 "BatchImport.c"
 }
 
 
-static void value_import_manifest_free_value (GValue* value) {
+static void
+value_import_manifest_free_value (GValue* value)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (value->data[0].v_pointer);
-#line 5037 "BatchImport.c"
+#line 5688 "BatchImport.c"
 	}
 }
 
 
-static void value_import_manifest_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_import_manifest_copy_value (const GValue* src_value,
+                                  GValue* dest_value)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer);
-#line 5047 "BatchImport.c"
+#line 5701 "BatchImport.c"
 	} else {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5051 "BatchImport.c"
+#line 5705 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_import_manifest_peek_pointer (const GValue* value) {
+static gpointer
+value_import_manifest_peek_pointer (const GValue* value)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 5059 "BatchImport.c"
+#line 5715 "BatchImport.c"
 }
 
 
-static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_import_manifest_collect_value (GValue* value,
+                                     guint n_collect_values,
+                                     GTypeCValue* collect_values,
+                                     guint collect_flags)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5066 "BatchImport.c"
+#line 5727 "BatchImport.c"
 		ImportManifest * object;
 		object = collect_values[0].v_pointer;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5073 "BatchImport.c"
+#line 5734 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.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 5077 "BatchImport.c"
+#line 5738 "BatchImport.c"
 		}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = import_manifest_ref (object);
-#line 5081 "BatchImport.c"
+#line 5742 "BatchImport.c"
 	} else {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5085 "BatchImport.c"
+#line 5746 "BatchImport.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5089 "BatchImport.c"
+#line 5750 "BatchImport.c"
 }
 
 
-static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_import_manifest_lcopy_value (const GValue* value,
+                                   guint n_collect_values,
+                                   GTypeCValue* collect_values,
+                                   guint collect_flags)
+{
 	ImportManifest ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5100 "BatchImport.c"
+#line 5766 "BatchImport.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 5106 "BatchImport.c"
+#line 5772 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5110 "BatchImport.c"
+#line 5776 "BatchImport.c"
 	} else {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = import_manifest_ref (value->data[0].v_pointer);
-#line 5114 "BatchImport.c"
+#line 5780 "BatchImport.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5118 "BatchImport.c"
+#line 5784 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_import_manifest (const gchar* name,
+                            const gchar* nick,
+                            const gchar* blurb,
+                            GType object_type,
+                            GParamFlags flags)
+{
 	ParamSpecImportManifest* spec;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_IMPORT_MANIFEST), NULL);
@@ -5128,20 +5800,25 @@ GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5132 "BatchImport.c"
+#line 5804 "BatchImport.c"
 }
 
 
-gpointer value_get_import_manifest (const GValue* value) {
+gpointer
+value_get_import_manifest (const GValue* value)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL);
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 5141 "BatchImport.c"
+#line 5815 "BatchImport.c"
 }
 
 
-void value_set_import_manifest (GValue* value, gpointer v_object) {
+void
+value_set_import_manifest (GValue* value,
+                           gpointer v_object)
+{
 	ImportManifest * old;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
@@ -5157,22 +5834,25 @@ void value_set_import_manifest (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_ref (value->data[0].v_pointer);
-#line 5161 "BatchImport.c"
+#line 5838 "BatchImport.c"
 	} else {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5165 "BatchImport.c"
+#line 5842 "BatchImport.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5171 "BatchImport.c"
+#line 5848 "BatchImport.c"
 	}
 }
 
 
-void value_take_import_manifest (GValue* value, gpointer v_object) {
+void
+value_take_import_manifest (GValue* value,
+                            gpointer v_object)
+{
 	ImportManifest * old;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
@@ -5186,31 +5866,35 @@ void value_take_import_manifest (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5190 "BatchImport.c"
+#line 5870 "BatchImport.c"
 	} else {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5194 "BatchImport.c"
+#line 5874 "BatchImport.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5200 "BatchImport.c"
+#line 5880 "BatchImport.c"
 	}
 }
 
 
-static void import_manifest_class_init (ImportManifestClass * klass) {
+static void
+import_manifest_class_init (ImportManifestClass * klass)
+{
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	import_manifest_parent_class = g_type_class_peek_parent (klass);
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ImportManifestClass *) klass)->finalize = import_manifest_finalize;
-#line 5210 "BatchImport.c"
+#line 5892 "BatchImport.c"
 }
 
 
-static void import_manifest_instance_init (ImportManifest * self) {
+static void
+import_manifest_instance_init (ImportManifest * self)
+{
 	GeeArrayList* _tmp0_;
 	GeeArrayList* _tmp1_;
 	GeeArrayList* _tmp2_;
@@ -5268,11 +5952,13 @@ static void import_manifest_instance_init (ImportManifest * self) {
 	self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList);
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 5272 "BatchImport.c"
+#line 5956 "BatchImport.c"
 }
 
 
-static void import_manifest_finalize (ImportManifest * obj) {
+static void
+import_manifest_finalize (ImportManifest * obj)
+{
 	ImportManifest * self;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_MANIFEST, ImportManifest);
@@ -5302,11 +5988,13 @@ static void import_manifest_finalize (ImportManifest * obj) {
 	_g_object_unref0 (self->all);
 #line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_timer_destroy0 (self->timer);
-#line 5306 "BatchImport.c"
+#line 5992 "BatchImport.c"
 }
 
 
-GType import_manifest_get_type (void) {
+GType
+import_manifest_get_type (void)
+{
 	static volatile gsize import_manifest_type_id__volatile = 0;
 	if (g_once_init_enter (&import_manifest_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_import_manifest_init, value_import_manifest_free_value, value_import_manifest_copy_value, value_import_manifest_peek_pointer, "p", value_import_manifest_collect_value, "p", value_import_manifest_lcopy_value };
@@ -5320,18 +6008,22 @@ GType import_manifest_get_type (void) {
 }
 
 
-gpointer import_manifest_ref (gpointer instance) {
+gpointer
+import_manifest_ref (gpointer instance)
+{
 	ImportManifest * self;
 	self = instance;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 5331 "BatchImport.c"
+#line 6021 "BatchImport.c"
 }
 
 
-void import_manifest_unref (gpointer instance) {
+void
+import_manifest_unref (gpointer instance)
+{
 	ImportManifest * self;
 	self = instance;
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5340,72 +6032,89 @@ void import_manifest_unref (gpointer instance) {
 		IMPORT_MANIFEST_GET_CLASS (self)->finalize (self);
 #line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5344 "BatchImport.c"
+#line 6036 "BatchImport.c"
 	}
 }
 
 
-static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) {
+static void
+_batch_import_user_halt_application_exiting (Application* _sender,
+                                             gboolean panicked,
+                                             gpointer self)
+{
 #line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_user_halt ((BatchImport*) self);
-#line 5352 "BatchImport.c"
+#line 6048 "BatchImport.c"
 }
 
 
-static gpointer _batch_import_roll_ref0 (gpointer self) {
+static gpointer
+_batch_import_roll_ref0 (gpointer self)
+{
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_roll_ref (self) : NULL;
-#line 5359 "BatchImport.c"
+#line 6057 "BatchImport.c"
 }
 
 
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
+static guint
+_file_hash_gee_hash_data_func (gconstpointer v,
+                               gpointer self)
+{
 	guint result;
 	result = file_hash ((GFile*) v);
 #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5368 "BatchImport.c"
+#line 6069 "BatchImport.c"
 }
 
 
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gboolean
+_file_equal_gee_equal_data_func (gconstpointer a,
+                                 gconstpointer b,
+                                 gpointer self)
+{
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5377 "BatchImport.c"
+#line 6082 "BatchImport.c"
 }
 
 
-static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self) {
+static gboolean
+_batch_import_display_imported_timer_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = batch_import_display_imported_timer ((BatchImport*) self);
 #line 517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5386 "BatchImport.c"
-}
-
-
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
+#line 6093 "BatchImport.c"
+}
+
+
+BatchImport*
+batch_import_construct (GType object_type,
+                        GeeIterable* jobs,
+                        const gchar* name,
+                        BatchImportImportReporter reporter,
+                        void* reporter_target,
+                        GeeArrayList* prefailed,
+                        GeeArrayList* pre_already_imported,
+                        GCancellable* cancellable,
+                        BatchImportRoll* import_roll,
+                        ImportManifest* skip_manifest)
+{
 	BatchImport * self = NULL;
 	GeeIterable* _tmp0_;
-	GeeIterable* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	BatchImportImportReporter _tmp4_;
-	void* _tmp4__target;
-	GeeArrayList* _tmp5_;
-	GeeArrayList* _tmp6_;
-	ImportManifest* _tmp7_;
-	GCancellable* _tmp8_ = NULL;
-	GCancellable* _tmp9_;
-	GCancellable* _tmp13_;
-	BatchImportRoll* _tmp14_ = NULL;
-	BatchImportRoll* _tmp15_;
-	BatchImportRoll* _tmp19_;
-	ImportManifest* _tmp20_;
-	Application* _tmp38_;
-	Application* _tmp39_;
+	gchar* _tmp1_;
+	ImportManifest* _tmp2_;
+	GCancellable* _tmp3_ = NULL;
+	GCancellable* _tmp6_;
+	BatchImportRoll* _tmp7_ = NULL;
+	BatchImportRoll* _tmp10_;
+	Application* _tmp27_;
+	Application* _tmp28_;
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL);
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5423,229 +6132,214 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImport*) g_object_new (object_type, NULL);
 #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = jobs;
-#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (jobs);
 #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
 #line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->jobs = _tmp1_;
-#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = name;
+	self->priv->jobs = _tmp0_;
 #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (name);
 #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->priv->name);
 #line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->name = _tmp3_;
-#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = reporter;
-#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4__target = reporter_target;
+	self->priv->name = _tmp1_;
 #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->reporter = _tmp4_;
+	self->priv->reporter = reporter;
 #line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->reporter_target = _tmp4__target;
+	self->priv->reporter_target = reporter_target;
 #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = prefailed;
-#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = pre_already_imported;
-#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = import_manifest_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList));
+	_tmp2_ = import_manifest_new (G_TYPE_CHECK_INSTANCE_CAST (prefailed, GEE_TYPE_LIST, GeeList), G_TYPE_CHECK_INSTANCE_CAST (pre_already_imported, GEE_TYPE_LIST, GeeList));
 #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_import_manifest_unref0 (self->priv->manifest);
 #line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->manifest = _tmp7_;
-#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = cancellable;
-#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp9_ != NULL) {
-#line 5464 "BatchImport.c"
-		GCancellable* _tmp10_;
-		GCancellable* _tmp11_;
+	self->priv->manifest = _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = cancellable;
+	if (cancellable != NULL) {
+#line 6159 "BatchImport.c"
+		GCancellable* _tmp4_;
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = _g_object_ref0 (_tmp10_);
+		_tmp4_ = _g_object_ref0 (cancellable);
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp3_);
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp11_;
-#line 5475 "BatchImport.c"
+		_tmp3_ = _tmp4_;
+#line 6167 "BatchImport.c"
 	} else {
-		GCancellable* _tmp12_;
+		GCancellable* _tmp5_;
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = g_cancellable_new ();
+		_tmp5_ = g_cancellable_new ();
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp3_);
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp12_;
-#line 5484 "BatchImport.c"
+		_tmp3_ = _tmp5_;
+#line 6176 "BatchImport.c"
 	}
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _g_object_ref0 (_tmp8_);
+	_tmp6_ = _g_object_ref0 (_tmp3_);
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->cancellable);
 #line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->cancellable = _tmp13_;
-#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = import_roll;
+	self->priv->cancellable = _tmp6_;
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp15_ != NULL) {
-#line 5496 "BatchImport.c"
-		BatchImportRoll* _tmp16_;
-		BatchImportRoll* _tmp17_;
+	if (import_roll != NULL) {
+#line 6186 "BatchImport.c"
+		BatchImportRoll* _tmp8_;
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = import_roll;
+		_tmp8_ = _batch_import_roll_ref0 (import_roll);
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _batch_import_roll_ref0 (_tmp16_);
+		_batch_import_roll_unref0 (_tmp7_);
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_batch_import_roll_unref0 (_tmp14_);
-#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = _tmp17_;
-#line 5507 "BatchImport.c"
+		_tmp7_ = _tmp8_;
+#line 6194 "BatchImport.c"
 	} else {
-		BatchImportRoll* _tmp18_;
+		BatchImportRoll* _tmp9_;
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = batch_import_roll_new ();
+		_tmp9_ = batch_import_roll_new ();
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_batch_import_roll_unref0 (_tmp14_);
+		_batch_import_roll_unref0 (_tmp7_);
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = _tmp18_;
-#line 5516 "BatchImport.c"
+		_tmp7_ = _tmp9_;
+#line 6203 "BatchImport.c"
 	}
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = _batch_import_roll_ref0 (_tmp14_);
+	_tmp10_ = _batch_import_roll_ref0 (_tmp7_);
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_roll_unref0 (self->priv->import_roll);
 #line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->import_roll = _tmp19_;
-#line 506 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp20_ = skip_manifest;
+	self->priv->import_roll = _tmp10_;
 #line 506 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp20_ != NULL) {
-#line 5528 "BatchImport.c"
-		GeeHashSet* _tmp21_;
+	if (skip_manifest != NULL) {
+#line 6213 "BatchImport.c"
+		GeeHashSet* _tmp11_;
 #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
+		_tmp11_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (self->priv->skipset);
 #line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->priv->skipset = _tmp21_;
-#line 5536 "BatchImport.c"
+		self->priv->skipset = _tmp11_;
+#line 6221 "BatchImport.c"
 		{
 			GeeList* _source_list = NULL;
-			ImportManifest* _tmp22_;
-			GeeList* _tmp23_;
-			GeeList* _tmp24_;
+			GeeList* _tmp12_;
+			GeeList* _tmp13_;
 			gint _source_size = 0;
-			GeeList* _tmp25_;
-			gint _tmp26_;
-			gint _tmp27_;
+			GeeList* _tmp14_;
+			gint _tmp15_;
+			gint _tmp16_;
 			gint _source_index = 0;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp22_ = skip_manifest;
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = _tmp22_->imported;
+			_tmp12_ = skip_manifest->imported;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = _g_object_ref0 (_tmp23_);
+			_tmp13_ = _g_object_ref0 (_tmp12_);
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_source_list = _tmp24_;
+			_source_list = _tmp13_;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = _source_list;
+			_tmp14_ = _source_list;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = _tmp26_;
+			_tmp16_ = _tmp15_;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_source_size = _tmp27_;
+			_source_size = _tmp16_;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_source_index = -1;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 5567 "BatchImport.c"
-				gint _tmp28_;
-				gint _tmp29_;
-				gint _tmp30_;
+#line 6249 "BatchImport.c"
+				gint _tmp17_;
+				gint _tmp18_;
+				gint _tmp19_;
 				MediaSource* source = NULL;
-				GeeList* _tmp31_;
-				gint _tmp32_;
-				gpointer _tmp33_;
-				GeeHashSet* _tmp34_;
-				MediaSource* _tmp35_;
-				GFile* _tmp36_;
-				GFile* _tmp37_;
+				GeeList* _tmp20_;
+				gint _tmp21_;
+				gpointer _tmp22_;
+				GeeHashSet* _tmp23_;
+				MediaSource* _tmp24_;
+				GFile* _tmp25_;
+				GFile* _tmp26_;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp28_ = _source_index;
+				_tmp17_ = _source_index;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_source_index = _tmp28_ + 1;
+				_source_index = _tmp17_ + 1;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp29_ = _source_index;
+				_tmp18_ = _source_index;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp30_ = _source_size;
+				_tmp19_ = _source_size;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp29_ < _tmp30_)) {
+				if (!(_tmp18_ < _tmp19_)) {
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 5591 "BatchImport.c"
+#line 6273 "BatchImport.c"
 				}
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp31_ = _source_list;
+				_tmp20_ = _source_list;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = _source_index;
+				_tmp21_ = _source_index;
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
+				_tmp22_ = gee_list_get (_tmp20_, _tmp21_);
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				source = (MediaSource*) _tmp33_;
+				source = (MediaSource*) _tmp22_;
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp34_ = self->priv->skipset;
+				_tmp23_ = self->priv->skipset;
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp35_ = source;
+				_tmp24_ = source;
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp36_ = media_source_get_file (_tmp35_);
+				_tmp25_ = media_source_get_file (_tmp24_);
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp37_ = _tmp36_;
+				_tmp26_ = _tmp25_;
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
 #line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp37_);
+				_g_object_unref0 (_tmp26_);
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (source);
-#line 5615 "BatchImport.c"
+#line 6297 "BatchImport.c"
 			}
 #line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_source_list);
-#line 5619 "BatchImport.c"
+#line 6301 "BatchImport.c"
 		}
 	}
 #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp38_ = application_get_instance ();
+	_tmp27_ = application_get_instance ();
 #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp39_ = _tmp38_;
+	_tmp28_ = _tmp27_;
 #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_connect_object (_tmp39_, "exiting", (GCallback) _batch_import_user_halt_application_exiting, self, 0);
+	g_signal_connect_object (_tmp28_, "exiting", (GCallback) _batch_import_user_halt_application_exiting, self, 0);
 #line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_application_unref0 (_tmp39_);
+	_application_unref0 (_tmp28_);
 #line 517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC, _batch_import_display_imported_timer_gsource_func, g_object_ref (self), g_object_unref);
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_batch_import_roll_unref0 (_tmp14_);
+	_batch_import_roll_unref0 (_tmp7_);
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp3_);
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 5638 "BatchImport.c"
+#line 6320 "BatchImport.c"
 }
 
 
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
+BatchImport*
+batch_import_new (GeeIterable* jobs,
+                  const gchar* name,
+                  BatchImportImportReporter reporter,
+                  void* reporter_target,
+                  GeeArrayList* prefailed,
+                  GeeArrayList* pre_already_imported,
+                  GCancellable* cancellable,
+                  BatchImportRoll* import_roll,
+                  ImportManifest* skip_manifest)
+{
 #line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest);
-#line 5645 "BatchImport.c"
+#line 6337 "BatchImport.c"
 }
 
 
-gchar* batch_import_get_name (BatchImport* self) {
+gchar*
+batch_import_get_name (BatchImport* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -5659,11 +6353,13 @@ gchar* batch_import_get_name (BatchImport* self) {
 	result = _tmp1_;
 #line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5663 "BatchImport.c"
+#line 6357 "BatchImport.c"
 }
 
 
-void batch_import_user_halt (BatchImport* self) {
+void
+batch_import_user_halt (BatchImport* self)
+{
 	GCancellable* _tmp0_;
 #line 531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
@@ -5671,11 +6367,13 @@ void batch_import_user_halt (BatchImport* self) {
 	_tmp0_ = self->priv->cancellable;
 #line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 5675 "BatchImport.c"
+#line 6371 "BatchImport.c"
 }
 
 
-gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
+gboolean
+batch_import_get_untrash_duplicates (BatchImport* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5686,23 +6384,25 @@ gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
 	result = _tmp0_;
 #line 536 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5690 "BatchImport.c"
+#line 6388 "BatchImport.c"
 }
 
 
-void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates) {
-	gboolean _tmp0_;
+void
+batch_import_set_untrash_duplicates (BatchImport* self,
+                                     gboolean untrash_duplicates)
+{
 #line 539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 540 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = untrash_duplicates;
-#line 540 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->untrash_duplicates = _tmp0_;
-#line 5702 "BatchImport.c"
+	self->priv->untrash_duplicates = untrash_duplicates;
+#line 6400 "BatchImport.c"
 }
 
 
-gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
+gboolean
+batch_import_get_mark_duplicates_online (BatchImport* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 543 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -5713,42 +6413,44 @@ gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
 	result = _tmp0_;
 #line 544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5717 "BatchImport.c"
+#line 6417 "BatchImport.c"
 }
 
 
-void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online) {
-	gboolean _tmp0_;
+void
+batch_import_set_mark_duplicates_online (BatchImport* self,
+                                         gboolean mark_duplicates_online)
+{
 #line 547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = mark_duplicates_online;
-#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->mark_duplicates_online = _tmp0_;
-#line 5729 "BatchImport.c"
+	self->priv->mark_duplicates_online = mark_duplicates_online;
+#line 6429 "BatchImport.c"
 }
 
 
-static void batch_import_log_status (BatchImport* self, const gchar* where) {
+static void
+batch_import_log_status (BatchImport* self,
+                         const gchar* where)
+{
 #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (where != NULL);
-#line 5738 "BatchImport.c"
+#line 6441 "BatchImport.c"
 }
 
 
-static gboolean batch_import_report_failure (BatchImport* self, BatchImportResult* import_result) {
+static gboolean
+batch_import_report_failure (BatchImport* self,
+                             BatchImportResult* import_result)
+{
 	gboolean result = FALSE;
 	gboolean proceed = FALSE;
 	ImportManifest* _tmp0_;
-	BatchImportResult* _tmp1_;
-	BatchImportResult* _tmp2_;
-	ImportResult _tmp3_;
-	gboolean _tmp23_ = FALSE;
-	BatchImportResult* _tmp24_;
-	ImportResult _tmp25_;
-	gboolean _tmp26_;
+	ImportResult _tmp1_;
+	gboolean _tmp14_ = FALSE;
+	ImportResult _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 561 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
@@ -5759,265 +6461,224 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 #line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->manifest;
 #line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = import_result;
-#line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	import_manifest_add_result (_tmp0_, _tmp1_);
+	import_manifest_add_result (_tmp0_, import_result);
 #line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = import_result;
+	_tmp1_ = import_result->result;
 #line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _tmp2_->result;
-#line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp3_ != IMPORT_RESULT_SUCCESS) {
-#line 5772 "BatchImport.c"
-		BatchImportResult* _tmp4_;
-		gboolean _tmp5_ = FALSE;
-		BatchImportResult* _tmp6_;
-		GFile* _tmp7_;
-#line 567 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = import_result;
+	if (_tmp1_ != IMPORT_RESULT_SUCCESS) {
+#line 6470 "BatchImport.c"
+		gboolean _tmp2_ = FALSE;
+		GFile* _tmp3_;
 #line 567 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, _tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = import_result;
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, import_result);
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = _tmp6_->file;
+		_tmp3_ = import_result->file;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp7_ != NULL) {
-#line 5787 "BatchImport.c"
-			BatchImportResult* _tmp8_;
-			ImportResult _tmp9_;
-			gboolean _tmp10_;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp8_ = import_result;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = _tmp8_->result;
+		if (_tmp3_ != NULL) {
+#line 6479 "BatchImport.c"
+			ImportResult _tmp4_;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = import_result_is_abort (_tmp9_);
+			_tmp4_ = import_result->result;
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = !_tmp10_;
-#line 5799 "BatchImport.c"
+			_tmp2_ = !import_result_is_abort (_tmp4_);
+#line 6485 "BatchImport.c"
 		} else {
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = FALSE;
-#line 5803 "BatchImport.c"
+			_tmp2_ = FALSE;
+#line 6489 "BatchImport.c"
 		}
 #line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp5_) {
-#line 5807 "BatchImport.c"
+		if (_tmp2_) {
+#line 6493 "BatchImport.c"
 			guint64 filesize = 0ULL;
-			guint64 _tmp22_;
+			guint64 _tmp13_;
 #line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filesize = (guint64) 0;
-#line 5812 "BatchImport.c"
+#line 6498 "BatchImport.c"
 			{
-				guint64 _tmp11_ = 0ULL;
-				BatchImportResult* _tmp12_;
-				GFile* _tmp13_;
-				guint64 _tmp14_;
-#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = import_result;
+				guint64 _tmp5_ = 0ULL;
+				GFile* _tmp6_;
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp13_ = _tmp12_->file;
+				_tmp6_ = import_result->file;
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp14_ = query_total_file_size (_tmp13_, NULL, &_inner_error_);
-#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = _tmp14_;
+				_tmp5_ = query_total_file_size (_tmp6_, NULL, &_inner_error_);
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5828 "BatchImport.c"
+#line 6508 "BatchImport.c"
 					goto __catch423_g_error;
 				}
 #line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				filesize = _tmp11_;
-#line 5833 "BatchImport.c"
+				filesize = _tmp5_;
+#line 6513 "BatchImport.c"
 			}
 			goto __finally423;
 			__catch423_g_error:
 			{
 				GError* err = NULL;
-				BatchImportResult* _tmp15_;
-				GFile* _tmp16_;
-				gchar* _tmp17_;
-				gchar* _tmp18_;
-				GError* _tmp19_;
-				const gchar* _tmp20_;
+				GFile* _tmp7_;
+				gchar* _tmp8_;
+				gchar* _tmp9_;
+				GError* _tmp10_;
+				const gchar* _tmp11_;
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp15_ = import_result;
-#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp16_ = _tmp15_->file;
+				_tmp7_ = import_result->file;
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp17_ = g_file_get_path (_tmp16_);
+				_tmp8_ = g_file_get_path (_tmp7_);
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = _tmp17_;
+				_tmp9_ = _tmp8_;
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp19_ = err;
+				_tmp10_ = err;
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp20_ = _tmp19_->message;
+				_tmp11_ = _tmp10_->message;
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:575: Unable to query file size of %s: %s", _tmp18_, _tmp20_);
+				g_warning ("BatchImport.vala:575: Unable to query file size of %s: %s", _tmp9_, _tmp11_);
 #line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp18_);
+				_g_free0 (_tmp9_);
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 5867 "BatchImport.c"
+#line 6544 "BatchImport.c"
 			}
 			__finally423:
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5872 "BatchImport.c"
-				gboolean _tmp21_ = FALSE;
+#line 6549 "BatchImport.c"
+				gboolean _tmp12_ = FALSE;
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
 #line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				return _tmp21_;
-#line 5880 "BatchImport.c"
+				return _tmp12_;
+#line 6557 "BatchImport.c"
 			}
 #line 579 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp22_ = filesize;
+			_tmp13_ = filesize;
 #line 579 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			batch_import_report_progress (self, _tmp22_);
-#line 5886 "BatchImport.c"
+			batch_import_report_progress (self, _tmp13_);
+#line 6563 "BatchImport.c"
 		}
 	}
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp24_ = import_result;
-#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp25_ = _tmp24_->result;
+	_tmp15_ = import_result->result;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp26_ = import_result_is_nonuser_abort (_tmp25_);
+	if (import_result_is_nonuser_abort (_tmp15_)) {
+#line 6570 "BatchImport.c"
+		gboolean _tmp16_;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp26_) {
-#line 5897 "BatchImport.c"
-		gboolean _tmp27_;
+		_tmp16_ = proceed;
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = proceed;
-#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = _tmp27_;
-#line 5903 "BatchImport.c"
+		_tmp14_ = _tmp16_;
+#line 6576 "BatchImport.c"
 	} else {
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = FALSE;
-#line 5907 "BatchImport.c"
+		_tmp14_ = FALSE;
+#line 6580 "BatchImport.c"
 	}
 #line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp23_) {
-#line 5911 "BatchImport.c"
-		BatchImportResult* _tmp28_;
-		ImportResult _tmp29_;
-		BatchImportResult* _tmp30_;
-		const gchar* _tmp31_;
-#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = import_result;
-#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = _tmp28_->result;
+	if (_tmp14_) {
+#line 6584 "BatchImport.c"
+		ImportResult _tmp17_;
+		const gchar* _tmp18_;
 #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = import_result;
+		_tmp17_ = import_result->result;
 #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = _tmp30_->errmsg;
+		_tmp18_ = import_result->errmsg;
 #line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp29_, _tmp31_);
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp17_, _tmp18_);
 #line 586 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		proceed = FALSE;
-#line 5928 "BatchImport.c"
+#line 6595 "BatchImport.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
 #line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5934 "BatchImport.c"
+#line 6601 "BatchImport.c"
 }
 
 
-static void batch_import_report_progress (BatchImport* self, guint64 increment_of_progress) {
+static void
+batch_import_report_progress (BatchImport* self,
+                              guint64 increment_of_progress)
+{
 	guint64 _tmp0_;
 	guint64 _tmp1_;
-	guint64 _tmp2_;
 #line 592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed_bytes;
 #line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = increment_of_progress;
-#line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->completed_bytes = _tmp0_ + _tmp1_;
+	self->priv->completed_bytes = _tmp0_ + increment_of_progress;
 #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = self->priv->completed_bytes;
+	_tmp1_ = self->priv->completed_bytes;
 #line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp2_ == ((guint64) 0)) {
-#line 5954 "BatchImport.c"
+	if (_tmp1_ == ((guint64) 0)) {
+#line 6621 "BatchImport.c"
 		gulong now = 0UL;
+		gulong _tmp2_;
 		gulong _tmp3_;
-		gulong _tmp4_;
-		gulong _tmp5_;
-#line 598 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = now_ms ();
 #line 598 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		now = _tmp3_;
+		now = now_ms ();
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = now;
+		_tmp2_ = now;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = self->priv->last_preparing_ms;
+		_tmp3_ = self->priv->last_preparing_ms;
 #line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if ((_tmp4_ - _tmp5_) > ((gulong) 250)) {
-#line 5969 "BatchImport.c"
-			gulong _tmp6_;
+		if ((_tmp2_ - _tmp3_) > ((gulong) 250)) {
+#line 6633 "BatchImport.c"
+			gulong _tmp4_;
 #line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = now;
+			_tmp4_ = now;
 #line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			self->priv->last_preparing_ms = _tmp6_;
+			self->priv->last_preparing_ms = _tmp4_;
 #line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL], 0);
-#line 5977 "BatchImport.c"
+#line 6641 "BatchImport.c"
 		}
 	} else {
-		guint64 _tmp7_;
-#line 603 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = increment_of_progress;
 #line 603 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp7_ > ((guint64) 0)) {
-#line 5985 "BatchImport.c"
+		if (increment_of_progress > ((guint64) 0)) {
+#line 6646 "BatchImport.c"
 			gulong now = 0UL;
-			gulong _tmp8_;
-			gulong _tmp9_;
-			gulong _tmp10_;
-#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp8_ = now_ms ();
+			gulong _tmp5_;
+			gulong _tmp6_;
 #line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			now = _tmp8_;
+			now = now_ms ();
 #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = now;
+			_tmp5_ = now;
 #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = self->priv->last_preparing_ms;
+			_tmp6_ = self->priv->last_preparing_ms;
 #line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if ((_tmp9_ - _tmp10_) > ((gulong) 250)) {
-#line 6000 "BatchImport.c"
-				gulong _tmp11_;
-				guint64 _tmp12_;
-				guint64 _tmp13_;
+			if ((_tmp5_ - _tmp6_) > ((gulong) 250)) {
+#line 6658 "BatchImport.c"
+				gulong _tmp7_;
+				guint64 _tmp8_;
+				guint64 _tmp9_;
 #line 606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = now;
+				_tmp7_ = now;
 #line 606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				self->priv->last_preparing_ms = _tmp11_;
+				self->priv->last_preparing_ms = _tmp7_;
 #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = self->priv->completed_bytes;
+				_tmp8_ = self->priv->completed_bytes;
 #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp13_ = self->priv->total_bytes;
+				_tmp9_ = self->priv->total_bytes;
 #line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp12_, _tmp13_);
-#line 6014 "BatchImport.c"
+				g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp8_, _tmp9_);
+#line 6672 "BatchImport.c"
 			}
 		}
 	}
 }
 
 
-static gboolean batch_import_report_failures (BatchImport* self, BackgroundImportJob* background_job) {
+static gboolean
+batch_import_report_failures (BatchImport* self,
+                              BackgroundImportJob* background_job)
+{
 	gboolean result = FALSE;
 	gboolean proceed = FALSE;
 #line 612 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6026,107 +6687,103 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE);
 #line 613 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	proceed = TRUE;
-#line 6030 "BatchImport.c"
+#line 6691 "BatchImport.c"
 	{
 		GeeList* _import_result_list = NULL;
-		BackgroundImportJob* _tmp0_;
+		GeeList* _tmp0_;
 		GeeList* _tmp1_;
-		GeeList* _tmp2_;
 		gint _import_result_size = 0;
-		GeeList* _tmp3_;
+		GeeList* _tmp2_;
+		gint _tmp3_;
 		gint _tmp4_;
-		gint _tmp5_;
 		gint _import_result_index = 0;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = background_job;
+		_tmp0_ = background_job->failed;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp1_ = _tmp0_->failed;
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = _g_object_ref0 (_tmp1_);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_import_result_list = _tmp2_;
+		_import_result_list = _tmp1_;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = _import_result_list;
+		_tmp2_ = _import_result_list;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_import_result_size = _tmp5_;
+		_import_result_size = _tmp4_;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_import_result_index = -1;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 6061 "BatchImport.c"
+#line 6719 "BatchImport.c"
+			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
-			gint _tmp8_;
 			BatchImportResult* import_result = NULL;
-			GeeList* _tmp9_;
-			gint _tmp10_;
-			gpointer _tmp11_;
-			BatchImportResult* _tmp12_;
-			gboolean _tmp13_;
+			GeeList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			BatchImportResult* _tmp11_;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = _import_result_index;
+			_tmp5_ = _import_result_index;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_import_result_index = _tmp6_ + 1;
+			_import_result_index = _tmp5_ + 1;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp7_ = _import_result_index;
+			_tmp6_ = _import_result_index;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp8_ = _import_result_size;
+			_tmp7_ = _import_result_size;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!(_tmp7_ < _tmp8_)) {
+			if (!(_tmp6_ < _tmp7_)) {
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6083 "BatchImport.c"
+#line 6740 "BatchImport.c"
 			}
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = _import_result_list;
+			_tmp8_ = _import_result_list;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = _import_result_index;
+			_tmp9_ = _import_result_index;
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			import_result = (BatchImportResult*) _tmp11_;
-#line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = import_result;
+			import_result = (BatchImportResult*) _tmp10_;
 #line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp13_ = batch_import_report_failure (self, _tmp12_);
+			_tmp11_ = import_result;
 #line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!_tmp13_) {
+			if (!batch_import_report_failure (self, _tmp11_)) {
 #line 617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				proceed = FALSE;
-#line 6101 "BatchImport.c"
+#line 6756 "BatchImport.c"
 			}
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (import_result);
-#line 6105 "BatchImport.c"
+#line 6760 "BatchImport.c"
 		}
 #line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_import_result_list);
-#line 6109 "BatchImport.c"
+#line 6764 "BatchImport.c"
 	}
 #line 620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
 #line 620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6115 "BatchImport.c"
+#line 6770 "BatchImport.c"
 }
 
 
-static void batch_import_report_completed (BatchImport* self, const gchar* where) {
+static void
+batch_import_report_completed (BatchImport* self,
+                               const gchar* where)
+{
 	gboolean _tmp0_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	ImportManifest* _tmp5_;
-	GTimer* _tmp6_;
-	gdouble _tmp7_;
-	BatchImportImportReporter _tmp8_;
-	void* _tmp8__target;
-	ImportManifest* _tmp12_;
-	BatchImportRoll* _tmp13_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	ImportManifest* _tmp3_;
+	GTimer* _tmp4_;
+	gdouble _tmp5_;
+	BatchImportImportReporter _tmp6_;
+	void* _tmp6__target;
+	ImportManifest* _tmp10_;
+	BatchImportRoll* _tmp11_;
 #line 623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 623 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6135,71 +6792,67 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 	_tmp0_ = self->priv->completed;
 #line 624 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6139 "BatchImport.c"
-		const gchar* _tmp1_;
-#line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp1_ = where;
 #line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_error ("BatchImport.vala:625: Attempted to complete already-completed import: " \
-"%s", _tmp1_);
-#line 6145 "BatchImport.c"
+"%s", where);
+#line 6798 "BatchImport.c"
 	}
 #line 627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed = TRUE;
 #line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_ready_sources (self);
 #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = where;
-#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = g_strdup_printf ("Import completed: %s", _tmp2_);
+	_tmp1_ = g_strdup_printf ("Import completed: %s", where);
 #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_log_status (self, _tmp4_);
+	batch_import_log_status (self, _tmp2_);
 #line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp2_);
 #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = self->priv->manifest;
+	_tmp3_ = self->priv->manifest;
 #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = _tmp5_->timer;
+	_tmp4_ = _tmp3_->timer;
 #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = g_timer_elapsed (_tmp6_, NULL);
+	_tmp5_ = g_timer_elapsed (_tmp4_, NULL);
 #line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_debug ("BatchImport.vala:632: Import complete after %f", _tmp7_);
+	g_debug ("BatchImport.vala:632: Import complete after %f", _tmp5_);
 #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = self->priv->reporter;
+	_tmp6_ = self->priv->reporter;
 #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8__target = self->priv->reporter_target;
+	_tmp6__target = self->priv->reporter_target;
 #line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp8_ != NULL) {
-#line 6175 "BatchImport.c"
-		BatchImportImportReporter _tmp9_;
-		void* _tmp9__target;
-		ImportManifest* _tmp10_;
-		BatchImportRoll* _tmp11_;
+	if (_tmp6_ != NULL) {
+#line 6826 "BatchImport.c"
+		BatchImportImportReporter _tmp7_;
+		void* _tmp7__target;
+		ImportManifest* _tmp8_;
+		BatchImportRoll* _tmp9_;
 #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = self->priv->reporter;
+		_tmp7_ = self->priv->reporter;
 #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9__target = self->priv->reporter_target;
+		_tmp7__target = self->priv->reporter_target;
 #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = self->priv->manifest;
+		_tmp8_ = self->priv->manifest;
 #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = self->priv->import_roll;
+		_tmp9_ = self->priv->import_roll;
 #line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ (_tmp10_, _tmp11_, _tmp9__target);
-#line 6190 "BatchImport.c"
+		_tmp7_ (_tmp8_, _tmp9_, _tmp7__target);
+#line 6841 "BatchImport.c"
 	}
 #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = self->priv->manifest;
+	_tmp10_ = self->priv->manifest;
 #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = self->priv->import_roll;
+	_tmp11_ = self->priv->import_roll;
 #line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp12_, _tmp13_);
-#line 6198 "BatchImport.c"
+	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp10_, _tmp11_);
+#line 6849 "BatchImport.c"
 }
 
 
-static void batch_import_file_import_complete (BatchImport* self) {
+static void
+batch_import_file_import_complete (BatchImport* self)
+{
 	gint _tmp0_;
 	gint _tmp1_;
 	gboolean _tmp4_ = FALSE;
@@ -6214,7 +6867,7 @@ static void batch_import_file_import_complete (BatchImport* self) {
 	_tmp1_ = self->priv->file_imports_to_perform;
 #line 645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != -1) {
-#line 6217 "BatchImport.c"
+#line 6870 "BatchImport.c"
 		gint _tmp2_;
 		gint _tmp3_;
 #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6223,13 +6876,13 @@ static void batch_import_file_import_complete (BatchImport* self) {
 		_tmp3_ = self->priv->file_imports_to_perform;
 #line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform");
-#line 6226 "BatchImport.c"
+#line 6879 "BatchImport.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = self->priv->file_imports_to_perform;
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ != -1) {
-#line 6232 "BatchImport.c"
+#line 6885 "BatchImport.c"
 		gint _tmp6_;
 		gint _tmp7_;
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6238,45 +6891,55 @@ static void batch_import_file_import_complete (BatchImport* self) {
 		_tmp7_ = self->priv->file_imports_to_perform;
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp6_ == _tmp7_;
-#line 6241 "BatchImport.c"
+#line 6894 "BatchImport.c"
 	} else {
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = FALSE;
-#line 6245 "BatchImport.c"
+#line 6898 "BatchImport.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
 #line 651 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 6251 "BatchImport.c"
+#line 6904 "BatchImport.c"
 	}
 }
 
 
-static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job,
+                                                       gpointer self)
+{
 #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_work_sniffed_out ((BatchImport*) self, job);
-#line 6259 "BatchImport.c"
+#line 6915 "BatchImport.c"
 }
 
 
-static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job,
+                                                          gpointer self)
+{
 #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_sniffer_cancelled ((BatchImport*) self, job);
-#line 6266 "BatchImport.c"
+#line 6925 "BatchImport.c"
 }
 
 
-static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) {
+static gboolean
+_batch_import_on_sniffer_working_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = batch_import_on_sniffer_working ((BatchImport*) self);
 #line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6275 "BatchImport.c"
+#line 6936 "BatchImport.c"
 }
 
 
-void batch_import_schedule (BatchImport* self) {
+void
+batch_import_schedule (BatchImport* self)
+{
 	gboolean _tmp0_;
 	Workers* _tmp1_;
 	GeeIterable* _tmp2_;
@@ -6284,7 +6947,6 @@ void batch_import_schedule (BatchImport* self) {
 	GeeHashSet* _tmp4_;
 	WorkSniffer* _tmp5_;
 	WorkSniffer* _tmp6_;
-	guint _tmp7_;
 #line 654 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 655 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6312,14 +6974,14 @@ void batch_import_schedule (BatchImport* self) {
 #line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (_tmp6_);
 #line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref);
-#line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->throbber_id = _tmp7_;
-#line 6318 "BatchImport.c"
+	self->priv->throbber_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref);
+#line 6978 "BatchImport.c"
 }
 
 
-static gboolean batch_import_on_sniffer_working (BatchImport* self) {
+static gboolean
+batch_import_on_sniffer_working (BatchImport* self)
+{
 	gboolean result = FALSE;
 #line 670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
@@ -6329,56 +6991,69 @@ static gboolean batch_import_on_sniffer_working (BatchImport* self) {
 	result = TRUE;
 #line 673 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6332 "BatchImport.c"
+#line 6994 "BatchImport.c"
 }
 
 
-static gpointer _background_job_ref0 (gpointer self) {
+static gpointer
+_background_job_ref0 (gpointer self)
+{
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 6339 "BatchImport.c"
+#line 7003 "BatchImport.c"
 }
 
 
-static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) {
+static void
+_batch_import_on_file_prepared_notification_callback (BackgroundJob* job,
+                                                      NotificationObject* user,
+                                                      gpointer self)
+{
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepared ((BatchImport*) self, job, user);
-#line 6346 "BatchImport.c"
+#line 7014 "BatchImport.c"
 }
 
 
-static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_files_prepared_completion_callback (BackgroundJob* job,
+                                                     gpointer self)
+{
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_files_prepared ((BatchImport*) self, job);
-#line 6353 "BatchImport.c"
+#line 7024 "BatchImport.c"
 }
 
 
-static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job,
+                                                               gpointer self)
+{
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepare_cancelled ((BatchImport*) self, job);
-#line 6360 "BatchImport.c"
+#line 7034 "BatchImport.c"
 }
 
 
-static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_work_sniffed_out (BatchImport* self,
+                                  BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	WorkSniffer* sniffer = NULL;
-	BackgroundJob* _tmp1_;
-	WorkSniffer* _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	WorkSniffer* _tmp4_;
-	gboolean _tmp5_;
-	WorkSniffer* _tmp10_;
-	guint64 _tmp11_;
+	WorkSniffer* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	WorkSniffer* _tmp3_;
+	WorkSniffer* _tmp8_;
+	guint64 _tmp9_;
 	PrepareFilesJob* prepare_files_job = NULL;
-	WorkSniffer* _tmp12_;
-	GeeList* _tmp13_;
-	GCancellable* _tmp14_;
+	WorkSniffer* _tmp10_;
+	GeeList* _tmp11_;
+	GCancellable* _tmp12_;
+	PrepareFilesJob* _tmp13_;
+	Workers* _tmp14_;
 	PrepareFilesJob* _tmp15_;
-	Workers* _tmp16_;
-	PrepareFilesJob* _tmp17_;
-	guint _tmp18_;
+	guint _tmp16_;
 #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6388,100 +7063,98 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 #line 677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_WORK_SNIFFER, WorkSniffer));
 #line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer));
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	sniffer = _tmp2_;
+	sniffer = _tmp1_;
 #line 681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_work_sniffed_out");
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = sniffer;
-#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
+	_tmp3_ = sniffer;
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (!_tmp5_) {
+	if (!batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob))) {
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = TRUE;
-#line 6406 "BatchImport.c"
+		_tmp2_ = TRUE;
+#line 7077 "BatchImport.c"
 	} else {
-		WorkSniffer* _tmp6_;
-		GeeList* _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
+		WorkSniffer* _tmp4_;
+		GeeList* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = sniffer;
+		_tmp4_ = sniffer;
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = _tmp6_->files_to_prepare;
+		_tmp5_ = _tmp4_->files_to_prepare;
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp8_;
+		_tmp7_ = _tmp6_;
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = _tmp9_ == 0;
-#line 6422 "BatchImport.c"
+		_tmp2_ = _tmp7_ == 0;
+#line 7093 "BatchImport.c"
 	}
 #line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "work sniffed out: nothing to do");
 #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_background_job_unref0 (sniffer);
 #line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 6432 "BatchImport.c"
+#line 7103 "BatchImport.c"
 	}
 #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = sniffer;
+	_tmp8_ = sniffer;
 #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = _tmp10_->total_bytes;
+	_tmp9_ = _tmp8_->total_bytes;
 #line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->total_bytes = _tmp11_;
+	self->priv->total_bytes = _tmp9_;
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = sniffer;
+	_tmp10_ = sniffer;
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _tmp12_->files_to_prepare;
+	_tmp11_ = _tmp10_->files_to_prepare;
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = self->priv->cancellable;
+	_tmp12_ = self->priv->cancellable;
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = prepare_files_job_new (self, _tmp13_, _batch_import_on_file_prepared_notification_callback, self, _batch_import_on_files_prepared_completion_callback, self, _tmp14_, _batch_import_on_file_prepare_cancelled_cancellation_callback, self);
+	_tmp13_ = prepare_files_job_new (self, _tmp11_, _batch_import_on_file_prepared_notification_callback, self, _batch_import_on_files_prepared_completion_callback, self, _tmp12_, _batch_import_on_file_prepare_cancelled_cancellation_callback, self);
 #line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	prepare_files_job = _tmp15_;
+	prepare_files_job = _tmp13_;
 #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp16_ = batch_import_feeder_workers;
+	_tmp14_ = batch_import_feeder_workers;
 #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp17_ = prepare_files_job;
+	_tmp15_ = prepare_files_job;
 #line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	workers_enqueue (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_BACKGROUND_JOB, BackgroundJob));
+	workers_enqueue (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = self->priv->throbber_id;
+	_tmp16_ = self->priv->throbber_id;
 #line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp18_ > ((guint) 0)) {
-#line 6460 "BatchImport.c"
-		guint _tmp19_;
+	if (_tmp16_ > ((guint) 0)) {
+#line 7131 "BatchImport.c"
+		guint _tmp17_;
 #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = self->priv->throbber_id;
+		_tmp17_ = self->priv->throbber_id;
 #line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_source_remove (_tmp19_);
+		g_source_remove (_tmp17_);
 #line 703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6468 "BatchImport.c"
+#line 7139 "BatchImport.c"
 	}
 #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
 #line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6474 "BatchImport.c"
+#line 7145 "BatchImport.c"
 }
 
 
-static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_sniffer_cancelled (BatchImport* self,
+                                   BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	WorkSniffer* sniffer = NULL;
-	BackgroundJob* _tmp1_;
+	WorkSniffer* _tmp1_;
 	WorkSniffer* _tmp2_;
-	WorkSniffer* _tmp3_;
-	guint _tmp4_;
+	guint _tmp3_;
 #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6491,84 +7164,96 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
 #line 708 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_WORK_SNIFFER, WorkSniffer));
 #line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer));
-#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	sniffer = _tmp2_;
+	sniffer = _tmp1_;
 #line 712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_sniffer_cancelled");
 #line 714 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = sniffer;
+	_tmp2_ = sniffer;
 #line 714 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
+	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
 #line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_completed (self, "work sniffer cancelled");
 #line 717 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = self->priv->throbber_id;
+	_tmp3_ = self->priv->throbber_id;
 #line 717 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp4_ > ((guint) 0)) {
-#line 6511 "BatchImport.c"
-		guint _tmp5_;
+	if (_tmp3_ > ((guint) 0)) {
+#line 7182 "BatchImport.c"
+		guint _tmp4_;
 #line 718 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = self->priv->throbber_id;
+		_tmp4_ = self->priv->throbber_id;
 #line 718 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_source_remove (_tmp5_);
+		g_source_remove (_tmp4_);
 #line 719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6519 "BatchImport.c"
+#line 7190 "BatchImport.c"
 	}
 #line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6523 "BatchImport.c"
+#line 7194 "BatchImport.c"
 }
 
 
-static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job,
+                                                                 gpointer self)
+{
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job);
-#line 6530 "BatchImport.c"
+#line 7204 "BatchImport.c"
 }
 
 
-static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job,
+                                                                   gpointer self)
+{
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job);
-#line 6537 "BatchImport.c"
+#line 7214 "BatchImport.c"
 }
 
 
-static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_import_files_completed_completion_callback (BackgroundJob* job,
+                                                             gpointer self)
+{
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_completed ((BatchImport*) self, job);
-#line 6544 "BatchImport.c"
+#line 7224 "BatchImport.c"
 }
 
 
-static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
+static void
+_batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job,
+                                                               gpointer self)
+{
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_cancelled ((BatchImport*) self, job);
-#line 6551 "BatchImport.c"
+#line 7234 "BatchImport.c"
 }
 
 
-static void batch_import_flush_import_jobs (BatchImport* self) {
+static void
+batch_import_flush_import_jobs (BatchImport* self)
+{
 #line 727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6560 "BatchImport.c"
+#line 7245 "BatchImport.c"
 		gboolean _tmp0_ = FALSE;
 		GeeList* _tmp1_;
 		gint _tmp2_;
 		gint _tmp3_;
-		Workers* _tmp7_;
-		GeeList* _tmp8_;
-		gpointer _tmp9_;
-		CompletedImportObject* _tmp10_;
-		GCancellable* _tmp11_;
+		Workers* _tmp6_;
+		GeeList* _tmp7_;
+		gpointer _tmp8_;
+		CompletedImportObject* _tmp9_;
+		GCancellable* _tmp10_;
+		ThumbnailWriterJob* _tmp11_;
 		ThumbnailWriterJob* _tmp12_;
-		ThumbnailWriterJob* _tmp13_;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = self->priv->ready_thumbnails;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6577,240 +7262,221 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		_tmp3_ = _tmp2_;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ > 0) {
-#line 6580 "BatchImport.c"
+#line 7265 "BatchImport.c"
 			Workers* _tmp4_;
-			gint _tmp5_;
-			guint _tmp6_;
+			guint _tmp5_;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = batch_import_import_workers;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = workers_get_pending_job_count (_tmp4_);
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = self->priv->max_outstanding_import_jobs;
+			_tmp5_ = self->priv->max_outstanding_import_jobs;
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp0_ = ((guint) _tmp5_) < _tmp6_;
-#line 6592 "BatchImport.c"
+			_tmp0_ = ((guint) workers_get_pending_job_count (_tmp4_)) < _tmp5_;
+#line 7274 "BatchImport.c"
 		} else {
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = FALSE;
-#line 6596 "BatchImport.c"
+#line 7278 "BatchImport.c"
 		}
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
 #line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6602 "BatchImport.c"
+#line 7284 "BatchImport.c"
 		}
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = batch_import_import_workers;
+		_tmp6_ = batch_import_import_workers;
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = self->priv->ready_thumbnails;
+		_tmp7_ = self->priv->ready_thumbnails;
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = gee_list_remove_at (_tmp8_, 0);
+		_tmp8_ = gee_list_remove_at (_tmp7_, 0);
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = (CompletedImportObject*) _tmp9_;
+		_tmp9_ = (CompletedImportObject*) _tmp8_;
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = self->priv->cancellable;
+		_tmp10_ = self->priv->cancellable;
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = thumbnail_writer_job_new (self, _tmp10_, _batch_import_on_thumbnail_writer_completed_completion_callback, self, _tmp11_, _batch_import_on_thumbnail_writer_cancelled_cancellation_callback, self);
+		_tmp11_ = thumbnail_writer_job_new (self, _tmp9_, _batch_import_on_thumbnail_writer_completed_completion_callback, self, _tmp10_, _batch_import_on_thumbnail_writer_cancelled_cancellation_callback, self);
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		workers_enqueue (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_BACKGROUND_JOB, BackgroundJob));
+		workers_enqueue (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_background_job_unref0 (_tmp13_);
+		_background_job_unref0 (_tmp12_);
 #line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_completed_import_object_unref0 (_tmp10_);
-#line 6624 "BatchImport.c"
+		_completed_import_object_unref0 (_tmp9_);
+#line 7306 "BatchImport.c"
 	}
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6628 "BatchImport.c"
-		gboolean _tmp14_ = FALSE;
-		GeeList* _tmp15_;
+#line 7310 "BatchImport.c"
+		gboolean _tmp13_ = FALSE;
+		GeeList* _tmp14_;
+		gint _tmp15_;
 		gint _tmp16_;
-		gint _tmp17_;
-		Workers* _tmp21_;
-		GeeList* _tmp22_;
-		gpointer _tmp23_;
-		PreparedFile* _tmp24_;
-		BatchImportRoll* _tmp25_;
-		ImportID _tmp26_;
-		GCancellable* _tmp27_;
-		PreparedFileImportJob* _tmp28_;
-		PreparedFileImportJob* _tmp29_;
-#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = self->priv->ready_files;
+		Workers* _tmp19_;
+		GeeList* _tmp20_;
+		gpointer _tmp21_;
+		PreparedFile* _tmp22_;
+		BatchImportRoll* _tmp23_;
+		ImportID _tmp24_;
+		GCancellable* _tmp25_;
+		PreparedFileImportJob* _tmp26_;
+		PreparedFileImportJob* _tmp27_;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp14_ = self->priv->ready_files;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp16_;
+		_tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp17_ > 0) {
-#line 6650 "BatchImport.c"
-			Workers* _tmp18_;
-			gint _tmp19_;
-			guint _tmp20_;
+		_tmp16_ = _tmp15_;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = batch_import_import_workers;
+		if (_tmp16_ > 0) {
+#line 7332 "BatchImport.c"
+			Workers* _tmp17_;
+			guint _tmp18_;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = workers_get_pending_job_count (_tmp18_);
+			_tmp17_ = batch_import_import_workers;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = self->priv->max_outstanding_import_jobs;
+			_tmp18_ = self->priv->max_outstanding_import_jobs;
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = ((guint) _tmp19_) < _tmp20_;
-#line 6662 "BatchImport.c"
+			_tmp13_ = ((guint) workers_get_pending_job_count (_tmp17_)) < _tmp18_;
+#line 7341 "BatchImport.c"
 		} else {
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = FALSE;
-#line 6666 "BatchImport.c"
+			_tmp13_ = FALSE;
+#line 7345 "BatchImport.c"
 		}
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!_tmp14_) {
+		if (!_tmp13_) {
 #line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6672 "BatchImport.c"
+#line 7351 "BatchImport.c"
 		}
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = batch_import_import_workers;
+		_tmp19_ = batch_import_import_workers;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = self->priv->ready_files;
+		_tmp20_ = self->priv->ready_files;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = gee_list_remove_at (_tmp22_, 0);
+		_tmp21_ = gee_list_remove_at (_tmp20_, 0);
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp24_ = (PreparedFile*) _tmp23_;
+		_tmp22_ = (PreparedFile*) _tmp21_;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp25_ = self->priv->import_roll;
+		_tmp23_ = self->priv->import_roll;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = _tmp25_->import_id;
+		_tmp24_ = _tmp23_->import_id;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = self->priv->cancellable;
+		_tmp25_ = self->priv->cancellable;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = prepared_file_import_job_new (self, _tmp24_, &_tmp26_, _batch_import_on_import_files_completed_completion_callback, self, _tmp27_, _batch_import_on_import_files_cancelled_cancellation_callback, self);
+		_tmp26_ = prepared_file_import_job_new (self, _tmp22_, &_tmp24_, _batch_import_on_import_files_completed_completion_callback, self, _tmp25_, _batch_import_on_import_files_cancelled_cancellation_callback, self);
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = _tmp28_;
+		_tmp27_ = _tmp26_;
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		workers_enqueue (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob));
+		workers_enqueue (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_background_job_unref0 (_tmp29_);
+		_background_job_unref0 (_tmp27_);
 #line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_prepared_file_unref0 (_tmp24_);
-#line 6698 "BatchImport.c"
+		_prepared_file_unref0 (_tmp22_);
+#line 7377 "BatchImport.c"
 	}
 }
 
 
-static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFile* prepared_file) {
+static GFile*
+batch_import_get_in_current_import (BatchImport* self,
+                                    PreparedFile* prepared_file)
+{
 	GFile* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	PreparedFile* _tmp1_;
-	const gchar* _tmp2_;
-	PreparedFile* _tmp11_;
-	const gchar* _tmp12_;
+	const gchar* _tmp1_;
+	const gchar* _tmp7_;
 #line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL);
 #line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
 #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = prepared_file;
+	_tmp1_ = prepared_file->full_md5;
 #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _tmp1_->full_md5;
-#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp2_ != NULL) {
-#line 6720 "BatchImport.c"
-		GeeHashMap* _tmp3_;
-		PreparedFile* _tmp4_;
-		const gchar* _tmp5_;
-		gboolean _tmp6_;
-#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = self->priv->imported_full_md5_table;
-#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = prepared_file;
+	if (_tmp1_ != NULL) {
+#line 7398 "BatchImport.c"
+		GeeHashMap* _tmp2_;
+		const gchar* _tmp3_;
 #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = _tmp4_->full_md5;
+		_tmp2_ = self->priv->imported_full_md5_table;
 #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
+		_tmp3_ = prepared_file->full_md5;
 #line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp6_;
-#line 6735 "BatchImport.c"
+		_tmp0_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
+#line 7407 "BatchImport.c"
 	} else {
 #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 6739 "BatchImport.c"
+#line 7411 "BatchImport.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6743 "BatchImport.c"
-		GeeHashMap* _tmp7_;
-		PreparedFile* _tmp8_;
-		const gchar* _tmp9_;
-		gpointer _tmp10_;
-#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = self->priv->imported_full_md5_table;
+#line 7415 "BatchImport.c"
+		GeeHashMap* _tmp4_;
+		const gchar* _tmp5_;
+		gpointer _tmp6_;
 #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = prepared_file;
+		_tmp4_ = self->priv->imported_full_md5_table;
 #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp8_->full_md5;
+		_tmp5_ = prepared_file->full_md5;
 #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
+		_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
 #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		result = (GFile*) _tmp10_;
+		result = (GFile*) _tmp6_;
 #line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 6760 "BatchImport.c"
+#line 7429 "BatchImport.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = prepared_file;
-#line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = _tmp11_->full_md5;
+	_tmp7_ = prepared_file->full_md5;
 #line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp12_ != NULL) {
-#line 6768 "BatchImport.c"
-		GeeHashMap* _tmp13_;
-		PreparedFile* _tmp14_;
-		const gchar* _tmp15_;
-		PreparedFile* _tmp16_;
-		GFile* _tmp17_;
-#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = self->priv->imported_full_md5_table;
-#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = prepared_file;
+	if (_tmp7_ != NULL) {
+#line 7435 "BatchImport.c"
+		GeeHashMap* _tmp8_;
+		const gchar* _tmp9_;
+		GFile* _tmp10_;
 #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = _tmp14_->full_md5;
+		_tmp8_ = self->priv->imported_full_md5_table;
 #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = prepared_file;
+		_tmp9_ = prepared_file->full_md5;
 #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp16_->file;
+		_tmp10_ = prepared_file->file;
 #line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_);
-#line 6786 "BatchImport.c"
+		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
+#line 7447 "BatchImport.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = NULL;
 #line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6792 "BatchImport.c"
+#line 7453 "BatchImport.c"
 }
 
 
-static gpointer _notification_object_ref0 (gpointer self) {
+static gpointer
+_notification_object_ref0 (gpointer self)
+{
 #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? notification_object_ref (self) : NULL;
-#line 6799 "BatchImport.c"
+#line 7462 "BatchImport.c"
 }
 
 
-static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j, NotificationObject* user) {
+static void
+batch_import_on_file_prepared (BatchImport* self,
+                               BackgroundJob* j,
+                               NotificationObject* user)
+{
 	gboolean _tmp0_;
 	PreparedFileCluster* cluster = NULL;
-	NotificationObject* _tmp1_;
-	PreparedFileCluster* _tmp2_;
-	GeeArrayList* _tmp3_;
+	PreparedFileCluster* _tmp1_;
+	GeeArrayList* _tmp2_;
+	gint _tmp3_;
 	gint _tmp4_;
-	gint _tmp5_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
-	gchar* _tmp7_;
-	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp7_;
 #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6822,36 +7488,36 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
 #line 763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = user;
-#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster));
+	_tmp1_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (user, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster));
 #line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	cluster = _tmp2_;
+	cluster = _tmp1_;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cluster->list;
+	_tmp2_ = cluster->list;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = g_strdup_printf ("on_file_prepared (%d files)", _tmp5_);
+	_tmp5_ = g_strdup_printf ("on_file_prepared (%d files)", _tmp4_);
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_log_status (self, _tmp7_);
+	batch_import_log_status (self, _tmp6_);
 #line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp7_);
+	_g_free0 (_tmp6_);
 #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = cluster->list;
+	_tmp7_ = cluster->list;
 #line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL);
+	batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList), NULL, NULL);
 #line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_notification_object_unref0 (cluster);
-#line 6850 "BatchImport.c"
+#line 7514 "BatchImport.c"
 }
 
 
-static void batch_import_process_prepared_files_data_free (gpointer _data) {
+static void
+batch_import_process_prepared_files_data_free (gpointer _data)
+{
 	BatchImportProcessPreparedFilesData* _data_;
 	_data_ = _data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6860,11 +7526,15 @@ static void batch_import_process_prepared_files_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_slice_free (BatchImportProcessPreparedFilesData, _data_);
-#line 6863 "BatchImport.c"
+#line 7529 "BatchImport.c"
 }
 
 
-static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
+static void
+batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object,
+                                                         GAsyncResult *res,
+                                                         void *user_data)
+{
 	BatchImportProcessPreparedFilesData* _task_data_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_task_data_ = g_task_get_task_data (G_TASK (res));
@@ -6872,19 +7542,23 @@ static void batch_import_process_prepared_files_async_ready_wrapper (GObject *so
 	if (_task_data_->_callback_ != NULL) {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_task_data_->_callback_ (source_object, res, user_data);
-#line 6875 "BatchImport.c"
+#line 7545 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_task_data_->_task_complete_ = TRUE;
-#line 6879 "BatchImport.c"
+#line 7549 "BatchImport.c"
 }
 
 
-static void batch_import_process_prepared_files (BatchImport* self, GeeList* list, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+static void
+batch_import_process_prepared_files (BatchImport* self,
+                                     GeeList* list,
+                                     GAsyncReadyCallback _callback_,
+                                     gpointer _user_data_)
+{
 	BatchImportProcessPreparedFilesData* _data_;
 	BatchImport* _tmp0_;
 	GeeList* _tmp1_;
-	GeeList* _tmp2_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_ = g_slice_new0 (BatchImportProcessPreparedFilesData);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -6895,7 +7569,7 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis
 	if (_callback_ == NULL) {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_task_complete_ = TRUE;
-#line 6898 "BatchImport.c"
+#line 7572 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_task_set_task_data (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free);
@@ -6904,127 +7578,130 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_->self = _tmp0_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = list;
-#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp1_ = _g_object_ref0 (list);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_data_->list);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_data_->list = _tmp2_;
+	_data_->list = _tmp1_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_process_prepared_files_co (_data_);
-#line 6916 "BatchImport.c"
+#line 7588 "BatchImport.c"
 }
 
 
-static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_) {
+static void
+batch_import_process_prepared_files_finish (BatchImport* self,
+                                            GAsyncResult* _res_)
+{
 	BatchImportProcessPreparedFilesData* _data_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
-#line 6924 "BatchImport.c"
+#line 7599 "BatchImport.c"
 }
 
 
-static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self) {
+static gboolean
+_batch_import_process_prepared_files_co_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = batch_import_process_prepared_files_co (self);
 #line 776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6933 "BatchImport.c"
+#line 7610 "BatchImport.c"
 }
 
 
-static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_) {
+static gboolean
+batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_)
+{
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (_data_->_state_) {
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 0:
-#line 6942 "BatchImport.c"
+#line 7621 "BatchImport.c"
 		goto _state_0;
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 1:
-#line 6946 "BatchImport.c"
+#line 7625 "BatchImport.c"
 		goto _state_1;
 		default:
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_assert_not_reached ();
-#line 6951 "BatchImport.c"
+#line 7630 "BatchImport.c"
 	}
 	_state_0:
 	{
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp0_ = _data_->list;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_);
+		_data_->_tmp0_ = _g_object_ref0 (_data_->list);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_prepared_file_list = _data_->_tmp1_;
+		_data_->_prepared_file_list = _data_->_tmp0_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp2_ = _data_->_prepared_file_list;
+		_data_->_tmp1_ = _data_->_prepared_file_list;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+		_data_->_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_tmp4_ = _data_->_tmp3_;
+		_data_->_tmp3_ = _data_->_tmp2_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_data_->_prepared_file_size = _data_->_tmp4_;
+		_data_->_prepared_file_size = _data_->_tmp3_;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_index = -1;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp5_ = _data_->_prepared_file_index;
+			_data_->_tmp4_ = _data_->_prepared_file_index;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_prepared_file_index = _data_->_tmp5_ + 1;
+			_data_->_prepared_file_index = _data_->_tmp4_ + 1;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp6_ = _data_->_prepared_file_index;
+			_data_->_tmp5_ = _data_->_prepared_file_index;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp7_ = _data_->_prepared_file_size;
+			_data_->_tmp6_ = _data_->_prepared_file_size;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!(_data_->_tmp6_ < _data_->_tmp7_)) {
+			if (!(_data_->_tmp5_ < _data_->_tmp6_)) {
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6985 "BatchImport.c"
+#line 7662 "BatchImport.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp8_ = _data_->_prepared_file_list;
+			_data_->_tmp7_ = _data_->_prepared_file_list;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp9_ = _data_->_prepared_file_index;
+			_data_->_tmp8_ = _data_->_prepared_file_index;
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp10_ = gee_list_get (_data_->_tmp8_, _data_->_tmp9_);
+			_data_->_tmp9_ = gee_list_get (_data_->_tmp7_, _data_->_tmp8_);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->prepared_file = (PreparedFile*) _data_->_tmp10_;
+			_data_->prepared_file = (PreparedFile*) _data_->_tmp9_;
 #line 776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _batch_import_process_prepared_files_co_gsource_func, _data_, NULL);
 #line 777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_state_ = 1;
 #line 777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return FALSE;
-#line 7001 "BatchImport.c"
+#line 7678 "BatchImport.c"
 			_state_1:
 			;
 #line 779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->import_result = NULL;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp11_ = library_photo_global;
+			_data_->_tmp10_ = library_photo_global;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp12_ = _data_->prepared_file;
+			_data_->_tmp11_ = _data_->prepared_file;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp13_ = _data_->_tmp12_->file;
+			_data_->_tmp12_ = _data_->_tmp11_->file;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp14_ = 0;
+			_data_->_tmp13_ = 0;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp15_ = library_photo_source_collection_get_state_by_file (_data_->_tmp11_, _data_->_tmp13_, &_data_->_tmp14_);
+			_data_->_tmp14_ = library_photo_source_collection_get_state_by_file (_data_->_tmp10_, _data_->_tmp12_, &_data_->_tmp13_);
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->photo_state = _data_->_tmp14_;
+			_data_->photo_state = _data_->_tmp13_;
 #line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->photo = _data_->_tmp15_;
+			_data_->photo = _data_->_tmp14_;
 #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp16_ = _data_->photo;
+			_data_->_tmp15_ = _data_->photo;
 #line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp16_ != NULL) {
+			if (_data_->_tmp15_ != NULL) {
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp17_ = _data_->photo_state;
+				_data_->_tmp16_ = _data_->photo_state;
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				switch (_data_->_tmp17_) {
+				switch (_data_->_tmp16_) {
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE:
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7033,98 +7710,98 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
-#line 7036 "BatchImport.c"
+#line 7713 "BatchImport.c"
 					{
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp18_ = _data_->prepared_file;
+						_data_->_tmp17_ = _data_->prepared_file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp19_ = _data_->_tmp18_->job;
+						_data_->_tmp18_ = _data_->_tmp17_->job;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp20_ = _data_->prepared_file;
+						_data_->_tmp19_ = _data_->prepared_file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp21_ = _data_->_tmp20_->file;
+						_data_->_tmp20_ = _data_->_tmp19_->file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp22_ = _data_->prepared_file;
+						_data_->_tmp21_ = _data_->prepared_file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp23_ = _data_->_tmp22_->file;
+						_data_->_tmp22_ = _data_->_tmp21_->file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp24_ = g_file_get_path (_data_->_tmp23_);
+						_data_->_tmp23_ = g_file_get_path (_data_->_tmp22_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp25_ = _data_->_tmp24_;
+						_data_->_tmp24_ = _data_->_tmp23_;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp26_ = _data_->prepared_file;
+						_data_->_tmp25_ = _data_->prepared_file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp27_ = _data_->_tmp26_->file;
+						_data_->_tmp26_ = _data_->_tmp25_->file;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp28_ = g_file_get_path (_data_->_tmp27_);
+						_data_->_tmp27_ = g_file_get_path (_data_->_tmp26_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp29_ = _data_->_tmp28_;
+						_data_->_tmp28_ = _data_->_tmp27_;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp30_ = _data_->photo;
+						_data_->_tmp29_ = _data_->photo;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp31_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp30_, TYPE_MEDIA_SOURCE, MediaSource));
+						_data_->_tmp30_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp32_ = _data_->_tmp31_;
+						_data_->_tmp31_ = _data_->_tmp30_;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp33_ = duplicated_file_create_from_file (_data_->_tmp32_);
+						_data_->_tmp32_ = duplicated_file_create_from_file (_data_->_tmp31_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp34_ = _data_->_tmp33_;
+						_data_->_tmp33_ = _data_->_tmp32_;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp35_ = batch_import_result_new (_data_->_tmp19_, _data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp34_, IMPORT_RESULT_PHOTO_EXISTS);
+						_data_->_tmp34_ = batch_import_result_new (_data_->_tmp18_, _data_->_tmp20_, _data_->_tmp24_, _data_->_tmp28_, _data_->_tmp33_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->import_result = _data_->_tmp35_;
+						_data_->import_result = _data_->_tmp34_;
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_object_unref0 (_data_->_tmp34_);
+						_g_object_unref0 (_data_->_tmp33_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_object_unref0 (_data_->_tmp32_);
+						_g_object_unref0 (_data_->_tmp31_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp29_);
+						_g_free0 (_data_->_tmp28_);
 #line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp25_);
+						_g_free0 (_data_->_tmp24_);
 #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp36_ = _data_->photo_state;
+						_data_->_tmp35_ = _data_->photo_state;
 #line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp36_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) {
+						if (_data_->_tmp35_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) {
 #line 798 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp37_ = _data_->photo;
+							_data_->_tmp36_ = _data_->photo;
 #line 798 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7094 "BatchImport.c"
+							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp36_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 7771 "BatchImport.c"
 						}
 #line 799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7098 "BatchImport.c"
+#line 7775 "BatchImport.c"
 					}
 #line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7102 "BatchImport.c"
+#line 7779 "BatchImport.c"
 					{
 #line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7106 "BatchImport.c"
+#line 7783 "BatchImport.c"
 					}
 					default:
 					{
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp38_ = _data_->photo_state;
+						_data_->_tmp37_ = _data_->photo_state;
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_);
+						_data_->_tmp38_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp37_);
 #line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						g_error ("BatchImport.vala:806: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL);
-#line 7116 "BatchImport.c"
+						g_error ("BatchImport.vala:806: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp38_ != NULL) ? _data_->_tmp38_->value_name : NULL);
+#line 7793 "BatchImport.c"
 					}
 				}
 			}
 #line 810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp40_ = _data_->import_result;
+			_data_->_tmp39_ = _data_->import_result;
 #line 810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp40_ != NULL) {
+			if (_data_->_tmp39_ != NULL) {
 #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp41_ = _data_->import_result;
+				_data_->_tmp40_ = _data_->import_result;
 #line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_import_report_failure (_data_->self, _data_->_tmp41_);
+				batch_import_report_failure (_data_->self, _data_->_tmp40_);
 #line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
 #line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7135,126 +7812,126 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7138 "BatchImport.c"
+#line 7815 "BatchImport.c"
 			}
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp42_ = video_global;
+			_data_->_tmp41_ = video_global;
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp43_ = _data_->prepared_file;
+			_data_->_tmp42_ = _data_->prepared_file;
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp44_ = _data_->_tmp43_->file;
+			_data_->_tmp43_ = _data_->_tmp42_->file;
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp45_ = 0;
+			_data_->_tmp44_ = 0;
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp46_ = video_source_collection_get_state_by_file (_data_->_tmp42_, _data_->_tmp44_, &_data_->_tmp45_);
+			_data_->_tmp45_ = video_source_collection_get_state_by_file (_data_->_tmp41_, _data_->_tmp43_, &_data_->_tmp44_);
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->video_state = _data_->_tmp45_;
+			_data_->video_state = _data_->_tmp44_;
 #line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->video = _data_->_tmp46_;
+			_data_->video = _data_->_tmp45_;
 #line 819 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp47_ = _data_->video;
+			_data_->_tmp46_ = _data_->video;
 #line 819 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp47_ != NULL) {
+			if (_data_->_tmp46_ != NULL) {
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp48_ = _data_->video_state;
+				_data_->_tmp47_ = _data_->video_state;
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				switch (_data_->_tmp48_) {
+				switch (_data_->_tmp47_) {
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_ONLINE:
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
-#line 7166 "BatchImport.c"
+#line 7843 "BatchImport.c"
 					{
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp49_ = _data_->prepared_file;
+						_data_->_tmp48_ = _data_->prepared_file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp50_ = _data_->_tmp49_->job;
+						_data_->_tmp49_ = _data_->_tmp48_->job;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp51_ = _data_->prepared_file;
+						_data_->_tmp50_ = _data_->prepared_file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp52_ = _data_->_tmp51_->file;
+						_data_->_tmp51_ = _data_->_tmp50_->file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp53_ = _data_->prepared_file;
+						_data_->_tmp52_ = _data_->prepared_file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp54_ = _data_->_tmp53_->file;
+						_data_->_tmp53_ = _data_->_tmp52_->file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp55_ = g_file_get_path (_data_->_tmp54_);
+						_data_->_tmp54_ = g_file_get_path (_data_->_tmp53_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp56_ = _data_->_tmp55_;
+						_data_->_tmp55_ = _data_->_tmp54_;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp57_ = _data_->prepared_file;
+						_data_->_tmp56_ = _data_->prepared_file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp58_ = _data_->_tmp57_->file;
+						_data_->_tmp57_ = _data_->_tmp56_->file;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp59_ = g_file_get_path (_data_->_tmp58_);
+						_data_->_tmp58_ = g_file_get_path (_data_->_tmp57_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp60_ = _data_->_tmp59_;
+						_data_->_tmp59_ = _data_->_tmp58_;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp61_ = _data_->video;
+						_data_->_tmp60_ = _data_->video;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp62_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp61_, TYPE_MEDIA_SOURCE, MediaSource));
+						_data_->_tmp61_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp63_ = _data_->_tmp62_;
+						_data_->_tmp62_ = _data_->_tmp61_;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp64_ = duplicated_file_create_from_file (_data_->_tmp63_);
+						_data_->_tmp63_ = duplicated_file_create_from_file (_data_->_tmp62_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp65_ = _data_->_tmp64_;
+						_data_->_tmp64_ = _data_->_tmp63_;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp66_ = batch_import_result_new (_data_->_tmp50_, _data_->_tmp52_, _data_->_tmp56_, _data_->_tmp60_, _data_->_tmp65_, IMPORT_RESULT_PHOTO_EXISTS);
+						_data_->_tmp65_ = batch_import_result_new (_data_->_tmp49_, _data_->_tmp51_, _data_->_tmp55_, _data_->_tmp59_, _data_->_tmp64_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->import_result = _data_->_tmp66_;
+						_data_->import_result = _data_->_tmp65_;
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_object_unref0 (_data_->_tmp65_);
+						_g_object_unref0 (_data_->_tmp64_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_object_unref0 (_data_->_tmp63_);
+						_g_object_unref0 (_data_->_tmp62_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp60_);
+						_g_free0 (_data_->_tmp59_);
 #line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp56_);
+						_g_free0 (_data_->_tmp55_);
 #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp67_ = _data_->video_state;
+						_data_->_tmp66_ = _data_->video_state;
 #line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp67_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) {
+						if (_data_->_tmp66_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) {
 #line 829 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp68_ = _data_->video;
+							_data_->_tmp67_ = _data_->video;
 #line 829 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7224 "BatchImport.c"
+							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp67_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 7901 "BatchImport.c"
 						}
 #line 830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7228 "BatchImport.c"
+#line 7905 "BatchImport.c"
 					}
 #line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7232 "BatchImport.c"
+#line 7909 "BatchImport.c"
 					{
 #line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7236 "BatchImport.c"
+#line 7913 "BatchImport.c"
 					}
 					default:
 					{
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp69_ = _data_->video_state;
+						_data_->_tmp68_ = _data_->video_state;
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_);
+						_data_->_tmp69_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp68_);
 #line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						g_error ("BatchImport.vala:837: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL);
-#line 7246 "BatchImport.c"
+						g_error ("BatchImport.vala:837: Unknown VideoSourceCollection state: %s", (_data_->_tmp69_ != NULL) ? _data_->_tmp69_->value_name : NULL);
+#line 7923 "BatchImport.c"
 					}
 				}
 			}
 #line 841 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp71_ = _data_->import_result;
+			_data_->_tmp70_ = _data_->import_result;
 #line 841 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp71_ != NULL) {
+			if (_data_->_tmp70_ != NULL) {
 #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp72_ = _data_->import_result;
+				_data_->_tmp71_ = _data_->import_result;
 #line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_import_report_failure (_data_->self, _data_->_tmp72_);
+				batch_import_report_failure (_data_->self, _data_->_tmp71_);
 #line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
 #line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7267,229 +7944,225 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7270 "BatchImport.c"
+#line 7947 "BatchImport.c"
 			}
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp74_ = _data_->prepared_file;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp75_ = _data_->_tmp74_->is_video;
+			_data_->_tmp73_ = _data_->prepared_file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp75_) {
+			_data_->_tmp74_ = _data_->_tmp73_->is_video;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp76_ = _data_->prepared_file;
+			if (_data_->_tmp74_) {
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp77_ = _data_->_tmp76_->file;
+				_data_->_tmp75_ = _data_->prepared_file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp78_ = _data_->prepared_file;
+				_data_->_tmp76_ = _data_->_tmp75_->file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp79_ = _data_->_tmp78_->full_md5;
+				_data_->_tmp77_ = _data_->prepared_file;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_);
+				_data_->_tmp78_ = _data_->_tmp77_->full_md5;
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp73_ = _data_->_tmp80_;
-#line 7290 "BatchImport.c"
+				_data_->_tmp72_ = video_is_duplicate (_data_->_tmp76_, _data_->_tmp78_);
+#line 7965 "BatchImport.c"
 			} else {
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp73_ = FALSE;
-#line 7294 "BatchImport.c"
+				_data_->_tmp72_ = FALSE;
+#line 7969 "BatchImport.c"
 			}
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp73_) {
+			if (_data_->_tmp72_) {
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp81_ = video_table_get_instance ();
+				_data_->_tmp79_ = video_table_get_instance ();
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp82_ = _data_->_tmp81_;
+				_data_->_tmp80_ = _data_->_tmp79_;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp83_ = _data_->prepared_file;
+				_data_->_tmp81_ = _data_->prepared_file;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp84_ = _data_->_tmp83_->file;
+				_data_->_tmp82_ = _data_->_tmp81_->file;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp85_ = _data_->prepared_file;
+				_data_->_tmp83_ = _data_->prepared_file;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp86_ = _data_->_tmp85_->full_md5;
+				_data_->_tmp84_ = _data_->_tmp83_->full_md5;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp88_ = video_table_get_duplicate_ids (_data_->_tmp82_, _data_->_tmp84_, _data_->_tmp86_, &_data_->_tmp87_);
+				_data_->_tmp86_ = video_table_get_duplicate_ids (_data_->_tmp80_, _data_->_tmp82_, _data_->_tmp84_, &_data_->_tmp85_);
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp89_ = _data_->_tmp88_;
+				_data_->_tmp87_ = _data_->_tmp86_;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp89__length1 = _data_->_tmp87_;
+				_data_->_tmp87__length1 = _data_->_tmp85_;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_database_table_unref0 (_data_->_tmp82_);
+				_database_table_unref0 (_data_->_tmp80_);
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->duplicate_ids = _data_->_tmp89_;
+				_data_->duplicate_ids = _data_->_tmp87_;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->duplicate_ids_length1 = _data_->_tmp89__length1;
+				_data_->duplicate_ids_length1 = _data_->_tmp87__length1;
 #line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_duplicate_ids_size_ = _data_->duplicate_ids_length1;
 #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp90_ = _data_->duplicate_ids;
+				_data_->_tmp88_ = _data_->duplicate_ids;
 #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp90__length1 = _data_->duplicate_ids_length1;
+				_data_->_tmp88__length1 = _data_->duplicate_ids_length1;
 #line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_vala_assert (_data_->_tmp90__length1 > 0, "duplicate_ids.length > 0");
+				_vala_assert (_data_->_tmp88__length1 > 0, "duplicate_ids.length > 0");
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp91_ = _data_->duplicate_ids;
+				_data_->_tmp89_ = _data_->duplicate_ids;
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp91__length1 = _data_->duplicate_ids_length1;
+				_data_->_tmp89__length1 = _data_->duplicate_ids_length1;
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp92_ = _data_->_tmp91_[0];
+				_data_->_tmp90_ = _data_->_tmp89_[0];
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp93_ = duplicated_file_create_from_video_id (&_data_->_tmp92_);
+				_data_->_tmp91_ = duplicated_file_create_from_video_id (&_data_->_tmp90_);
 #line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->duplicated_file = _data_->_tmp93_;
+				_data_->duplicated_file = _data_->_tmp91_;
 #line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->result_code = IMPORT_RESULT_PHOTO_EXISTS;
 #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp94_ = _data_->self->priv->mark_duplicates_online;
+				_data_->_tmp92_ = _data_->self->priv->mark_duplicates_online;
 #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_data_->_tmp94_) {
+				if (_data_->_tmp92_) {
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp95_ = video_global;
+					_data_->_tmp93_ = video_global;
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp96_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+					_data_->_tmp94_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp93_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp97_ = _data_->_tmp96_;
+					_data_->_tmp95_ = _data_->_tmp94_;
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp98_ = _data_->prepared_file;
+					_data_->_tmp96_ = _data_->prepared_file;
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp99_ = _data_->_tmp98_->file;
+					_data_->_tmp97_ = _data_->_tmp96_->file;
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp100_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp97_, _data_->_tmp99_);
+					_data_->_tmp98_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp95_, _data_->_tmp97_);
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp101_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, TYPE_VIDEO, Video);
+					_data_->_tmp99_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp98_, TYPE_VIDEO, Video);
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_source_holding_tank_unref0 (_data_->_tmp97_);
+					_source_holding_tank_unref0 (_data_->_tmp95_);
 #line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->dupe_video = _data_->_tmp101_;
+					_data_->dupe_video = _data_->_tmp99_;
 #line 863 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp102_ = _data_->dupe_video;
+					_data_->_tmp100_ = _data_->dupe_video;
 #line 863 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp102_ == NULL) {
+					if (_data_->_tmp100_ == NULL) {
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp103_ = video_global;
+						_data_->_tmp101_ = video_global;
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp104_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+						_data_->_tmp102_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp101_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp105_ = _data_->_tmp104_;
+						_data_->_tmp103_ = _data_->_tmp102_;
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp106_ = _data_->prepared_file;
+						_data_->_tmp104_ = _data_->prepared_file;
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp107_ = _data_->_tmp106_->full_md5;
+						_data_->_tmp105_ = _data_->_tmp104_->full_md5;
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp108_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp105_, _data_->_tmp107_);
+						_data_->_tmp106_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp103_, _data_->_tmp105_);
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->dupe_video);
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video);
+						_data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp106_, TYPE_VIDEO, Video);
 #line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_source_holding_tank_unref0 (_data_->_tmp105_);
-#line 7386 "BatchImport.c"
+						_source_holding_tank_unref0 (_data_->_tmp103_);
+#line 8061 "BatchImport.c"
 					}
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp109_ = _data_->dupe_video;
+					_data_->_tmp107_ = _data_->dupe_video;
 #line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp109_ != NULL) {
+					if (_data_->_tmp107_ != NULL) {
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp110_ = _data_->prepared_file;
+						_data_->_tmp108_ = _data_->prepared_file;
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp111_ = _data_->_tmp110_->file;
+						_data_->_tmp109_ = _data_->_tmp108_->file;
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp112_ = g_file_get_path (_data_->_tmp111_);
+						_data_->_tmp110_ = g_file_get_path (_data_->_tmp109_);
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp113_ = _data_->_tmp112_;
+						_data_->_tmp111_ = _data_->_tmp110_;
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						g_debug ("BatchImport.vala:867: duplicate video found offline, marking as online" \
-": %s", _data_->_tmp113_);
+": %s", _data_->_tmp111_);
 #line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp113_);
+						_g_free0 (_data_->_tmp111_);
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp114_ = _data_->dupe_video;
+						_data_->_tmp112_ = _data_->dupe_video;
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp115_ = _data_->prepared_file;
+						_data_->_tmp113_ = _data_->prepared_file;
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp116_ = _data_->_tmp115_->file;
+						_data_->_tmp114_ = _data_->_tmp113_->file;
 #line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp114_, TYPE_MONITORABLE, Monitorable), _data_->_tmp116_);
+						monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp112_, TYPE_MONITORABLE, Monitorable), _data_->_tmp114_);
 #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp117_ = _data_->dupe_video;
+						_data_->_tmp115_ = _data_->dupe_video;
 #line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, TYPE_MEDIA_SOURCE, MediaSource));
+						media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp115_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->duplicated_file);
 #line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->duplicated_file = NULL;
 #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp118_ = _data_->self->priv->manifest;
+						_data_->_tmp116_ = _data_->self->priv->manifest;
 #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp119_ = _data_->_tmp118_->imported;
+						_data_->_tmp117_ = _data_->_tmp116_->imported;
 #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp120_ = _data_->dupe_video;
+						_data_->_tmp118_ = _data_->dupe_video;
 #line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp120_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp121_ = _data_->dupe_video;
+						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp118_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp122_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, TYPE_MEDIA_SOURCE, MediaSource));
+						_data_->_tmp119_ = _data_->dupe_video;
 #line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						batch_import_report_progress (_data_->self, _data_->_tmp122_);
+						batch_import_report_progress (_data_->self, media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, TYPE_MEDIA_SOURCE, MediaSource)));
 #line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_file_import_complete (_data_->self);
 #line 879 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->result_code = IMPORT_RESULT_SUCCESS;
-#line 7438 "BatchImport.c"
+#line 8111 "BatchImport.c"
 					}
 #line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->dupe_video);
-#line 7442 "BatchImport.c"
+#line 8115 "BatchImport.c"
 				}
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp123_ = _data_->prepared_file;
+				_data_->_tmp120_ = _data_->prepared_file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp124_ = _data_->_tmp123_->job;
+				_data_->_tmp121_ = _data_->_tmp120_->job;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp125_ = _data_->prepared_file;
+				_data_->_tmp122_ = _data_->prepared_file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp126_ = _data_->_tmp125_->file;
+				_data_->_tmp123_ = _data_->_tmp122_->file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp127_ = _data_->prepared_file;
+				_data_->_tmp124_ = _data_->prepared_file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp128_ = _data_->_tmp127_->file;
+				_data_->_tmp125_ = _data_->_tmp124_->file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp129_ = g_file_get_path (_data_->_tmp128_);
+				_data_->_tmp126_ = g_file_get_path (_data_->_tmp125_);
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp130_ = _data_->_tmp129_;
+				_data_->_tmp127_ = _data_->_tmp126_;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp131_ = _data_->prepared_file;
+				_data_->_tmp128_ = _data_->prepared_file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp132_ = _data_->_tmp131_->file;
+				_data_->_tmp129_ = _data_->_tmp128_->file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp133_ = g_file_get_path (_data_->_tmp132_);
+				_data_->_tmp130_ = g_file_get_path (_data_->_tmp129_);
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp134_ = _data_->_tmp133_;
+				_data_->_tmp131_ = _data_->_tmp130_;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp135_ = _data_->duplicated_file;
+				_data_->_tmp132_ = _data_->duplicated_file;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp136_ = _data_->result_code;
+				_data_->_tmp133_ = _data_->result_code;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp137_ = batch_import_result_new (_data_->_tmp124_, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp134_, _data_->_tmp135_, _data_->_tmp136_);
+				_data_->_tmp134_ = batch_import_result_new (_data_->_tmp121_, _data_->_tmp123_, _data_->_tmp127_, _data_->_tmp131_, _data_->_tmp132_, _data_->_tmp133_);
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->import_result = _data_->_tmp137_;
+				_data_->import_result = _data_->_tmp134_;
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_data_->_tmp134_);
+				_g_free0 (_data_->_tmp131_);
 #line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_data_->_tmp130_);
+				_g_free0 (_data_->_tmp127_);
 #line 887 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp138_ = _data_->result_code;
+				_data_->_tmp135_ = _data_->result_code;
 #line 887 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_data_->_tmp138_ == IMPORT_RESULT_SUCCESS) {
+				if (_data_->_tmp135_ == IMPORT_RESULT_SUCCESS) {
 #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp139_ = _data_->self->priv->manifest;
+					_data_->_tmp136_ = _data_->self->priv->manifest;
 #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp140_ = _data_->import_result;
+					_data_->_tmp137_ = _data_->import_result;
 #line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					import_manifest_add_result (_data_->_tmp139_, _data_->_tmp140_);
+					import_manifest_add_result (_data_->_tmp136_, _data_->_tmp137_);
 #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->duplicated_file);
 #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7504,280 +8177,286 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 					_prepared_file_unref0 (_data_->prepared_file);
 #line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 7506 "BatchImport.c"
+#line 8179 "BatchImport.c"
 				}
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->duplicated_file);
 #line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL);
-#line 7512 "BatchImport.c"
+#line 8185 "BatchImport.c"
 			}
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp141_ = _data_->prepared_file;
+			_data_->_tmp138_ = _data_->prepared_file;
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp142_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp141_);
+			_data_->_tmp139_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp138_);
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp143_ = _data_->_tmp142_;
+			_data_->_tmp140_ = _data_->_tmp139_;
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp144_ = _data_->_tmp143_ != NULL;
+			_data_->_tmp141_ = _data_->_tmp140_ != NULL;
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_object_unref0 (_data_->_tmp143_);
+			_g_object_unref0 (_data_->_tmp140_);
 #line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp144_) {
+			if (_data_->_tmp141_) {
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp145_ = _data_->prepared_file;
+				_data_->_tmp142_ = _data_->prepared_file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp146_ = _data_->_tmp145_->job;
+				_data_->_tmp143_ = _data_->_tmp142_->job;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp147_ = _data_->prepared_file;
+				_data_->_tmp144_ = _data_->prepared_file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp148_ = _data_->_tmp147_->file;
+				_data_->_tmp145_ = _data_->_tmp144_->file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp149_ = _data_->prepared_file;
+				_data_->_tmp146_ = _data_->prepared_file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp150_ = _data_->_tmp149_->file;
+				_data_->_tmp147_ = _data_->_tmp146_->file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp151_ = g_file_get_path (_data_->_tmp150_);
+				_data_->_tmp148_ = g_file_get_path (_data_->_tmp147_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp152_ = _data_->_tmp151_;
+				_data_->_tmp149_ = _data_->_tmp148_;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp153_ = _data_->prepared_file;
+				_data_->_tmp150_ = _data_->prepared_file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp154_ = _data_->_tmp153_->file;
+				_data_->_tmp151_ = _data_->_tmp150_->file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp155_ = g_file_get_path (_data_->_tmp154_);
+				_data_->_tmp152_ = g_file_get_path (_data_->_tmp151_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp156_ = _data_->_tmp155_;
+				_data_->_tmp153_ = _data_->_tmp152_;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp157_ = _data_->prepared_file;
+				_data_->_tmp154_ = _data_->prepared_file;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp158_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp157_);
+				_data_->_tmp155_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp154_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp159_ = _data_->_tmp158_;
+				_data_->_tmp156_ = _data_->_tmp155_;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp160_ = duplicated_file_create_from_file (_data_->_tmp159_);
+				_data_->_tmp157_ = duplicated_file_create_from_file (_data_->_tmp156_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp161_ = _data_->_tmp160_;
+				_data_->_tmp158_ = _data_->_tmp157_;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp162_ = batch_import_result_new (_data_->_tmp146_, _data_->_tmp148_, _data_->_tmp152_, _data_->_tmp156_, _data_->_tmp161_, IMPORT_RESULT_PHOTO_EXISTS);
+				_data_->_tmp159_ = batch_import_result_new (_data_->_tmp143_, _data_->_tmp145_, _data_->_tmp149_, _data_->_tmp153_, _data_->_tmp158_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->import_result = _data_->_tmp162_;
+				_data_->import_result = _data_->_tmp159_;
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_data_->_tmp161_);
+				_g_object_unref0 (_data_->_tmp158_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_data_->_tmp159_);
+				_g_object_unref0 (_data_->_tmp156_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_data_->_tmp156_);
+				_g_free0 (_data_->_tmp153_);
 #line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_data_->_tmp152_);
-#line 7574 "BatchImport.c"
+				_g_free0 (_data_->_tmp149_);
+#line 8247 "BatchImport.c"
 			} else {
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp163_ = _data_->prepared_file;
+				_data_->_tmp160_ = _data_->prepared_file;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp164_ = _data_->_tmp163_->file;
+				_data_->_tmp161_ = _data_->_tmp160_->file;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp165_ = _data_->prepared_file;
+				_data_->_tmp162_ = _data_->prepared_file;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp166_ = _data_->_tmp165_->full_md5;
+				_data_->_tmp163_ = _data_->_tmp162_->full_md5;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp167_ = _data_->prepared_file;
+				_data_->_tmp164_ = _data_->prepared_file;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp168_ = _data_->_tmp167_->file_format;
+				_data_->_tmp165_ = _data_->_tmp164_->file_format;
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp169_ = photo_is_duplicate (_data_->_tmp164_, NULL, _data_->_tmp166_, _data_->_tmp168_);
-#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_data_->_tmp169_) {
+				if (photo_is_duplicate (_data_->_tmp161_, NULL, _data_->_tmp163_, _data_->_tmp165_)) {
 #line 903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp170_ = _data_->self->priv->untrash_duplicates;
+					_data_->_tmp166_ = _data_->self->priv->untrash_duplicates;
 #line 903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp170_) {
+					if (_data_->_tmp166_) {
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp171_ = library_photo_global;
+						_data_->_tmp167_ = library_photo_global;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp172_ = _data_->prepared_file;
+						_data_->_tmp168_ = _data_->prepared_file;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp173_ = _data_->_tmp172_->file;
+						_data_->_tmp169_ = _data_->_tmp168_->file;
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp174_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp171_, _data_->_tmp173_);
+						_data_->_tmp170_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp167_, _data_->_tmp169_);
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
 #line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->photo = _data_->_tmp174_;
+						_data_->photo = _data_->_tmp170_;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp176_ = _data_->photo;
+						_data_->_tmp172_ = _data_->photo;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp176_ == NULL) {
+						if (_data_->_tmp172_ == NULL) {
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp177_ = _data_->prepared_file;
+							_data_->_tmp173_ = _data_->prepared_file;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp178_ = _data_->_tmp177_->full_md5;
+							_data_->_tmp174_ = _data_->_tmp173_->full_md5;
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp175_ = _data_->_tmp178_ != NULL;
-#line 7618 "BatchImport.c"
+							_data_->_tmp171_ = _data_->_tmp174_ != NULL;
+#line 8289 "BatchImport.c"
 						} else {
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp175_ = FALSE;
-#line 7622 "BatchImport.c"
+							_data_->_tmp171_ = FALSE;
+#line 8293 "BatchImport.c"
 						}
 #line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp175_) {
+						if (_data_->_tmp171_) {
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp179_ = library_photo_global;
+							_data_->_tmp175_ = library_photo_global;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp180_ = _data_->prepared_file;
+							_data_->_tmp176_ = _data_->prepared_file;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp181_ = _data_->_tmp180_->full_md5;
+							_data_->_tmp177_ = _data_->_tmp176_->full_md5;
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp182_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp179_, _data_->_tmp181_);
+							_data_->_tmp178_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp175_, _data_->_tmp177_);
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
 #line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->photo = _data_->_tmp182_;
-#line 7638 "BatchImport.c"
+							_data_->photo = _data_->_tmp178_;
+#line 8309 "BatchImport.c"
 						}
 #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp183_ = _data_->photo;
+						_data_->_tmp179_ = _data_->photo;
 #line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp183_ != NULL) {
+						if (_data_->_tmp179_ != NULL) {
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp184_ = _data_->prepared_file;
+							_data_->_tmp180_ = _data_->prepared_file;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp185_ = _data_->_tmp184_->file;
+							_data_->_tmp181_ = _data_->_tmp180_->file;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp186_ = g_file_get_path (_data_->_tmp185_);
+							_data_->_tmp182_ = g_file_get_path (_data_->_tmp181_);
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp187_ = _data_->_tmp186_;
+							_data_->_tmp183_ = _data_->_tmp182_;
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							g_debug ("BatchImport.vala:912: duplicate linked photo found in trash, untrashin" \
-"g and removing transforms for %s", _data_->_tmp187_);
+"g and removing transforms for %s", _data_->_tmp183_);
 #line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_g_free0 (_data_->_tmp187_);
+							_g_free0 (_data_->_tmp183_);
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp188_ = _data_->photo;
+							_data_->_tmp184_ = _data_->photo;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp189_ = _data_->prepared_file;
+							_data_->_tmp185_ = _data_->prepared_file;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp190_ = _data_->_tmp189_->file;
+							_data_->_tmp186_ = _data_->_tmp185_->file;
 #line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_MONITORABLE, Monitorable), _data_->_tmp190_);
+							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp184_, TYPE_MONITORABLE, Monitorable), _data_->_tmp186_);
 #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp191_ = _data_->photo;
+							_data_->_tmp187_ = _data_->photo;
 #line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp191_, TYPE_MEDIA_SOURCE, MediaSource));
+							media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp187_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 917 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp192_ = _data_->photo;
+							_data_->_tmp188_ = _data_->photo;
 #line 917 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo));
-#line 7672 "BatchImport.c"
+							photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_PHOTO, Photo));
+#line 8343 "BatchImport.c"
 						}
 					}
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp194_ = _data_->photo;
+					_data_->_tmp190_ = _data_->photo;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp194_ == NULL) {
+					if (_data_->_tmp190_ == NULL) {
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp195_ = _data_->self->priv->mark_duplicates_online;
+						_data_->_tmp191_ = _data_->self->priv->mark_duplicates_online;
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp193_ = _data_->_tmp195_;
-#line 7683 "BatchImport.c"
+						_data_->_tmp189_ = _data_->_tmp191_;
+#line 8354 "BatchImport.c"
 					} else {
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp193_ = FALSE;
-#line 7687 "BatchImport.c"
+						_data_->_tmp189_ = FALSE;
+#line 8358 "BatchImport.c"
 					}
 #line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp193_) {
+					if (_data_->_tmp189_) {
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp196_ = library_photo_global;
+						_data_->_tmp192_ = library_photo_global;
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp197_ = _data_->prepared_file;
+						_data_->_tmp193_ = _data_->prepared_file;
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp198_ = _data_->_tmp197_->file;
+						_data_->_tmp194_ = _data_->_tmp193_->file;
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp199_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp196_, _data_->_tmp198_);
+						_data_->_tmp195_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp192_, _data_->_tmp194_);
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
 #line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->photo = _data_->_tmp199_;
+						_data_->photo = _data_->_tmp195_;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp201_ = _data_->photo;
+						_data_->_tmp197_ = _data_->photo;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp201_ == NULL) {
+						if (_data_->_tmp197_ == NULL) {
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp202_ = _data_->prepared_file;
+							_data_->_tmp198_ = _data_->prepared_file;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp203_ = _data_->_tmp202_->full_md5;
+							_data_->_tmp199_ = _data_->_tmp198_->full_md5;
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp200_ = _data_->_tmp203_ != NULL;
-#line 7713 "BatchImport.c"
+							_data_->_tmp196_ = _data_->_tmp199_ != NULL;
+#line 8384 "BatchImport.c"
 						} else {
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp200_ = FALSE;
-#line 7717 "BatchImport.c"
+							_data_->_tmp196_ = FALSE;
+#line 8388 "BatchImport.c"
 						}
 #line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp200_) {
+						if (_data_->_tmp196_) {
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp204_ = library_photo_global;
+							_data_->_tmp200_ = library_photo_global;
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp205_ = _data_->prepared_file;
+							_data_->_tmp201_ = _data_->prepared_file;
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp206_ = _data_->_tmp205_->full_md5;
+							_data_->_tmp202_ = _data_->_tmp201_->full_md5;
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp207_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp204_, _data_->_tmp206_);
+							_data_->_tmp203_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp200_, _data_->_tmp202_);
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
 #line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->photo = _data_->_tmp207_;
-#line 7733 "BatchImport.c"
+							_data_->photo = _data_->_tmp203_;
+#line 8404 "BatchImport.c"
 						}
 #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp208_ = _data_->photo;
+						_data_->_tmp204_ = _data_->photo;
 #line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_data_->_tmp208_ != NULL) {
+						if (_data_->_tmp204_ != NULL) {
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp209_ = _data_->prepared_file;
+							_data_->_tmp205_ = _data_->prepared_file;
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp210_ = _data_->_tmp209_->file;
+							_data_->_tmp206_ = _data_->_tmp205_->file;
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp211_ = g_file_get_path (_data_->_tmp210_);
+							_data_->_tmp207_ = g_file_get_path (_data_->_tmp206_);
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp212_ = _data_->_tmp211_;
+							_data_->_tmp208_ = _data_->_tmp207_;
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							g_debug ("BatchImport.vala:929: duplicate photo found marked offline, marking on" \
-"line: %s", _data_->_tmp212_);
+"line: %s", _data_->_tmp208_);
 #line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_g_free0 (_data_->_tmp212_);
+							_g_free0 (_data_->_tmp208_);
 #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp213_ = _data_->photo;
+							_data_->_tmp209_ = _data_->photo;
 #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp214_ = _data_->prepared_file;
+							_data_->_tmp210_ = _data_->prepared_file;
 #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp215_ = _data_->_tmp214_->file;
+							_data_->_tmp211_ = _data_->_tmp210_->file;
 #line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp213_, TYPE_MONITORABLE, Monitorable), _data_->_tmp215_);
+							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp209_, TYPE_MONITORABLE, Monitorable), _data_->_tmp211_);
 #line 933 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_data_->_tmp216_ = _data_->photo;
+							_data_->_tmp212_ = _data_->photo;
 #line 933 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7763 "BatchImport.c"
+							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp212_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 8434 "BatchImport.c"
 						}
 					}
 #line 937 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp217_ = _data_->photo;
+					_data_->_tmp213_ = _data_->photo;
 #line 937 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_data_->_tmp217_ != NULL) {
+					if (_data_->_tmp213_ != NULL) {
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						_data_->_tmp214_ = _data_->prepared_file;
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						_data_->_tmp215_ = _data_->_tmp214_->job;
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						_data_->_tmp216_ = _data_->prepared_file;
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						_data_->_tmp217_ = _data_->_tmp216_->file;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp218_ = _data_->prepared_file;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp219_ = _data_->_tmp218_->job;
+						_data_->_tmp219_ = _data_->_tmp218_->file;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp220_ = _data_->prepared_file;
+						_data_->_tmp220_ = g_file_get_path (_data_->_tmp219_);
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp221_ = _data_->_tmp220_->file;
+						_data_->_tmp221_ = _data_->_tmp220_;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp222_ = _data_->prepared_file;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7787,43 +8466,33 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp225_ = _data_->_tmp224_;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp226_ = _data_->prepared_file;
-#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp227_ = _data_->_tmp226_->file;
-#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp228_ = g_file_get_path (_data_->_tmp227_);
-#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp229_ = _data_->_tmp228_;
-#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp230_ = batch_import_result_new (_data_->_tmp219_, _data_->_tmp221_, _data_->_tmp225_, _data_->_tmp229_, NULL, IMPORT_RESULT_SUCCESS);
+						_data_->_tmp226_ = batch_import_result_new (_data_->_tmp215_, _data_->_tmp217_, _data_->_tmp221_, _data_->_tmp225_, NULL, IMPORT_RESULT_SUCCESS);
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->import_result = _data_->_tmp230_;
-#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_g_free0 (_data_->_tmp229_);
+						_data_->import_result = _data_->_tmp226_;
 #line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp225_);
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						_g_free0 (_data_->_tmp221_);
 #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp231_ = _data_->self->priv->manifest;
+						_data_->_tmp227_ = _data_->self->priv->manifest;
 #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp232_ = _data_->_tmp231_->imported;
+						_data_->_tmp228_ = _data_->_tmp227_->imported;
 #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp233_ = _data_->photo;
+						_data_->_tmp229_ = _data_->photo;
 #line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp233_, TYPE_MEDIA_SOURCE, MediaSource));
+						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp228_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp229_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp234_ = _data_->self->priv->manifest;
+						_data_->_tmp230_ = _data_->self->priv->manifest;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp235_ = _data_->import_result;
+						_data_->_tmp231_ = _data_->import_result;
 #line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						import_manifest_add_result (_data_->_tmp234_, _data_->_tmp235_);
-#line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp236_ = _data_->photo;
+						import_manifest_add_result (_data_->_tmp230_, _data_->_tmp231_);
 #line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_data_->_tmp237_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp236_, TYPE_MEDIA_SOURCE, MediaSource));
+						_data_->_tmp232_ = _data_->photo;
 #line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						batch_import_report_progress (_data_->self, _data_->_tmp237_);
+						batch_import_report_progress (_data_->self, media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, TYPE_MEDIA_SOURCE, MediaSource)));
 #line 946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_file_import_complete (_data_->self);
 #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7836,117 +8505,117 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 						_prepared_file_unref0 (_data_->prepared_file);
 #line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						continue;
-#line 7836 "BatchImport.c"
+#line 8505 "BatchImport.c"
 					}
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp238_ = _data_->prepared_file;
+					_data_->_tmp233_ = _data_->prepared_file;
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp239_ = _data_->_tmp238_->file;
+					_data_->_tmp234_ = _data_->_tmp233_->file;
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp240_ = g_file_get_path (_data_->_tmp239_);
+					_data_->_tmp235_ = g_file_get_path (_data_->_tmp234_);
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp241_ = _data_->_tmp240_;
+					_data_->_tmp236_ = _data_->_tmp235_;
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					g_debug ("BatchImport.vala:951: duplicate photo detected, not importing %s", _data_->_tmp241_);
+					g_debug ("BatchImport.vala:951: duplicate photo detected, not importing %s", _data_->_tmp236_);
 #line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_free0 (_data_->_tmp241_);
+					_g_free0 (_data_->_tmp236_);
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp242_ = photo_table_get_instance ();
+					_data_->_tmp237_ = photo_table_get_instance ();
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp243_ = _data_->_tmp242_;
+					_data_->_tmp238_ = _data_->_tmp237_;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp244_ = _data_->prepared_file;
+					_data_->_tmp239_ = _data_->prepared_file;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp245_ = _data_->_tmp244_->file;
+					_data_->_tmp240_ = _data_->_tmp239_->file;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp246_ = _data_->prepared_file;
+					_data_->_tmp241_ = _data_->prepared_file;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp247_ = _data_->_tmp246_->full_md5;
+					_data_->_tmp242_ = _data_->_tmp241_->full_md5;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp248_ = _data_->prepared_file;
+					_data_->_tmp243_ = _data_->prepared_file;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp249_ = _data_->_tmp248_->file_format;
+					_data_->_tmp244_ = _data_->_tmp243_->file_format;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp251_ = photo_table_get_duplicate_ids (_data_->_tmp243_, _data_->_tmp245_, NULL, _data_->_tmp247_, _data_->_tmp249_, &_data_->_tmp250_);
+					_data_->_tmp246_ = photo_table_get_duplicate_ids (_data_->_tmp238_, _data_->_tmp240_, NULL, _data_->_tmp242_, _data_->_tmp244_, &_data_->_tmp245_);
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp252_ = _data_->_tmp251_;
+					_data_->_tmp247_ = _data_->_tmp246_;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp252__length1 = _data_->_tmp250_;
+					_data_->_tmp247__length1 = _data_->_tmp245_;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_database_table_unref0 (_data_->_tmp243_);
+					_database_table_unref0 (_data_->_tmp238_);
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->photo_ids = _data_->_tmp252_;
+					_data_->photo_ids = _data_->_tmp247_;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->photo_ids_length1 = _data_->_tmp252__length1;
+					_data_->photo_ids_length1 = _data_->_tmp247__length1;
 #line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_photo_ids_size_ = _data_->photo_ids_length1;
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp253_ = _data_->photo_ids;
+					_data_->_tmp248_ = _data_->photo_ids;
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp253__length1 = _data_->photo_ids_length1;
+					_data_->_tmp248__length1 = _data_->photo_ids_length1;
 #line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_vala_assert (_data_->_tmp253__length1 > 0, "photo_ids.length > 0");
+					_vala_assert (_data_->_tmp248__length1 > 0, "photo_ids.length > 0");
 #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp254_ = _data_->photo_ids;
+					_data_->_tmp249_ = _data_->photo_ids;
 #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp254__length1 = _data_->photo_ids_length1;
+					_data_->_tmp249__length1 = _data_->photo_ids_length1;
 #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp255_ = _data_->_tmp254_[0];
+					_data_->_tmp250_ = _data_->_tmp249_[0];
 #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp256_ = duplicated_file_create_from_photo_id (&_data_->_tmp255_);
+					_data_->_tmp251_ = duplicated_file_create_from_photo_id (&_data_->_tmp250_);
 #line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_vala1_duplicated_file = _data_->_tmp256_;
+					_data_->_vala1_duplicated_file = _data_->_tmp251_;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp257_ = _data_->prepared_file;
+					_data_->_tmp252_ = _data_->prepared_file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp258_ = _data_->_tmp257_->job;
+					_data_->_tmp253_ = _data_->_tmp252_->job;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp259_ = _data_->prepared_file;
+					_data_->_tmp254_ = _data_->prepared_file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp260_ = _data_->_tmp259_->file;
+					_data_->_tmp255_ = _data_->_tmp254_->file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp261_ = _data_->prepared_file;
+					_data_->_tmp256_ = _data_->prepared_file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp262_ = _data_->_tmp261_->file;
+					_data_->_tmp257_ = _data_->_tmp256_->file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp263_ = g_file_get_path (_data_->_tmp262_);
+					_data_->_tmp258_ = g_file_get_path (_data_->_tmp257_);
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp264_ = _data_->_tmp263_;
+					_data_->_tmp259_ = _data_->_tmp258_;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp265_ = _data_->prepared_file;
+					_data_->_tmp260_ = _data_->prepared_file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp266_ = _data_->_tmp265_->file;
+					_data_->_tmp261_ = _data_->_tmp260_->file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp267_ = g_file_get_path (_data_->_tmp266_);
+					_data_->_tmp262_ = g_file_get_path (_data_->_tmp261_);
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp268_ = _data_->_tmp267_;
+					_data_->_tmp263_ = _data_->_tmp262_;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp269_ = _data_->_vala1_duplicated_file;
+					_data_->_tmp264_ = _data_->_vala1_duplicated_file;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->_tmp270_ = batch_import_result_new (_data_->_tmp258_, _data_->_tmp260_, _data_->_tmp264_, _data_->_tmp268_, _data_->_tmp269_, IMPORT_RESULT_PHOTO_EXISTS);
+					_data_->_tmp265_ = batch_import_result_new (_data_->_tmp253_, _data_->_tmp255_, _data_->_tmp259_, _data_->_tmp263_, _data_->_tmp264_, IMPORT_RESULT_PHOTO_EXISTS);
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_result_unref0 (_data_->import_result);
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_data_->import_result = _data_->_tmp270_;
+					_data_->import_result = _data_->_tmp265_;
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_free0 (_data_->_tmp268_);
+					_g_free0 (_data_->_tmp263_);
 #line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_free0 (_data_->_tmp264_);
+					_g_free0 (_data_->_tmp259_);
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->_vala1_duplicated_file);
 #line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids = (g_free (_data_->photo_ids), NULL);
-#line 7936 "BatchImport.c"
+#line 8605 "BatchImport.c"
 				}
 			}
 #line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp271_ = _data_->import_result;
+			_data_->_tmp266_ = _data_->import_result;
 #line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_data_->_tmp271_ != NULL) {
+			if (_data_->_tmp266_ != NULL) {
 #line 966 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_data_->_tmp272_ = _data_->import_result;
+				_data_->_tmp267_ = _data_->import_result;
 #line 966 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_import_report_failure (_data_->self, _data_->_tmp272_);
+				batch_import_report_failure (_data_->self, _data_->_tmp267_);
 #line 967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
 #line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7959,16 +8628,16 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 				_prepared_file_unref0 (_data_->prepared_file);
 #line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7959 "BatchImport.c"
+#line 8628 "BatchImport.c"
 			}
 #line 972 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (_data_->self, (guint64) 0);
 #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp273_ = _data_->self->priv->ready_files;
+			_data_->_tmp268_ = _data_->self->priv->ready_files;
 #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_data_->_tmp274_ = _data_->prepared_file;
+			_data_->_tmp269_ = _data_->prepared_file;
 #line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp273_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp274_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp268_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp269_);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_data_->video);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -7977,11 +8646,11 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 			_batch_import_result_unref0 (_data_->import_result);
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_data_->prepared_file);
-#line 7977 "BatchImport.c"
+#line 8646 "BatchImport.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_data_->_prepared_file_list);
-#line 7981 "BatchImport.c"
+#line 8650 "BatchImport.c"
 	}
 #line 976 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (_data_->self);
@@ -7993,30 +8662,32 @@ static gboolean batch_import_process_prepared_files_co (BatchImportProcessPrepar
 		while (_data_->_task_complete_ != TRUE) {
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 7993 "BatchImport.c"
+#line 8662 "BatchImport.c"
 		}
 	}
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_object_unref (_data_->_async_result);
 #line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return FALSE;
-#line 8000 "BatchImport.c"
+#line 8669 "BatchImport.c"
 }
 
 
-static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob* j, const gchar* caller) {
+static void
+batch_import_done_preparing_files (BatchImport* self,
+                                   BackgroundJob* j,
+                                   const gchar* caller)
+{
 	gboolean _tmp0_;
 	PrepareFilesJob* prepare_files_job = NULL;
-	BackgroundJob* _tmp1_;
+	PrepareFilesJob* _tmp1_;
 	PrepareFilesJob* _tmp2_;
 	PrepareFilesJob* _tmp3_;
-	PrepareFilesJob* _tmp4_;
+	gint _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-	gint _tmp7_;
-	const gchar* _tmp8_;
-	gboolean _tmp9_ = FALSE;
-	gint _tmp10_;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_;
 #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8028,128 +8699,126 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
 #line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARE_FILES_JOB, PrepareFilesJob));
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARE_FILES_JOB, PrepareFilesJob));
 #line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	prepare_files_job = _tmp2_;
+	prepare_files_job = _tmp1_;
 #line 984 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = prepare_files_job;
+	_tmp2_ = prepare_files_job;
 #line 984 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
+	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
 #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = prepare_files_job;
+	_tmp3_ = prepare_files_job;
 #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _tmp4_->prepared_files;
+	_tmp4_ = _tmp3_->prepared_files;
 #line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->file_imports_to_perform = _tmp5_;
+	self->priv->file_imports_to_perform = _tmp4_;
 #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = self->priv->file_imports_to_perform;
+	_tmp5_ = self->priv->file_imports_to_perform;
 #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = self->priv->file_imports_completed;
+	_tmp6_ = self->priv->file_imports_completed;
 #line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp6_ >= _tmp7_, "file_imports_to_perform >= file_imports_completed");
+	_vala_assert (_tmp5_ >= _tmp6_, "file_imports_to_perform >= file_imports_completed");
 #line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = caller;
-#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_log_status (self, _tmp8_);
+	batch_import_log_status (self, caller);
 #line 993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = self->priv->file_imports_to_perform;
+	_tmp8_ = self->priv->file_imports_to_perform;
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp10_ == 0) {
-#line 8059 "BatchImport.c"
-		gboolean _tmp11_;
+	if (_tmp8_ == 0) {
+#line 8726 "BatchImport.c"
+		gboolean _tmp9_;
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = self->priv->completed;
+		_tmp9_ = self->priv->completed;
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = !_tmp11_;
-#line 8065 "BatchImport.c"
+		_tmp7_ = !_tmp9_;
+#line 8732 "BatchImport.c"
 	} else {
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = FALSE;
-#line 8069 "BatchImport.c"
+		_tmp7_ = FALSE;
+#line 8736 "BatchImport.c"
 	}
 #line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp9_) {
+	if (_tmp7_) {
 #line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "no files prepared for import");
-#line 8075 "BatchImport.c"
+#line 8742 "BatchImport.c"
 	} else {
-		gboolean _tmp12_ = FALSE;
-		gint _tmp13_;
-		gint _tmp14_;
+		gboolean _tmp10_ = FALSE;
+		gint _tmp11_;
+		gint _tmp12_;
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = self->priv->file_imports_completed;
+		_tmp11_ = self->priv->file_imports_completed;
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = self->priv->file_imports_to_perform;
+		_tmp12_ = self->priv->file_imports_to_perform;
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp13_ == _tmp14_) {
-#line 8086 "BatchImport.c"
-			gboolean _tmp15_;
+		if (_tmp11_ == _tmp12_) {
+#line 8753 "BatchImport.c"
+			gboolean _tmp13_;
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp15_ = self->priv->completed;
+			_tmp13_ = self->priv->completed;
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = !_tmp15_;
-#line 8092 "BatchImport.c"
+			_tmp10_ = !_tmp13_;
+#line 8759 "BatchImport.c"
 		} else {
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = FALSE;
-#line 8096 "BatchImport.c"
+			_tmp10_ = FALSE;
+#line 8763 "BatchImport.c"
 		}
 #line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp12_) {
+		if (_tmp10_) {
 #line 1000 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 8102 "BatchImport.c"
+#line 8769 "BatchImport.c"
 		}
 	}
 #line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
-#line 8107 "BatchImport.c"
+#line 8774 "BatchImport.c"
 }
 
 
-static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) {
-	BackgroundJob* _tmp0_;
+static void
+batch_import_on_files_prepared (BatchImport* self,
+                                BackgroundJob* j)
+{
 #line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
 #line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = j;
-#line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared");
-#line 8121 "BatchImport.c"
+	batch_import_done_preparing_files (self, j, "on_files_prepared");
+#line 8788 "BatchImport.c"
 }
 
 
-static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j) {
-	BackgroundJob* _tmp0_;
+static void
+batch_import_on_file_prepare_cancelled (BatchImport* self,
+                                        BackgroundJob* j)
+{
 #line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
 #line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = j;
-#line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled");
-#line 8135 "BatchImport.c"
+	batch_import_done_preparing_files (self, j, "on_file_prepare_cancelled");
+#line 8802 "BatchImport.c"
 }
 
 
-static void batch_import_on_import_files_completed (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_import_files_completed (BatchImport* self,
+                                        BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	PreparedFileImportJob* job = NULL;
-	BackgroundJob* _tmp1_;
+	PreparedFileImportJob* _tmp1_;
 	PreparedFileImportJob* _tmp2_;
-	PreparedFileImportJob* _tmp3_;
-	PreparedFile* _tmp4_;
-	PreparedFileImportJob* _tmp5_;
-	BatchImportResult* _tmp6_;
-	PreparedFileImportJob* _tmp12_;
-	ReadyForImport* _tmp13_;
+	PreparedFile* _tmp3_;
+	PreparedFileImportJob* _tmp4_;
+	BatchImportResult* _tmp5_;
+	PreparedFileImportJob* _tmp11_;
+	ReadyForImport* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
@@ -8160,280 +8829,277 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 #line 1016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
 #line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	job = _tmp2_;
+	job = _tmp1_;
 #line 1020 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_import_files_completed");
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = _tmp3_->not_ready;
+	_tmp3_ = _tmp2_->not_ready;
 #line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp4_ == NULL, "job.not_ready == null");
+	_vala_assert (_tmp3_ == NULL, "job.not_ready == null");
 #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = job;
+	_tmp4_ = job;
 #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = _tmp5_->failed;
+	_tmp5_ = _tmp4_->failed;
 #line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp6_ != NULL) {
-#line 8179 "BatchImport.c"
-		PreparedFileImportJob* _tmp7_;
-		BatchImportResult* _tmp8_;
-		ImportResult _tmp9_;
-		PreparedFileImportJob* _tmp10_;
-		BatchImportResult* _tmp11_;
+	if (_tmp5_ != NULL) {
+#line 8846 "BatchImport.c"
+		PreparedFileImportJob* _tmp6_;
+		BatchImportResult* _tmp7_;
+		ImportResult _tmp8_;
+		PreparedFileImportJob* _tmp9_;
+		BatchImportResult* _tmp10_;
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = job;
+		_tmp6_ = job;
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp7_->failed;
+		_tmp7_ = _tmp6_->failed;
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp8_->result;
+		_tmp8_ = _tmp7_->result;
 #line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_assert (_tmp9_ != IMPORT_RESULT_SUCCESS, "job.failed.result != ImportResult.SUCCESS");
+		_vala_assert (_tmp8_ != IMPORT_RESULT_SUCCESS, "job.failed.result != ImportResult.SUCCESS");
 #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = job;
+		_tmp9_ = job;
 #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = _tmp10_->failed;
+		_tmp10_ = _tmp9_->failed;
 #line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_failure (self, _tmp11_);
+		batch_import_report_failure (self, _tmp10_);
 #line 1030 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8201 "BatchImport.c"
+#line 8868 "BatchImport.c"
 	}
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = job;
+	_tmp11_ = job;
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _tmp12_->ready;
+	_tmp12_ = _tmp11_->ready;
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp13_ != NULL) {
-#line 8209 "BatchImport.c"
-		PreparedFileImportJob* _tmp14_;
-		ReadyForImport* _tmp15_;
-		BatchImportResult* _tmp16_;
-		ImportResult _tmp17_;
+	if (_tmp12_ != NULL) {
+#line 8876 "BatchImport.c"
+		PreparedFileImportJob* _tmp13_;
+		ReadyForImport* _tmp14_;
+		BatchImportResult* _tmp15_;
+		ImportResult _tmp16_;
 		Tombstone* tombstone = NULL;
-		TombstoneSourceCollection* _tmp18_;
-		PreparedFileImportJob* _tmp19_;
-		ReadyForImport* _tmp20_;
-		GFile* _tmp21_;
+		TombstoneSourceCollection* _tmp17_;
+		PreparedFileImportJob* _tmp18_;
+		ReadyForImport* _tmp19_;
+		GFile* _tmp20_;
+		Tombstone* _tmp21_;
 		Tombstone* _tmp22_;
-		Tombstone* _tmp23_;
 		MediaSource* source = NULL;
-		PreparedFileImportJob* _tmp26_;
-		ReadyForImport* _tmp27_;
-		gboolean _tmp28_;
-		PreparedFileImportJob* _tmp87_;
-		ReadyForImport* _tmp88_;
-		BatchImportResult* _tmp89_;
-		ImportResult _tmp90_;
+		PreparedFileImportJob* _tmp25_;
+		ReadyForImport* _tmp26_;
+		gboolean _tmp27_;
+		PreparedFileImportJob* _tmp83_;
+		ReadyForImport* _tmp84_;
+		BatchImportResult* _tmp85_;
+		ImportResult _tmp86_;
 #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = job;
+		_tmp13_ = job;
 #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = _tmp14_->ready;
+		_tmp14_ = _tmp13_->ready;
 #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = _tmp15_->batch_result;
+		_tmp15_ = _tmp14_->batch_result;
 #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp16_->result;
+		_tmp16_ = _tmp15_->result;
 #line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_assert (_tmp17_ == IMPORT_RESULT_SUCCESS, "job.ready.batch_result.result == ImportResult.SUCCESS");
+		_vala_assert (_tmp16_ == IMPORT_RESULT_SUCCESS, "job.ready.batch_result.result == ImportResult.SUCCESS");
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = tombstone_global;
+		_tmp17_ = tombstone_global;
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = job;
+		_tmp18_ = job;
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp20_ = _tmp19_->ready;
+		_tmp19_ = _tmp18_->ready;
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = _tmp20_->final_file;
+		_tmp20_ = _tmp19_->final_file;
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = tombstone_source_collection_locate (_tmp18_, _tmp21_);
+		_tmp21_ = tombstone_source_collection_locate (_tmp17_, _tmp20_);
 #line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		tombstone = _tmp22_;
+		tombstone = _tmp21_;
 #line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = tombstone;
+		_tmp22_ = tombstone;
 #line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp23_ != NULL) {
-#line 8255 "BatchImport.c"
-			TombstoneSourceCollection* _tmp24_;
-			Tombstone* _tmp25_;
+		if (_tmp22_ != NULL) {
+#line 8922 "BatchImport.c"
+			TombstoneSourceCollection* _tmp23_;
+			Tombstone* _tmp24_;
 #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = tombstone_global;
+			_tmp23_ = tombstone_global;
 #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = tombstone;
+			_tmp24_ = tombstone;
 #line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			tombstone_source_collection_resurrect (_tmp24_, _tmp25_);
-#line 8264 "BatchImport.c"
+			tombstone_source_collection_resurrect (_tmp23_, _tmp24_);
+#line 8931 "BatchImport.c"
 		}
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		source = NULL;
 #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = job;
+		_tmp25_ = job;
 #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = _tmp26_->ready;
+		_tmp26_ = _tmp25_->ready;
 #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = _tmp27_->is_video;
+		_tmp27_ = _tmp26_->is_video;
 #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp28_) {
-#line 8276 "BatchImport.c"
-			PreparedFileImportJob* _tmp29_;
-			ReadyForImport* _tmp30_;
-			BatchImportResult* _tmp31_;
-			PreparedFileImportJob* _tmp32_;
-			ReadyForImport* _tmp33_;
-			VideoImportParams* _tmp34_;
-			Video* _tmp35_ = NULL;
-			ImportResult _tmp36_;
+		if (_tmp27_) {
+#line 8943 "BatchImport.c"
+			PreparedFileImportJob* _tmp28_;
+			ReadyForImport* _tmp29_;
+			BatchImportResult* _tmp30_;
+			PreparedFileImportJob* _tmp31_;
+			ReadyForImport* _tmp32_;
+			VideoImportParams* _tmp33_;
+			Video* _tmp34_ = NULL;
+			ImportResult _tmp35_;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp29_ = job;
+			_tmp28_ = job;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp30_ = _tmp29_->ready;
+			_tmp29_ = _tmp28_->ready;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp31_ = _tmp30_->batch_result;
+			_tmp30_ = _tmp29_->batch_result;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp32_ = job;
+			_tmp31_ = job;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = _tmp32_->ready;
+			_tmp32_ = _tmp31_->ready;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = _tmp33_->video_import_params;
+			_tmp33_ = _tmp32_->video_import_params;
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp36_ = video_import_create (_tmp34_, &_tmp35_);
+			_tmp35_ = video_import_create (_tmp33_, &_tmp34_);
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (source);
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource);
+			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp31_->result = _tmp36_;
-#line 8305 "BatchImport.c"
+			_tmp30_->result = _tmp35_;
+#line 8972 "BatchImport.c"
 		} else {
-			PreparedFileImportJob* _tmp37_;
-			ReadyForImport* _tmp38_;
-			BatchImportResult* _tmp39_;
-			PreparedFileImportJob* _tmp40_;
-			ReadyForImport* _tmp41_;
-			PhotoImportParams* _tmp42_;
-			LibraryPhoto* _tmp43_ = NULL;
-			ImportResult _tmp44_;
+			PreparedFileImportJob* _tmp36_;
+			ReadyForImport* _tmp37_;
+			BatchImportResult* _tmp38_;
+			PreparedFileImportJob* _tmp39_;
+			ReadyForImport* _tmp40_;
+			PhotoImportParams* _tmp41_;
+			LibraryPhoto* _tmp42_ = NULL;
+			ImportResult _tmp43_;
 			Photo* photo = NULL;
-			MediaSource* _tmp45_;
-			Photo* _tmp46_;
-			PreparedFileImportJob* _tmp47_;
-			ReadyForImport* _tmp48_;
-			PhotoImportParams* _tmp49_;
-			GFile* _tmp50_;
-			Photo* _tmp72_;
-			PhotoFileFormat _tmp73_;
+			MediaSource* _tmp44_;
+			Photo* _tmp45_;
+			PreparedFileImportJob* _tmp46_;
+			ReadyForImport* _tmp47_;
+			PhotoImportParams* _tmp48_;
+			GFile* _tmp49_;
+			Photo* _tmp71_;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp37_ = job;
+			_tmp36_ = job;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp38_ = _tmp37_->ready;
+			_tmp37_ = _tmp36_->ready;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = _tmp38_->batch_result;
+			_tmp38_ = _tmp37_->batch_result;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp40_ = job;
+			_tmp39_ = job;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = _tmp40_->ready;
+			_tmp40_ = _tmp39_->ready;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp42_ = _tmp41_->photo_import_params;
+			_tmp41_ = _tmp40_->photo_import_params;
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = library_photo_import_create (_tmp42_, &_tmp43_);
+			_tmp43_ = library_photo_import_create (_tmp41_, &_tmp42_);
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (source);
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource);
+			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_->result = _tmp44_;
+			_tmp38_->result = _tmp43_;
 #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp45_ = source;
+			_tmp44_ = source;
 #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, TYPE_PHOTO) ? ((Photo*) _tmp45_) : NULL);
+			_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, TYPE_PHOTO) ? ((Photo*) _tmp44_) : NULL);
 #line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			photo = _tmp46_;
+			photo = _tmp45_;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp47_ = job;
+			_tmp46_ = job;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp48_ = _tmp47_->ready;
+			_tmp47_ = _tmp46_->ready;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp49_ = _tmp48_->photo_import_params;
+			_tmp48_ = _tmp47_->photo_import_params;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp50_ = _tmp49_->final_associated_file;
+			_tmp49_ = _tmp48_->final_associated_file;
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp50_ != NULL) {
-#line 8360 "BatchImport.c"
+			if (_tmp49_ != NULL) {
+#line 9026 "BatchImport.c"
 				BackingPhotoRow* bpr = NULL;
+				BackingPhotoRow* _tmp50_;
 				BackingPhotoRow* _tmp51_;
 				BackingPhotoRow* _tmp52_;
-				BackingPhotoRow* _tmp53_;
-				PreparedFileImportJob* _tmp54_;
-				ReadyForImport* _tmp55_;
-				PhotoImportParams* _tmp56_;
-				GFile* _tmp57_;
-				gchar* _tmp58_;
-				MediaSource* _tmp59_;
+				PreparedFileImportJob* _tmp53_;
+				ReadyForImport* _tmp54_;
+				PhotoImportParams* _tmp55_;
+				GFile* _tmp56_;
+				gchar* _tmp57_;
+				MediaSource* _tmp58_;
+				GFile* _tmp59_;
 				GFile* _tmp60_;
-				GFile* _tmp61_;
+				gchar* _tmp61_;
 				gchar* _tmp62_;
-				gchar* _tmp63_;
-				BackingPhotoRow* _tmp64_;
-				const gchar* _tmp65_;
+				BackingPhotoRow* _tmp63_;
+				const gchar* _tmp64_;
 #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp51_ = backing_photo_row_new ();
+				_tmp50_ = backing_photo_row_new ();
 #line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				bpr = _tmp51_;
+				bpr = _tmp50_;
 #line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp52_ = bpr;
+				_tmp51_ = bpr;
 #line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp52_->file_format = PHOTO_FILE_FORMAT_JFIF;
+				_tmp51_->file_format = PHOTO_FILE_FORMAT_JFIF;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp53_ = bpr;
+				_tmp52_ = bpr;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp54_ = job;
+				_tmp53_ = job;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp55_ = _tmp54_->ready;
+				_tmp54_ = _tmp53_->ready;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp56_ = _tmp55_->photo_import_params;
+				_tmp55_ = _tmp54_->photo_import_params;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp57_ = _tmp56_->final_associated_file;
+				_tmp56_ = _tmp55_->final_associated_file;
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58_ = g_file_get_path (_tmp57_);
+				_tmp57_ = g_file_get_path (_tmp56_);
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp53_->filepath);
+				_g_free0 (_tmp52_->filepath);
 #line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp53_->filepath = _tmp58_;
+				_tmp52_->filepath = _tmp57_;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = source;
+				_tmp58_ = source;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp60_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
+				_tmp59_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp61_ = _tmp60_;
+				_tmp60_ = _tmp59_;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp62_ = g_file_get_path (_tmp61_);
+				_tmp61_ = g_file_get_path (_tmp60_);
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = _tmp62_;
+				_tmp62_ = _tmp61_;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp64_ = bpr;
+				_tmp63_ = bpr;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp65_ = _tmp64_->filepath;
+				_tmp64_ = _tmp63_->filepath;
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_debug ("BatchImport.vala:1057: Associating %s with sibling %s", _tmp63_, _tmp65_);
+				g_debug ("BatchImport.vala:1057: Associating %s with sibling %s", _tmp62_, _tmp64_);
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp63_);
+				_g_free0 (_tmp62_);
 #line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp61_);
-#line 8421 "BatchImport.c"
+				_g_object_unref0 (_tmp60_);
+#line 9087 "BatchImport.c"
 				{
-					MediaSource* _tmp66_;
-					BackingPhotoRow* _tmp67_;
+					MediaSource* _tmp65_;
+					BackingPhotoRow* _tmp66_;
 #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp66_ = source;
+					_tmp65_ = source;
 #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp67_ = bpr;
+					_tmp66_ = bpr;
 #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, TRUE, &_inner_error_);
+					photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp66_, TRUE, &_inner_error_);
 #line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8433 "BatchImport.c"
+#line 9099 "BatchImport.c"
 						goto __catch424_g_error;
 					}
 				}
@@ -8441,28 +9107,28 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				__catch424_g_error:
 				{
 					GError* e = NULL;
-					BackingPhotoRow* _tmp68_;
-					const gchar* _tmp69_;
-					GError* _tmp70_;
-					const gchar* _tmp71_;
+					BackingPhotoRow* _tmp67_;
+					const gchar* _tmp68_;
+					GError* _tmp69_;
+					const gchar* _tmp70_;
 #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					e = _inner_error_;
 #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_inner_error_ = NULL;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp68_ = bpr;
+					_tmp67_ = bpr;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp69_ = _tmp68_->filepath;
+					_tmp68_ = _tmp67_->filepath;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp70_ = e;
+					_tmp69_ = e;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp71_ = _tmp70_->message;
+					_tmp70_ = _tmp69_->message;
 #line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					g_warning ("BatchImport.vala:1062: Unable to associate JPEG with RAW. File: %s Err" \
-"or: %s", _tmp69_, _tmp71_);
+"or: %s", _tmp68_, _tmp70_);
 #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (e);
-#line 8461 "BatchImport.c"
+#line 9127 "BatchImport.c"
 				}
 				__finally424:
 #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8483,214 +9149,208 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					g_clear_error (&_inner_error_);
 #line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return;
-#line 8482 "BatchImport.c"
+#line 9148 "BatchImport.c"
 				}
 #line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 8486 "BatchImport.c"
+#line 9152 "BatchImport.c"
 			}
 #line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp72_ = photo;
+			_tmp71_ = photo;
 #line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp73_ = photo_get_master_file_format (_tmp72_);
-#line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) {
-#line 8494 "BatchImport.c"
+			if (photo_get_master_file_format (_tmp71_) == PHOTO_FILE_FORMAT_RAW) {
+#line 9158 "BatchImport.c"
 				RawDeveloper d = 0;
-				ConfigFacade* _tmp74_;
-				ConfigFacade* _tmp75_;
+				ConfigFacade* _tmp72_;
+				ConfigFacade* _tmp73_;
+				RawDeveloper _tmp74_;
+				gboolean _tmp75_ = FALSE;
 				RawDeveloper _tmp76_;
-				RawDeveloper _tmp77_;
-				gboolean _tmp78_ = FALSE;
-				RawDeveloper _tmp79_;
-				Photo* _tmp83_;
-				RawDeveloper _tmp84_;
-				Photo* _tmp85_;
-				RawDeveloper _tmp86_;
-#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp74_ = config_facade_get_instance ();
+				Photo* _tmp79_;
+				RawDeveloper _tmp80_;
+				Photo* _tmp81_;
+				RawDeveloper _tmp82_;
 #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp75_ = _tmp74_;
+				_tmp72_ = config_facade_get_instance ();
 #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp76_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+				_tmp73_ = _tmp72_;
 #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp77_ = _tmp76_;
+				_tmp74_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp75_);
+				_g_object_unref0 (_tmp73_);
 #line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				d = _tmp77_;
-#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp79_ = d;
+				d = _tmp74_;
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp79_ == RAW_DEVELOPER_CAMERA) {
-#line 8522 "BatchImport.c"
-					Photo* _tmp80_;
-					RawDeveloper _tmp81_;
-					gboolean _tmp82_;
+				_tmp76_ = d;
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp80_ = photo;
+				if (_tmp76_ == RAW_DEVELOPER_CAMERA) {
+#line 9183 "BatchImport.c"
+					Photo* _tmp77_;
+					RawDeveloper _tmp78_;
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp81_ = d;
+					_tmp77_ = photo;
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_);
+					_tmp78_ = d;
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp78_ = !_tmp82_;
-#line 8534 "BatchImport.c"
+					_tmp75_ = !photo_is_raw_developer_available (_tmp77_, _tmp78_);
+#line 9192 "BatchImport.c"
 				} else {
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp78_ = FALSE;
-#line 8538 "BatchImport.c"
+					_tmp75_ = FALSE;
+#line 9196 "BatchImport.c"
 				}
 #line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp78_) {
+				if (_tmp75_) {
 #line 1071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					d = RAW_DEVELOPER_EMBEDDED;
-#line 8544 "BatchImport.c"
+#line 9202 "BatchImport.c"
 				}
 #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp83_ = photo;
+				_tmp79_ = photo;
 #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp84_ = d;
+				_tmp80_ = d;
 #line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				photo_set_default_raw_developer (_tmp83_, _tmp84_);
+				photo_set_default_raw_developer (_tmp79_, _tmp80_);
 #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp85_ = photo;
+				_tmp81_ = photo;
 #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp86_ = d;
+				_tmp82_ = d;
 #line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				photo_set_raw_developer (_tmp85_, _tmp86_, FALSE);
-#line 8558 "BatchImport.c"
+				photo_set_raw_developer (_tmp81_, _tmp82_, FALSE);
+#line 9216 "BatchImport.c"
 			}
 #line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo);
-#line 8562 "BatchImport.c"
+#line 9220 "BatchImport.c"
 		}
 #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp87_ = job;
+		_tmp83_ = job;
 #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp88_ = _tmp87_->ready;
+		_tmp84_ = _tmp83_->ready;
 #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp89_ = _tmp88_->batch_result;
+		_tmp85_ = _tmp84_->batch_result;
 #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp90_ = _tmp89_->result;
+		_tmp86_ = _tmp85_->result;
 #line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp90_ != IMPORT_RESULT_SUCCESS) {
-#line 8574 "BatchImport.c"
-			PreparedFileImportJob* _tmp91_;
-			ReadyForImport* _tmp92_;
-			BatchImportResult* _tmp93_;
-			ImportResult _tmp94_;
-			gchar* _tmp95_;
-			gchar* _tmp96_;
-			PreparedFileImportJob* _tmp97_;
-			ReadyForImport* _tmp98_;
-			BatchImportResult* _tmp99_;
+		if (_tmp86_ != IMPORT_RESULT_SUCCESS) {
+#line 9232 "BatchImport.c"
+			PreparedFileImportJob* _tmp87_;
+			ReadyForImport* _tmp88_;
+			BatchImportResult* _tmp89_;
+			ImportResult _tmp90_;
+			gchar* _tmp91_;
+			gchar* _tmp92_;
+			PreparedFileImportJob* _tmp93_;
+			ReadyForImport* _tmp94_;
+			BatchImportResult* _tmp95_;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp91_ = job;
+			_tmp87_ = job;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp92_ = _tmp91_->ready;
+			_tmp88_ = _tmp87_->ready;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp93_ = _tmp92_->batch_result;
+			_tmp89_ = _tmp88_->batch_result;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp94_ = _tmp93_->result;
+			_tmp90_ = _tmp89_->result;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp95_ = import_result_to_string (_tmp94_);
+			_tmp91_ = import_result_to_string (_tmp90_);
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp96_ = _tmp95_;
+			_tmp92_ = _tmp91_;
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_debug ("BatchImport.vala:1079: on_import_file_completed: %s", _tmp96_);
+			g_debug ("BatchImport.vala:1079: on_import_file_completed: %s", _tmp92_);
 #line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp96_);
+			_g_free0 (_tmp92_);
 #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp97_ = job;
+			_tmp93_ = job;
 #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp98_ = _tmp97_->ready;
+			_tmp94_ = _tmp93_->ready;
 #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp99_ = _tmp98_->batch_result;
+			_tmp95_ = _tmp94_->batch_result;
 #line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			batch_import_report_failure (self, _tmp99_);
+			batch_import_report_failure (self, _tmp95_);
 #line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_file_import_complete (self);
-#line 8610 "BatchImport.c"
+#line 9268 "BatchImport.c"
 		} else {
-			GeeList* _tmp100_;
-			MediaSource* _tmp101_;
+			GeeList* _tmp96_;
+			MediaSource* _tmp97_;
+			PreparedFileImportJob* _tmp98_;
+			ReadyForImport* _tmp99_;
+			Thumbnails* _tmp100_;
+			Thumbnails* _tmp101_;
 			PreparedFileImportJob* _tmp102_;
 			ReadyForImport* _tmp103_;
-			Thumbnails* _tmp104_;
-			Thumbnails* _tmp105_;
+			PreparedFile* _tmp104_;
+			BatchImportJob* _tmp105_;
 			PreparedFileImportJob* _tmp106_;
 			ReadyForImport* _tmp107_;
-			PreparedFile* _tmp108_;
-			BatchImportJob* _tmp109_;
-			PreparedFileImportJob* _tmp110_;
-			ReadyForImport* _tmp111_;
-			BatchImportResult* _tmp112_;
-			CompletedImportObject* _tmp113_;
-			CompletedImportObject* _tmp114_;
+			BatchImportResult* _tmp108_;
+			CompletedImportObject* _tmp109_;
+			CompletedImportObject* _tmp110_;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp100_ = self->priv->ready_thumbnails;
+			_tmp96_ = self->priv->ready_thumbnails;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp101_ = source;
+			_tmp97_ = source;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp102_ = job;
+			_tmp98_ = job;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp103_ = _tmp102_->ready;
+			_tmp99_ = _tmp98_->ready;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp104_ = ready_for_import_get_thumbnails (_tmp103_);
+			_tmp100_ = ready_for_import_get_thumbnails (_tmp99_);
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp105_ = _tmp104_;
+			_tmp101_ = _tmp100_;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp106_ = job;
+			_tmp102_ = job;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp107_ = _tmp106_->ready;
+			_tmp103_ = _tmp102_->ready;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp108_ = _tmp107_->prepared_file;
+			_tmp104_ = _tmp103_->prepared_file;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp109_ = _tmp108_->job;
+			_tmp105_ = _tmp104_->job;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp110_ = job;
+			_tmp106_ = job;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp111_ = _tmp110_->ready;
+			_tmp107_ = _tmp106_->ready;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp112_ = _tmp111_->batch_result;
+			_tmp108_ = _tmp107_->batch_result;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp113_ = completed_import_object_new (_tmp101_, _tmp105_, _tmp109_, _tmp112_);
+			_tmp109_ = completed_import_object_new (_tmp97_, _tmp101_, _tmp105_, _tmp108_);
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp114_ = _tmp113_;
+			_tmp110_ = _tmp109_;
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp114_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp110_);
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_completed_import_object_unref0 (_tmp114_);
+			_completed_import_object_unref0 (_tmp110_);
 #line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_thumbnails_unref0 (_tmp105_);
-#line 8663 "BatchImport.c"
+			_thumbnails_unref0 (_tmp101_);
+#line 9321 "BatchImport.c"
 		}
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (source);
 #line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (tombstone);
-#line 8669 "BatchImport.c"
+#line 9327 "BatchImport.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
 #line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 8675 "BatchImport.c"
+#line 9333 "BatchImport.c"
 }
 
 
-static void batch_import_on_import_files_cancelled (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_import_files_cancelled (BatchImport* self,
+                                        BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	PreparedFileImportJob* job = NULL;
-	BackgroundJob* _tmp1_;
+	PreparedFileImportJob* _tmp1_;
 	PreparedFileImportJob* _tmp2_;
-	PreparedFileImportJob* _tmp3_;
-	PreparedFile* _tmp4_;
-	PreparedFileImportJob* _tmp23_;
-	BatchImportResult* _tmp24_;
-	PreparedFileImportJob* _tmp27_;
-	ReadyForImport* _tmp28_;
+	PreparedFile* _tmp3_;
+	PreparedFileImportJob* _tmp22_;
+	BatchImportResult* _tmp23_;
+	PreparedFileImportJob* _tmp26_;
+	ReadyForImport* _tmp27_;
 #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8700,159 +9360,161 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 #line 1093 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
 #line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	job = _tmp2_;
+	job = _tmp1_;
 #line 1097 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_import_files_cancelled");
 #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = _tmp3_->not_ready;
+	_tmp3_ = _tmp2_->not_ready;
 #line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp4_ != NULL) {
-#line 8712 "BatchImport.c"
-		PreparedFileImportJob* _tmp5_;
-		PreparedFile* _tmp6_;
-		BatchImportJob* _tmp7_;
-		PreparedFileImportJob* _tmp8_;
-		PreparedFile* _tmp9_;
-		GFile* _tmp10_;
-		PreparedFileImportJob* _tmp11_;
-		PreparedFile* _tmp12_;
-		GFile* _tmp13_;
+	if (_tmp3_ != NULL) {
+#line 9370 "BatchImport.c"
+		PreparedFileImportJob* _tmp4_;
+		PreparedFile* _tmp5_;
+		BatchImportJob* _tmp6_;
+		PreparedFileImportJob* _tmp7_;
+		PreparedFile* _tmp8_;
+		GFile* _tmp9_;
+		PreparedFileImportJob* _tmp10_;
+		PreparedFile* _tmp11_;
+		GFile* _tmp12_;
+		gchar* _tmp13_;
 		gchar* _tmp14_;
-		gchar* _tmp15_;
-		PreparedFileImportJob* _tmp16_;
-		PreparedFile* _tmp17_;
-		GFile* _tmp18_;
+		PreparedFileImportJob* _tmp15_;
+		PreparedFile* _tmp16_;
+		GFile* _tmp17_;
+		gchar* _tmp18_;
 		gchar* _tmp19_;
-		gchar* _tmp20_;
+		BatchImportResult* _tmp20_;
 		BatchImportResult* _tmp21_;
-		BatchImportResult* _tmp22_;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = job;
+		_tmp4_ = job;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = _tmp5_->not_ready;
+		_tmp5_ = _tmp4_->not_ready;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = _tmp6_->job;
+		_tmp6_ = _tmp5_->job;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = job;
+		_tmp7_ = job;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp8_->not_ready;
+		_tmp8_ = _tmp7_->not_ready;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = _tmp9_->file;
+		_tmp9_ = _tmp8_->file;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = job;
+		_tmp10_ = job;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = _tmp11_->not_ready;
+		_tmp11_ = _tmp10_->not_ready;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = _tmp12_->file;
+		_tmp12_ = _tmp11_->file;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = g_file_get_path (_tmp13_);
+		_tmp13_ = g_file_get_path (_tmp12_);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = _tmp14_;
+		_tmp14_ = _tmp13_;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = job;
+		_tmp15_ = job;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp16_->not_ready;
+		_tmp16_ = _tmp15_->not_ready;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = _tmp17_->file;
+		_tmp17_ = _tmp16_->file;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = g_file_get_path (_tmp18_);
+		_tmp18_ = g_file_get_path (_tmp17_);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = batch_import_result_new (_tmp7_, _tmp10_, _tmp15_, _tmp20_, NULL, IMPORT_RESULT_USER_ABORT);
+		_tmp20_ = batch_import_result_new (_tmp6_, _tmp9_, _tmp14_, _tmp19_, NULL, IMPORT_RESULT_USER_ABORT);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_failure (self, _tmp22_);
+		batch_import_report_failure (self, _tmp21_);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_batch_import_result_unref0 (_tmp22_);
+		_batch_import_result_unref0 (_tmp21_);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp20_);
+		_g_free0 (_tmp19_);
 #line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp14_);
 #line 1103 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8777 "BatchImport.c"
+#line 9435 "BatchImport.c"
 	}
 #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp23_ = job;
+	_tmp22_ = job;
 #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp24_ = _tmp23_->failed;
+	_tmp23_ = _tmp22_->failed;
 #line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp24_ != NULL) {
-#line 8785 "BatchImport.c"
-		PreparedFileImportJob* _tmp25_;
-		BatchImportResult* _tmp26_;
+	if (_tmp23_ != NULL) {
+#line 9443 "BatchImport.c"
+		PreparedFileImportJob* _tmp24_;
+		BatchImportResult* _tmp25_;
 #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp25_ = job;
+		_tmp24_ = job;
 #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = _tmp25_->failed;
+		_tmp25_ = _tmp24_->failed;
 #line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_failure (self, _tmp26_);
+		batch_import_report_failure (self, _tmp25_);
 #line 1108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8796 "BatchImport.c"
+#line 9454 "BatchImport.c"
 	}
 #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp27_ = job;
+	_tmp26_ = job;
 #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp28_ = _tmp27_->ready;
+	_tmp27_ = _tmp26_->ready;
 #line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp28_ != NULL) {
-#line 8804 "BatchImport.c"
-		PreparedFileImportJob* _tmp29_;
-		ReadyForImport* _tmp30_;
+	if (_tmp27_ != NULL) {
+#line 9462 "BatchImport.c"
+		PreparedFileImportJob* _tmp28_;
+		ReadyForImport* _tmp29_;
+		BatchImportResult* _tmp30_;
 		BatchImportResult* _tmp31_;
-		BatchImportResult* _tmp32_;
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = job;
+		_tmp28_ = job;
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = _tmp29_->ready;
+		_tmp29_ = _tmp28_->ready;
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = ready_for_import_abort (_tmp30_);
+		_tmp30_ = ready_for_import_abort (_tmp29_);
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp32_ = _tmp31_;
+		_tmp31_ = _tmp30_;
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_failure (self, _tmp32_);
+		batch_import_report_failure (self, _tmp31_);
 #line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_batch_import_result_unref0 (_tmp32_);
+		_batch_import_result_unref0 (_tmp31_);
 #line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8823 "BatchImport.c"
+#line 9481 "BatchImport.c"
 	}
 #line 1116 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
 #line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 8829 "BatchImport.c"
+#line 9487 "BatchImport.c"
 }
 
 
-static gpointer _completed_import_object_ref0 (gpointer self) {
+static gpointer
+_completed_import_object_ref0 (gpointer self)
+{
 #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? completed_import_object_ref (self) : NULL;
-#line 8836 "BatchImport.c"
+#line 9496 "BatchImport.c"
 }
 
 
-static void batch_import_on_thumbnail_writer_completed (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_thumbnail_writer_completed (BatchImport* self,
+                                            BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	ThumbnailWriterJob* job = NULL;
-	BackgroundJob* _tmp1_;
-	ThumbnailWriterJob* _tmp2_;
+	ThumbnailWriterJob* _tmp1_;
 	CompletedImportObject* completed = NULL;
-	ThumbnailWriterJob* _tmp3_;
+	ThumbnailWriterJob* _tmp2_;
+	CompletedImportObject* _tmp3_;
 	CompletedImportObject* _tmp4_;
 	CompletedImportObject* _tmp5_;
-	CompletedImportObject* _tmp6_;
-	BatchImportResult* _tmp7_;
-	ImportResult _tmp8_;
+	BatchImportResult* _tmp6_;
+	ImportResult _tmp7_;
 #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8862,149 +9524,147 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 #line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
 #line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	job = _tmp2_;
+	job = _tmp1_;
 #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = _tmp3_->completed_import_source;
+	_tmp3_ = _tmp2_->completed_import_source;
 #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _completed_import_object_ref0 (_tmp4_);
+	_tmp4_ = _completed_import_object_ref0 (_tmp3_);
 #line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	completed = _tmp5_;
+	completed = _tmp4_;
 #line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_thumbnail_writer_completed");
 #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = completed;
+	_tmp5_ = completed;
 #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _tmp6_->batch_result;
+	_tmp6_ = _tmp5_->batch_result;
 #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = _tmp7_->result;
+	_tmp7_ = _tmp6_->result;
 #line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp8_ != IMPORT_RESULT_SUCCESS) {
-#line 8884 "BatchImport.c"
-		CompletedImportObject* _tmp9_;
-		MediaSource* _tmp10_;
+	if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
+#line 9544 "BatchImport.c"
+		CompletedImportObject* _tmp8_;
+		MediaSource* _tmp9_;
+		gchar* _tmp10_;
 		gchar* _tmp11_;
-		gchar* _tmp12_;
-		CompletedImportObject* _tmp13_;
-		BatchImportResult* _tmp14_;
-		ImportResult _tmp15_;
+		CompletedImportObject* _tmp12_;
+		BatchImportResult* _tmp13_;
+		ImportResult _tmp14_;
+		gchar* _tmp15_;
 		gchar* _tmp16_;
-		gchar* _tmp17_;
-		CompletedImportObject* _tmp18_;
-		MediaSource* _tmp19_;
-		CompletedImportObject* _tmp26_;
-		BatchImportResult* _tmp27_;
+		CompletedImportObject* _tmp17_;
+		MediaSource* _tmp18_;
+		CompletedImportObject* _tmp25_;
+		BatchImportResult* _tmp26_;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = completed;
+		_tmp8_ = completed;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = _tmp9_->source;
+		_tmp9_ = _tmp8_->source;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
+		_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = completed;
+		_tmp12_ = completed;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = _tmp13_->batch_result;
+		_tmp13_ = _tmp12_->batch_result;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = _tmp14_->result;
+		_tmp14_ = _tmp13_->result;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = import_result_to_string (_tmp15_);
+		_tmp15_ = import_result_to_string (_tmp14_);
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp16_;
+		_tmp16_ = _tmp15_;
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_warning ("BatchImport.vala:1135: Failed to import %s: unable to write thumbnails" \
-" (%s)", _tmp12_, _tmp17_);
+" (%s)", _tmp11_, _tmp16_);
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp17_);
+		_g_free0 (_tmp16_);
 #line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp12_);
+		_g_free0 (_tmp11_);
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = completed;
+		_tmp17_ = completed;
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = _tmp18_->source;
+		_tmp18_ = _tmp17_->source;
 #line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) {
-#line 8928 "BatchImport.c"
-			CompletedImportObject* _tmp20_;
-			MediaSource* _tmp21_;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_LIBRARY_PHOTO)) {
+#line 9588 "BatchImport.c"
+			CompletedImportObject* _tmp19_;
+			MediaSource* _tmp20_;
 #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = completed;
+			_tmp19_ = completed;
 #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp21_ = _tmp20_->source;
+			_tmp20_ = _tmp19_->source;
 #line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL);
-#line 8937 "BatchImport.c"
+			library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp20_) : NULL);
+#line 9597 "BatchImport.c"
 		} else {
-			CompletedImportObject* _tmp22_;
-			MediaSource* _tmp23_;
+			CompletedImportObject* _tmp21_;
+			MediaSource* _tmp22_;
 #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp22_ = completed;
+			_tmp21_ = completed;
 #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = _tmp22_->source;
+			_tmp22_ = _tmp21_->source;
 #line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) {
-#line 8947 "BatchImport.c"
-				CompletedImportObject* _tmp24_;
-				MediaSource* _tmp25_;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_VIDEO)) {
+#line 9607 "BatchImport.c"
+				CompletedImportObject* _tmp23_;
+				MediaSource* _tmp24_;
 #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp24_ = completed;
+				_tmp23_ = completed;
 #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp25_ = _tmp24_->source;
+				_tmp24_ = _tmp23_->source;
 #line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL);
-#line 8956 "BatchImport.c"
+				video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO) ? ((Video*) _tmp24_) : NULL);
+#line 9616 "BatchImport.c"
 			}
 		}
 #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = completed;
+		_tmp25_ = completed;
 #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = _tmp26_->batch_result;
+		_tmp26_ = _tmp25_->batch_result;
 #line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		batch_import_report_failure (self, _tmp27_);
+		batch_import_report_failure (self, _tmp26_);
 #line 1144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8967 "BatchImport.c"
+#line 9627 "BatchImport.c"
 	} else {
-		ImportManifest* _tmp28_;
-		GeeList* _tmp29_;
-		CompletedImportObject* _tmp30_;
-		MediaSource* _tmp31_;
-		ImportManifest* _tmp32_;
-		CompletedImportObject* _tmp33_;
-		BatchImportResult* _tmp34_;
-		GeeList* _tmp35_;
-		CompletedImportObject* _tmp36_;
+		ImportManifest* _tmp27_;
+		GeeList* _tmp28_;
+		CompletedImportObject* _tmp29_;
+		MediaSource* _tmp30_;
+		ImportManifest* _tmp31_;
+		CompletedImportObject* _tmp32_;
+		BatchImportResult* _tmp33_;
+		GeeList* _tmp34_;
+		CompletedImportObject* _tmp35_;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = self->priv->manifest;
+		_tmp27_ = self->priv->manifest;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = _tmp28_->imported;
+		_tmp28_ = _tmp27_->imported;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = completed;
+		_tmp29_ = completed;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = _tmp30_->source;
+		_tmp30_ = _tmp29_->source;
 #line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_);
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp32_ = self->priv->manifest;
+		_tmp31_ = self->priv->manifest;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp33_ = completed;
+		_tmp32_ = completed;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp34_ = _tmp33_->batch_result;
+		_tmp33_ = _tmp32_->batch_result;
 #line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		import_manifest_add_result (_tmp32_, _tmp34_);
+		import_manifest_add_result (_tmp31_, _tmp33_);
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp35_ = self->priv->display_imported_queue;
+		_tmp34_ = self->priv->display_imported_queue;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp36_ = completed;
+		_tmp35_ = completed;
 #line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
-#line 9002 "BatchImport.c"
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_);
+#line 9662 "BatchImport.c"
 	}
 #line 1152 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
@@ -9012,23 +9672,25 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 	_completed_import_object_unref0 (completed);
 #line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9010 "BatchImport.c"
+#line 9670 "BatchImport.c"
 }
 
 
-static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, BackgroundJob* j) {
+static void
+batch_import_on_thumbnail_writer_cancelled (BatchImport* self,
+                                            BackgroundJob* j)
+{
 	gboolean _tmp0_;
 	ThumbnailWriterJob* job = NULL;
-	BackgroundJob* _tmp1_;
-	ThumbnailWriterJob* _tmp2_;
+	ThumbnailWriterJob* _tmp1_;
 	CompletedImportObject* completed = NULL;
-	ThumbnailWriterJob* _tmp3_;
+	ThumbnailWriterJob* _tmp2_;
+	CompletedImportObject* _tmp3_;
 	CompletedImportObject* _tmp4_;
 	CompletedImportObject* _tmp5_;
-	CompletedImportObject* _tmp6_;
-	MediaSource* _tmp7_;
-	CompletedImportObject* _tmp14_;
-	BatchImportResult* _tmp15_;
+	MediaSource* _tmp6_;
+	CompletedImportObject* _tmp13_;
+	BatchImportResult* _tmp14_;
 #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
 #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9038,64 +9700,62 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 #line 1156 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
 #line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = j;
-#line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
+	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (j, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
 #line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	job = _tmp2_;
+	job = _tmp1_;
 #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = job;
+	_tmp2_ = job;
 #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = _tmp3_->completed_import_source;
+	_tmp3_ = _tmp2_->completed_import_source;
 #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _completed_import_object_ref0 (_tmp4_);
+	_tmp4_ = _completed_import_object_ref0 (_tmp3_);
 #line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	completed = _tmp5_;
+	completed = _tmp4_;
 #line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_thumbnail_writer_cancelled");
 #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = completed;
+	_tmp5_ = completed;
 #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _tmp6_->source;
+	_tmp6_ = _tmp5_->source;
 #line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
-#line 9057 "BatchImport.c"
-		CompletedImportObject* _tmp8_;
-		MediaSource* _tmp9_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO)) {
+#line 9717 "BatchImport.c"
+		CompletedImportObject* _tmp7_;
+		MediaSource* _tmp8_;
 #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = completed;
+		_tmp7_ = completed;
 #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp8_->source;
+		_tmp8_ = _tmp7_->source;
 #line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL);
-#line 9066 "BatchImport.c"
+		library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp8_) : NULL);
+#line 9726 "BatchImport.c"
 	} else {
-		CompletedImportObject* _tmp10_;
-		MediaSource* _tmp11_;
+		CompletedImportObject* _tmp9_;
+		MediaSource* _tmp10_;
 #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = completed;
+		_tmp9_ = completed;
 #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = _tmp10_->source;
+		_tmp10_ = _tmp9_->source;
 #line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) {
-#line 9076 "BatchImport.c"
-			CompletedImportObject* _tmp12_;
-			MediaSource* _tmp13_;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO)) {
+#line 9736 "BatchImport.c"
+			CompletedImportObject* _tmp11_;
+			MediaSource* _tmp12_;
 #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp12_ = completed;
+			_tmp11_ = completed;
 #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp13_ = _tmp12_->source;
+			_tmp12_ = _tmp11_->source;
 #line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL);
-#line 9085 "BatchImport.c"
+			video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO) ? ((Video*) _tmp12_) : NULL);
+#line 9745 "BatchImport.c"
 		}
 	}
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = completed;
+	_tmp13_ = completed;
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = _tmp14_->batch_result;
+	_tmp14_ = _tmp13_->batch_result;
 #line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_report_failure (self, _tmp15_);
+	batch_import_report_failure (self, _tmp14_);
 #line 1169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_file_import_complete (self);
 #line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9104,11 +9764,13 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 	_completed_import_object_unref0 (completed);
 #line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9102 "BatchImport.c"
+#line 9762 "BatchImport.c"
 }
 
 
-static void batch_import_flush_ready_sources (BatchImport* self) {
+static void
+batch_import_flush_ready_sources (BatchImport* self)
+{
 	GeeList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
@@ -9133,14 +9795,14 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	GeeArrayList* _tmp46_;
 	VideoSourceCollection* _tmp47_;
 	GeeArrayList* _tmp48_;
-	GeeArrayList* _tmp70_;
-	BatchImportRoll* _tmp71_;
-	ViewCollection* _tmp72_;
-	TagSourceCollection* _tmp73_;
-	EventSourceCollection* _tmp74_;
+	GeeArrayList* _tmp69_;
+	BatchImportRoll* _tmp70_;
+	ViewCollection* _tmp71_;
+	TagSourceCollection* _tmp72_;
+	EventSourceCollection* _tmp73_;
+	MediaCollectionRegistry* _tmp74_;
 	MediaCollectionRegistry* _tmp75_;
-	MediaCollectionRegistry* _tmp76_;
-	GeeList* _tmp77_;
+	GeeList* _tmp76_;
 	GError * _inner_error_ = NULL;
 #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
@@ -9154,7 +9816,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	if (_tmp2_ == 0) {
 #line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 9152 "BatchImport.c"
+#line 9814 "BatchImport.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->priv->ready_sources;
@@ -9186,7 +9848,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completion_list = _tmp11_;
-#line 9184 "BatchImport.c"
+#line 9846 "BatchImport.c"
 	{
 		GeeList* _completed_list = NULL;
 		GeeList* _tmp12_;
@@ -9214,7 +9876,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_completed_index = -1;
 #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9212 "BatchImport.c"
+#line 9874 "BatchImport.c"
 			gint _tmp17_;
 			gint _tmp18_;
 			gint _tmp19_;
@@ -9244,7 +9906,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			if (!(_tmp18_ < _tmp19_)) {
 #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9242 "BatchImport.c"
+#line 9904 "BatchImport.c"
 			}
 #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _completed_list;
@@ -9268,7 +9930,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			_tmp27_ = _tmp26_->source;
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) {
-#line 9266 "BatchImport.c"
+#line 9928 "BatchImport.c"
 				GeeArrayList* _tmp28_;
 				CompletedImportObject* _tmp29_;
 				MediaSource* _tmp30_;
@@ -9280,7 +9942,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_tmp30_ = _tmp29_->source;
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 9278 "BatchImport.c"
+#line 9940 "BatchImport.c"
 			} else {
 				CompletedImportObject* _tmp31_;
 				MediaSource* _tmp32_;
@@ -9290,7 +9952,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_tmp32_ = _tmp31_->source;
 #line 1197 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
-#line 9288 "BatchImport.c"
+#line 9950 "BatchImport.c"
 					GeeArrayList* _tmp33_;
 					CompletedImportObject* _tmp34_;
 					MediaSource* _tmp35_;
@@ -9302,7 +9964,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 					_tmp35_ = _tmp34_->source;
 #line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video));
-#line 9300 "BatchImport.c"
+#line 9962 "BatchImport.c"
 				}
 			}
 #line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9319,11 +9981,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_);
 #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_completed_import_object_unref0 (completed);
-#line 9317 "BatchImport.c"
+#line 9979 "BatchImport.c"
 		}
 #line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_completed_list);
-#line 9321 "BatchImport.c"
+#line 9983 "BatchImport.c"
 	}
 #line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp41_ = media_collection_registry_get_instance ();
@@ -9353,7 +10015,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_tmp48_ = videos;
 #line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9351 "BatchImport.c"
+#line 10013 "BatchImport.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeHashMap* _tmp49_;
@@ -9380,55 +10042,52 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		_media_it = _tmp54_;
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9378 "BatchImport.c"
+#line 10040 "BatchImport.c"
 			GeeIterator* _tmp55_;
-			gboolean _tmp56_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp57_;
-			gpointer _tmp58_;
+			GeeIterator* _tmp56_;
+			gpointer _tmp57_;
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = _media_it;
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp56_ = gee_iterator_next (_tmp55_);
-#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!_tmp56_) {
+			if (!gee_iterator_next (_tmp55_)) {
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9392 "BatchImport.c"
+#line 10051 "BatchImport.c"
 			}
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp57_ = _media_it;
+			_tmp56_ = _media_it;
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp58_ = gee_iterator_get (_tmp57_);
+			_tmp57_ = gee_iterator_get (_tmp56_);
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			media = (MediaSource*) _tmp58_;
-#line 9400 "BatchImport.c"
+			media = (MediaSource*) _tmp57_;
+#line 10059 "BatchImport.c"
 			{
-				GeeHashMap* _tmp59_;
-				MediaSource* _tmp60_;
-				gpointer _tmp61_;
-				BatchImportJob* _tmp62_;
-				MediaSource* _tmp63_;
-				BatchImportRoll* _tmp64_;
+				GeeHashMap* _tmp58_;
+				MediaSource* _tmp59_;
+				gpointer _tmp60_;
+				BatchImportJob* _tmp61_;
+				MediaSource* _tmp62_;
+				BatchImportRoll* _tmp63_;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = completion_list;
+				_tmp58_ = completion_list;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp60_ = media;
+				_tmp59_ = media;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp61_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_);
+				_tmp60_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp59_);
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp62_ = (BatchImportJob*) _tmp61_;
+				_tmp61_ = (BatchImportJob*) _tmp60_;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = media;
+				_tmp62_ = media;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp64_ = self->priv->import_roll;
+				_tmp63_ = self->priv->import_roll;
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_import_job_complete (_tmp62_, _tmp63_, _tmp64_, &_inner_error_);
+				batch_import_job_complete (_tmp61_, _tmp62_, _tmp63_, &_inner_error_);
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_batch_import_job_unref0 (_tmp62_);
+				_batch_import_job_unref0 (_tmp61_);
 #line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9426 "BatchImport.c"
+#line 10085 "BatchImport.c"
 					goto __catch425_g_error;
 				}
 			}
@@ -9436,33 +10095,33 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			__catch425_g_error:
 			{
 				GError* err = NULL;
-				MediaSource* _tmp65_;
+				MediaSource* _tmp64_;
+				gchar* _tmp65_;
 				gchar* _tmp66_;
-				gchar* _tmp67_;
-				GError* _tmp68_;
-				const gchar* _tmp69_;
+				GError* _tmp67_;
+				const gchar* _tmp68_;
 #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp65_ = media;
+				_tmp64_ = media;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp66_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_OBJECT, DataObject));
+				_tmp65_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_OBJECT, DataObject));
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp67_ = _tmp66_;
+				_tmp66_ = _tmp65_;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp68_ = err;
+				_tmp67_ = err;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp69_ = _tmp68_->message;
+				_tmp68_ = _tmp67_->message;
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_warning ("BatchImport.vala:1215: Completion error when finalizing import of %s: " \
-"%s", _tmp67_, _tmp69_);
+"%s", _tmp66_, _tmp68_);
 #line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp67_);
+				_g_free0 (_tmp66_);
 #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 9459 "BatchImport.c"
+#line 10118 "BatchImport.c"
 			}
 			__finally425:
 #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9485,44 +10144,44 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				g_clear_error (&_inner_error_);
 #line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 9482 "BatchImport.c"
+#line 10141 "BatchImport.c"
 			}
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (media);
-#line 9486 "BatchImport.c"
+#line 10145 "BatchImport.c"
 		}
 #line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_media_it);
-#line 9490 "BatchImport.c"
+#line 10149 "BatchImport.c"
 	}
 #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp70_ = all;
+	_tmp69_ = all;
 #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp71_ = self->priv->import_roll;
+	_tmp70_ = self->priv->import_roll;
 #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp72_ = _tmp71_->generated_events;
+	_tmp71_ = _tmp70_->generated_events;
 #line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	event_generate_many_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp72_);
+	event_generate_many_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_);
 #line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp73_ = tag_global;
+	_tmp72_ = tag_global;
 #line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp74_ = event_global;
+	_tmp73_ = event_global;
 #line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp75_ = media_collection_registry_get_instance ();
+	_tmp74_ = media_collection_registry_get_instance ();
 #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp76_ = _tmp75_;
+	_tmp75_ = _tmp74_;
 #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	media_collection_registry_commit_transaction_on_all (_tmp76_);
+	media_collection_registry_commit_transaction_on_all (_tmp75_);
 #line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_media_collection_registry_unref0 (_tmp76_);
+	_media_collection_registry_unref0 (_tmp75_);
 #line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp77_ = self->priv->ready_sources;
+	_tmp76_ = self->priv->ready_sources;
 #line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
+	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (completion_list);
 #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9531,29 +10190,28 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	_g_object_unref0 (photos);
 #line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (all);
-#line 9528 "BatchImport.c"
+#line 10187 "BatchImport.c"
 }
 
 
-static gboolean batch_import_display_imported_timer (BatchImport* self) {
+static gboolean
+batch_import_display_imported_timer (BatchImport* self)
+{
 	gboolean result = FALSE;
 	GeeList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	GCancellable* _tmp4_;
-	gboolean _tmp5_;
 	gint total = 0;
-	GCancellable* _tmp9_;
-	gboolean _tmp10_;
+	GCancellable* _tmp8_;
+	gint _tmp15_;
+	GeeList* _tmp16_;
+	gint _tmp17_;
 	gint _tmp18_;
-	GeeList* _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
-	gboolean _tmp47_ = FALSE;
-	GeeList* _tmp48_;
-	gint _tmp49_;
-	gint _tmp50_;
+	gboolean _tmp41_ = FALSE;
+	GeeList* _tmp42_;
+	gint _tmp43_;
+	gint _tmp44_;
 #line 1232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
 #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9564,7 +10222,7 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	_tmp2_ = _tmp1_;
 #line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == 0) {
-#line 9561 "BatchImport.c"
+#line 10219 "BatchImport.c"
 		gboolean _tmp3_;
 #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->completed;
@@ -9572,200 +10230,185 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		result = !_tmp3_;
 #line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 9569 "BatchImport.c"
+#line 10227 "BatchImport.c"
 	}
 #line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->cancellable;
 #line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp5_) {
-#line 9577 "BatchImport.c"
-		GeeList* _tmp6_;
+	if (g_cancellable_is_cancelled (_tmp4_)) {
+#line 10233 "BatchImport.c"
+		GeeList* _tmp5_;
+		gint _tmp6_;
 		gint _tmp7_;
-		gint _tmp8_;
 #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = self->priv->display_imported_queue;
+		_tmp5_ = self->priv->display_imported_queue;
 #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1237: Importing %d photos at once", _tmp8_);
-#line 9589 "BatchImport.c"
+		g_debug ("BatchImport.vala:1237: Importing %d photos at once", _tmp7_);
+#line 10245 "BatchImport.c"
 	}
 #line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "display_imported_timer");
 #line 1249 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	total = 1;
 #line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = self->priv->cancellable;
-#line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = g_cancellable_is_cancelled (_tmp9_);
+	_tmp8_ = self->priv->cancellable;
 #line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (!_tmp10_) {
-#line 9601 "BatchImport.c"
-		GeeList* _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
+	if (!g_cancellable_is_cancelled (_tmp8_)) {
+#line 10255 "BatchImport.c"
+		GeeList* _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
 #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = self->priv->display_imported_queue;
+		_tmp9_ = self->priv->display_imported_queue;
 #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = _tmp12_;
+		_tmp11_ = _tmp10_;
 #line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) {
-#line 9613 "BatchImport.c"
-			GeeList* _tmp14_;
-			gint _tmp15_;
-			gint _tmp16_;
-			gint _tmp17_;
+		if (_tmp11_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) {
+#line 10267 "BatchImport.c"
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = self->priv->display_imported_queue;
+			_tmp12_ = self->priv->display_imported_queue;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp16_ = _tmp15_;
+			_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16);
+			_tmp14_ = _tmp13_;
 #line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			total = 1 << _tmp17_;
-#line 9628 "BatchImport.c"
+			total = 1 << CLAMP ((_tmp14_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16);
+#line 10279 "BatchImport.c"
 		}
 	} else {
 #line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW;
-#line 9633 "BatchImport.c"
+#line 10284 "BatchImport.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = total;
+	_tmp15_ = total;
 #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = self->priv->display_imported_queue;
+	_tmp16_ = self->priv->display_imported_queue;
 #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp21_ = _tmp20_;
-#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp22_ = MIN (_tmp18_, _tmp21_);
+	_tmp18_ = _tmp17_;
 #line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	total = _tmp22_;
+	total = MIN (_tmp15_, _tmp18_);
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 9649 "BatchImport.c"
-		gint _tmp23_;
+#line 10298 "BatchImport.c"
+		gint _tmp19_;
 		CompletedImportObject* completed_object = NULL;
-		GeeList* _tmp24_;
-		gpointer _tmp25_;
+		GeeList* _tmp20_;
+		gpointer _tmp21_;
 		GdkPixbuf* user_preview = NULL;
+		CompletedImportObject* _tmp22_;
+		GdkPixbuf* _tmp23_;
+		GdkPixbuf* _tmp24_;
+		CompletedImportObject* _tmp25_;
 		CompletedImportObject* _tmp26_;
-		GdkPixbuf* _tmp27_;
-		GdkPixbuf* _tmp28_;
+		GeeList* _tmp27_;
+		CompletedImportObject* _tmp28_;
 		CompletedImportObject* _tmp29_;
-		CompletedImportObject* _tmp30_;
-		GeeList* _tmp31_;
-		CompletedImportObject* _tmp32_;
+		MediaSource* _tmp30_;
+		GdkPixbuf* _tmp31_;
+		gint _tmp32_;
 		CompletedImportObject* _tmp33_;
 		MediaSource* _tmp34_;
-		GdkPixbuf* _tmp35_;
-		gint _tmp36_;
-		CompletedImportObject* _tmp37_;
-		MediaSource* _tmp38_;
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = total;
+		_tmp19_ = total;
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		total = _tmp23_ - 1;
+		total = _tmp19_ - 1;
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!(_tmp23_ > 0)) {
+		if (!(_tmp19_ > 0)) {
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 9676 "BatchImport.c"
+#line 10325 "BatchImport.c"
 		}
 #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp24_ = self->priv->display_imported_queue;
+		_tmp20_ = self->priv->display_imported_queue;
 #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp25_ = gee_list_remove_at (_tmp24_, 0);
+		_tmp21_ = gee_list_remove_at (_tmp20_, 0);
 #line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		completed_object = (CompletedImportObject*) _tmp25_;
+		completed_object = (CompletedImportObject*) _tmp21_;
 #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = completed_object;
+		_tmp22_ = completed_object;
 #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = _tmp26_->user_preview;
+		_tmp23_ = _tmp22_->user_preview;
 #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = _g_object_ref0 (_tmp27_);
+		_tmp24_ = _g_object_ref0 (_tmp23_);
 #line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		user_preview = _tmp28_;
+		user_preview = _tmp24_;
 #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = completed_object;
+		_tmp25_ = completed_object;
 #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp29_->user_preview);
+		_g_object_unref0 (_tmp25_->user_preview);
 #line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_->user_preview = NULL;
+		_tmp25_->user_preview = NULL;
 #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = completed_object;
+		_tmp26_ = completed_object;
 #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_thumbnails_unref0 (_tmp30_->thumbnails);
+		_thumbnails_unref0 (_tmp26_->thumbnails);
 #line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_->thumbnails = NULL;
+		_tmp26_->thumbnails = NULL;
 #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = self->priv->ready_sources;
+		_tmp27_ = self->priv->ready_sources;
 #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp32_ = completed_object;
+		_tmp28_ = completed_object;
 #line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp33_ = completed_object;
+		_tmp29_ = completed_object;
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp34_ = _tmp33_->source;
+		_tmp30_ = _tmp29_->source;
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp35_ = user_preview;
+		_tmp31_ = user_preview;
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp36_ = total;
+		_tmp32_ = total;
 #line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp34_, _tmp35_, _tmp36_);
+		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp30_, _tmp31_, _tmp32_);
 #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp37_ = completed_object;
+		_tmp33_ = completed_object;
 #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp38_ = _tmp37_->source;
+		_tmp34_ = _tmp33_->source;
 #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, TYPE_PHOTO_SOURCE)) {
-#line 9726 "BatchImport.c"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, TYPE_PHOTO_SOURCE)) {
+#line 10375 "BatchImport.c"
 			PhotoSource* photo_source = NULL;
-			CompletedImportObject* _tmp39_;
-			MediaSource* _tmp40_;
-			PhotoSource* _tmp41_;
-			PhotoSource* _tmp42_;
-			guint64 _tmp43_;
+			CompletedImportObject* _tmp35_;
+			MediaSource* _tmp36_;
+			PhotoSource* _tmp37_;
+			PhotoSource* _tmp38_;
 #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = completed_object;
+			_tmp35_ = completed_object;
 #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp40_ = _tmp39_->source;
+			_tmp36_ = _tmp35_->source;
 #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp40_) : NULL);
+			_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp36_) : NULL);
 #line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			photo_source = _tmp41_;
+			photo_source = _tmp37_;
 #line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp42_ = photo_source;
+			_tmp38_ = photo_source;
 #line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			batch_import_report_progress (self, _tmp43_);
+			batch_import_report_progress (self, media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE, MediaSource)));
 #line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo_source);
-#line 9749 "BatchImport.c"
+#line 10395 "BatchImport.c"
 		} else {
-			CompletedImportObject* _tmp44_;
-			MediaSource* _tmp45_;
-			guint64 _tmp46_;
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = completed_object;
+			CompletedImportObject* _tmp39_;
+			MediaSource* _tmp40_;
 #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp45_ = _tmp44_->source;
+			_tmp39_ = completed_object;
 #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = media_source_get_filesize (_tmp45_);
+			_tmp40_ = _tmp39_->source;
 #line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			batch_import_report_progress (self, _tmp46_);
-#line 9762 "BatchImport.c"
+			batch_import_report_progress (self, media_source_get_filesize (_tmp40_));
+#line 10405 "BatchImport.c"
 		}
 #line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
@@ -9773,45 +10416,49 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		_g_object_unref0 (user_preview);
 #line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (completed_object);
-#line 9770 "BatchImport.c"
+#line 10413 "BatchImport.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp48_ = self->priv->ready_sources;
+	_tmp42_ = self->priv->ready_sources;
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp50_ = _tmp49_;
+	_tmp44_ = _tmp43_;
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp50_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
+	if (_tmp44_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp47_ = TRUE;
-#line 9782 "BatchImport.c"
+		_tmp41_ = TRUE;
+#line 10425 "BatchImport.c"
 	} else {
-		GCancellable* _tmp51_;
-		gboolean _tmp52_;
-#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp51_ = self->priv->cancellable;
+		GCancellable* _tmp45_;
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp52_ = g_cancellable_is_cancelled (_tmp51_);
+		_tmp45_ = self->priv->cancellable;
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp47_ = _tmp52_;
-#line 9792 "BatchImport.c"
+		_tmp41_ = g_cancellable_is_cancelled (_tmp45_);
+#line 10432 "BatchImport.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp47_) {
+	if (_tmp41_) {
 #line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_flush_ready_sources (self);
-#line 9798 "BatchImport.c"
+#line 10438 "BatchImport.c"
 	}
 #line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
 #line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 9804 "BatchImport.c"
+#line 10444 "BatchImport.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__UINT64_UINT64) (gpointer data1, guint64 arg_1, guint64 arg_2, gpointer data2);
 	register GMarshalFunc_VOID__UINT64_UINT64 callback;
 	register GCClosure * cc;
@@ -9826,23 +10473,30 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
 		data1 = closure->data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9823 "BatchImport.c"
+#line 10470 "BatchImport.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9829 "BatchImport.c"
+#line 10476 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 9835 "BatchImport.c"
+#line 10482 "BatchImport.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
+                                                 GValue * return_value,
+                                                 guint n_param_values,
+                                                 const GValue * param_values,
+                                                 gpointer invocation_hint,
+                                                 gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_INT) (gpointer data1, gpointer arg_1, gpointer arg_2, gint arg_3, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT_INT callback;
 	register GCClosure * cc;
@@ -9857,23 +10511,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
 		data1 = closure->data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9854 "BatchImport.c"
+#line 10508 "BatchImport.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9860 "BatchImport.c"
+#line 10514 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2);
-#line 9866 "BatchImport.c"
+#line 10520 "BatchImport.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure,
+                                           GValue * return_value,
+                                           guint n_param_values,
+                                           const GValue * param_values,
+                                           gpointer invocation_hint,
+                                           gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__ENUM_STRING) (gpointer data1, gint arg_1, const char* arg_2, gpointer data2);
 	register GMarshalFunc_VOID__ENUM_STRING callback;
 	register GCClosure * cc;
@@ -9888,23 +10549,30 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu
 		data1 = closure->data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9885 "BatchImport.c"
+#line 10546 "BatchImport.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9891 "BatchImport.c"
+#line 10552 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 9897 "BatchImport.c"
+#line 10558 "BatchImport.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closure,
+                                                   GValue * return_value,
+                                                   guint n_param_values,
+                                                   const GValue * param_values,
+                                                   gpointer invocation_hint,
+                                                   gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (gpointer data1, gpointer arg_1, gpointer data2);
 	register GMarshalFunc_VOID__BATCH_IMPORT_RESULT callback;
 	register GCClosure * cc;
@@ -9919,23 +10587,30 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur
 		data1 = closure->data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9916 "BatchImport.c"
+#line 10584 "BatchImport.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9922 "BatchImport.c"
+#line 10590 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_batch_import_result (param_values + 1), data2);
-#line 9928 "BatchImport.c"
+#line 10596 "BatchImport.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GClosure * closure,
+                                                                 GValue * return_value,
+                                                                 guint n_param_values,
+                                                                 const GValue * param_values,
+                                                                 gpointer invocation_hint,
+                                                                 gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
 	register GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL callback;
 	register GCClosure * cc;
@@ -9950,26 +10625,27 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl
 		data1 = closure->data;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9947 "BatchImport.c"
+#line 10622 "BatchImport.c"
 	} else {
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9953 "BatchImport.c"
+#line 10628 "BatchImport.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2);
-#line 9959 "BatchImport.c"
+#line 10634 "BatchImport.c"
 }
 
 
-static void batch_import_class_init (BatchImportClass * klass) {
+static void
+batch_import_class_init (BatchImportClass * klass)
+{
 	Workers* _tmp0_;
-	guint _tmp1_;
-	Workers* _tmp2_;
+	Workers* _tmp1_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_parent_class = g_type_class_peek_parent (klass);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9995,22 +10671,21 @@ static void batch_import_class_init (BatchImportClass * klass) {
 #line 429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_feeder_workers = _tmp0_;
 #line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = workers_thread_per_cpu_minus_one ();
-#line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = workers_new (_tmp1_, FALSE);
+	_tmp1_ = workers_new (workers_thread_per_cpu_minus_one (), FALSE);
 #line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_import_import_workers = _tmp2_;
-#line 9997 "BatchImport.c"
+	batch_import_import_workers = _tmp1_;
+#line 10671 "BatchImport.c"
 }
 
 
-static void batch_import_instance_init (BatchImport * self) {
+static void
+batch_import_instance_init (BatchImport * self)
+{
 	GeeHashMap* _tmp0_;
-	guint _tmp1_;
+	GeeLinkedList* _tmp1_;
 	GeeLinkedList* _tmp2_;
 	GeeLinkedList* _tmp3_;
 	GeeLinkedList* _tmp4_;
-	GeeLinkedList* _tmp5_;
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = BATCH_IMPORT_GET_PRIVATE (self);
 #line 435 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10036,34 +10711,34 @@ static void batch_import_instance_init (BatchImport * self) {
 #line 449 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->throbber_id = (guint) 0;
 #line 450 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = workers_thread_per_cpu_minus_one ();
-#line 450 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->max_outstanding_import_jobs = _tmp1_;
+	self->priv->max_outstanding_import_jobs = workers_thread_per_cpu_minus_one ();
 #line 451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->untrash_duplicates = TRUE;
 #line 452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = TRUE;
 #line 456 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
 #line 456 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
+	self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
 #line 457 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 457 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
+	self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
 #line 459 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 459 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
+	self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
 #line 461 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
 #line 461 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
-#line 10056 "BatchImport.c"
+	self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
+#line 10729 "BatchImport.c"
 }
 
 
-static void batch_import_finalize (GObject * obj) {
+static void
+batch_import_finalize (GObject * obj)
+{
 	BatchImport * self;
 	Application* _tmp0_;
 	Application* _tmp1_;
@@ -10104,11 +10779,13 @@ static void batch_import_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->ready_sources);
 #line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj);
-#line 10101 "BatchImport.c"
+#line 10776 "BatchImport.c"
 }
 
 
-GType batch_import_get_type (void) {
+GType
+batch_import_get_type (void)
+{
 	static volatile gsize batch_import_type_id__volatile = 0;
 	if (g_once_init_enter (&batch_import_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BatchImportClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) batch_import_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BatchImport), 0, (GInstanceInitFunc) batch_import_instance_init, NULL };
@@ -10120,7 +10797,9 @@ GType batch_import_get_type (void) {
 }
 
 
-static DuplicatedFile* duplicated_file_construct (GType object_type) {
+static DuplicatedFile*
+duplicated_file_construct (GType object_type)
+{
 	DuplicatedFile * self = NULL;
 #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (DuplicatedFile*) g_object_new (object_type, NULL);
@@ -10138,103 +10817,108 @@ static DuplicatedFile* duplicated_file_construct (GType object_type) {
 	self->priv->file = NULL;
 #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10135 "BatchImport.c"
+#line 10814 "BatchImport.c"
 }
 
 
-static DuplicatedFile* duplicated_file_new (void) {
+static DuplicatedFile*
+duplicated_file_new (void)
+{
 #line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return duplicated_file_construct (TYPE_DUPLICATED_FILE);
-#line 10142 "BatchImport.c"
+#line 10823 "BatchImport.c"
 }
 
 
-static gpointer _photo_id_dup0 (gpointer self) {
+static gpointer
+_photo_id_dup0 (gpointer self)
+{
 #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_id_dup (self) : NULL;
-#line 10149 "BatchImport.c"
+#line 10832 "BatchImport.c"
 }
 
 
-DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) {
+DuplicatedFile*
+duplicated_file_create_from_photo_id (PhotoID* photo_id)
+{
 	DuplicatedFile* result = NULL;
-	gboolean _tmp0_;
 	DuplicatedFile* _result_ = NULL;
-	DuplicatedFile* _tmp1_;
-	PhotoID _tmp2_;
-	PhotoID* _tmp3_;
+	DuplicatedFile* _tmp0_;
+	PhotoID _tmp1_;
+	PhotoID* _tmp2_;
 #line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
 #line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = photo_id_is_valid (photo_id);
-#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp0_, "photo_id.is_valid()");
+	_vala_assert (photo_id_is_valid (photo_id), "photo_id.is_valid()");
 #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = duplicated_file_new ();
+	_tmp0_ = duplicated_file_new ();
 #line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_ = _tmp1_;
+	_result_ = _tmp0_;
 #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = *photo_id;
+	_tmp1_ = *photo_id;
 #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _photo_id_dup0 (&_tmp2_);
+	_tmp2_ = _photo_id_dup0 (&_tmp1_);
 #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (_result_->priv->photo_id);
 #line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_->priv->photo_id = _tmp3_;
+	_result_->priv->photo_id = _tmp2_;
 #line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
 #line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10182 "BatchImport.c"
+#line 10864 "BatchImport.c"
 }
 
 
-static gpointer _video_id_dup0 (gpointer self) {
+static gpointer
+_video_id_dup0 (gpointer self)
+{
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_id_dup (self) : NULL;
-#line 10189 "BatchImport.c"
+#line 10873 "BatchImport.c"
 }
 
 
-DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) {
+DuplicatedFile*
+duplicated_file_create_from_video_id (VideoID* video_id)
+{
 	DuplicatedFile* result = NULL;
-	gboolean _tmp0_;
 	DuplicatedFile* _result_ = NULL;
-	DuplicatedFile* _tmp1_;
-	VideoID _tmp2_;
-	VideoID* _tmp3_;
+	DuplicatedFile* _tmp0_;
+	VideoID _tmp1_;
+	VideoID* _tmp2_;
 #line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
 #line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = video_id_is_valid (video_id);
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp0_, "video_id.is_valid()");
+	_vala_assert (video_id_is_valid (video_id), "video_id.is_valid()");
 #line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = duplicated_file_new ();
+	_tmp0_ = duplicated_file_new ();
 #line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_ = _tmp1_;
+	_result_ = _tmp0_;
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = *video_id;
+	_tmp1_ = *video_id;
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _video_id_dup0 (&_tmp2_);
+	_tmp2_ = _video_id_dup0 (&_tmp1_);
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (_result_->priv->video_id);
 #line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_->priv->video_id = _tmp3_;
+	_result_->priv->video_id = _tmp2_;
 #line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
 #line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10222 "BatchImport.c"
+#line 10905 "BatchImport.c"
 }
 
 
-DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
+DuplicatedFile*
+duplicated_file_create_from_file (GFile* file)
+{
 	DuplicatedFile* result = NULL;
 	DuplicatedFile* _result_ = NULL;
 	DuplicatedFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
 #line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10242,22 +10926,22 @@ DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
 #line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp0_;
 #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = file;
-#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp1_ = _g_object_ref0 (file);
 #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_result_->priv->file);
 #line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_->priv->file = _tmp2_;
+	_result_->priv->file = _tmp1_;
 #line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
 #line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10250 "BatchImport.c"
+#line 10932 "BatchImport.c"
 }
 
 
-GFile* duplicated_file_get_file (DuplicatedFile* self) {
+GFile*
+duplicated_file_get_file (DuplicatedFile* self)
+{
 	GFile* result = NULL;
 	GFile* _tmp0_;
 #line 1338 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10266,7 +10950,7 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 	_tmp0_ = self->priv->file;
 #line 1339 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 10263 "BatchImport.c"
+#line 10947 "BatchImport.c"
 		GFile* _tmp1_;
 		GFile* _tmp2_;
 #line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10277,14 +10961,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 		result = _tmp2_;
 #line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10274 "BatchImport.c"
+#line 10958 "BatchImport.c"
 	} else {
 		PhotoID* _tmp3_;
 #line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->photo_id;
 #line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 10281 "BatchImport.c"
+#line 10965 "BatchImport.c"
 			Photo* photo_object = NULL;
 			LibraryPhotoSourceCollection* _tmp4_;
 			PhotoID* _tmp5_;
@@ -10322,14 +11006,14 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 			_g_object_unref0 (photo_object);
 #line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 10319 "BatchImport.c"
+#line 11003 "BatchImport.c"
 		} else {
 			VideoID* _tmp12_;
 #line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->priv->video_id;
 #line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp12_ != NULL) {
-#line 10326 "BatchImport.c"
+#line 11010 "BatchImport.c"
 				Video* video_object = NULL;
 				VideoSourceCollection* _tmp13_;
 				VideoID* _tmp14_;
@@ -10367,36 +11051,42 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 				_g_object_unref0 (video_object);
 #line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 10364 "BatchImport.c"
+#line 11048 "BatchImport.c"
 			} else {
 #line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_assert_not_reached ();
-#line 10368 "BatchImport.c"
+#line 11052 "BatchImport.c"
 			}
 		}
 	}
 }
 
 
-static void duplicated_file_class_init (DuplicatedFileClass * klass) {
+static void
+duplicated_file_class_init (DuplicatedFileClass * klass)
+{
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	duplicated_file_parent_class = g_type_class_peek_parent (klass);
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate));
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize;
-#line 10382 "BatchImport.c"
+#line 11068 "BatchImport.c"
 }
 
 
-static void duplicated_file_instance_init (DuplicatedFile * self) {
+static void
+duplicated_file_instance_init (DuplicatedFile * self)
+{
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = DUPLICATED_FILE_GET_PRIVATE (self);
-#line 10389 "BatchImport.c"
+#line 11077 "BatchImport.c"
 }
 
 
-static void duplicated_file_finalize (GObject * obj) {
+static void
+duplicated_file_finalize (GObject * obj)
+{
 	DuplicatedFile * self;
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATED_FILE, DuplicatedFile);
@@ -10408,11 +11098,13 @@ static void duplicated_file_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->file);
 #line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj);
-#line 10405 "BatchImport.c"
+#line 11095 "BatchImport.c"
 }
 
 
-GType duplicated_file_get_type (void) {
+GType
+duplicated_file_get_type (void)
+{
 	static volatile gsize duplicated_file_type_id__volatile = 0;
 	if (g_once_init_enter (&duplicated_file_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DuplicatedFileClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) duplicated_file_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DuplicatedFile), 0, (GInstanceInitFunc) duplicated_file_instance_init, NULL };
@@ -10424,78 +11116,69 @@ GType duplicated_file_get_type (void) {
 }
 
 
-BackgroundImportJob* background_import_job_construct (GType object_type, BatchImport* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
+BackgroundImportJob*
+background_import_job_construct (GType object_type,
+                                 BatchImport* owner,
+                                 CompletionCallback callback,
+                                 void* callback_target,
+                                 GCancellable* cancellable,
+                                 CancellationCallback cancellation,
+                                 void* cancellation_target)
+{
 	BackgroundImportJob* self = NULL;
-	BatchImport* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	CancellationCallback _tmp3_;
-	void* _tmp3__target;
 #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
 #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = owner;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = callback;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1__target = callback_target;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = cancellable;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cancellation;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3__target = cancellation_target;
-#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
+	self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, cancellable, cancellation, cancellation_target, NULL);
 #line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10449 "BatchImport.c"
+#line 11131 "BatchImport.c"
 }
 
 
-ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
+ImportResult
+background_import_job_abort_check (BackgroundImportJob* self)
+{
 	ImportResult result = 0;
 	gboolean _tmp0_ = FALSE;
 	ImportResult _tmp1_;
-	ImportResult _tmp3_;
+	ImportResult _tmp2_;
 #line 1384 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (self), 0);
 #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->abort_flag;
 #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ == IMPORT_RESULT_SUCCESS) {
-#line 10464 "BatchImport.c"
-		gboolean _tmp2_;
 #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp2_;
-#line 10470 "BatchImport.c"
+		_tmp0_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+#line 11150 "BatchImport.c"
 	} else {
 #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 10474 "BatchImport.c"
+#line 11154 "BatchImport.c"
 	}
 #line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
 #line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = IMPORT_RESULT_USER_ABORT;
-#line 10480 "BatchImport.c"
+#line 11160 "BatchImport.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = self->abort_flag;
+	_tmp2_ = self->abort_flag;
 #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10488 "BatchImport.c"
+#line 11168 "BatchImport.c"
 }
 
 
-void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_) {
+void
+background_import_job_abort (BackgroundImportJob* self,
+                             ImportResult _result_)
+{
 	ImportResult _tmp0_;
 #line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
@@ -10503,29 +11186,24 @@ void background_import_job_abort (BackgroundImportJob* self, ImportResult _resul
 	_tmp0_ = self->abort_flag;
 #line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ == IMPORT_RESULT_SUCCESS) {
-#line 10500 "BatchImport.c"
-		ImportResult _tmp1_;
 #line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp1_ = _result_;
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->abort_flag = _tmp1_;
-#line 10506 "BatchImport.c"
+		self->abort_flag = _result_;
+#line 11185 "BatchImport.c"
 	}
 }
 
 
-void background_import_job_report_failure (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, ImportResult _result_) {
-	ImportResult _tmp0_;
-	ImportResult _tmp1_;
-	gboolean _tmp2_;
-	GeeList* _tmp8_;
-	BatchImportJob* _tmp9_;
-	GFile* _tmp10_;
-	const gchar* _tmp11_;
-	const gchar* _tmp12_;
-	ImportResult _tmp13_;
-	BatchImportResult* _tmp14_;
-	BatchImportResult* _tmp15_;
+void
+background_import_job_report_failure (BackgroundImportJob* self,
+                                      BatchImportJob* job,
+                                      GFile* file,
+                                      const gchar* src_identifier,
+                                      const gchar* dest_identifier,
+                                      ImportResult _result_)
+{
+	GeeList* _tmp2_;
+	BatchImportResult* _tmp3_;
+	BatchImportResult* _tmp4_;
 #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
 #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10537,87 +11215,57 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
 #line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
 #line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = _result_;
-#line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp0_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS");
-#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _result_;
-#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = import_result_is_abort (_tmp1_);
+	_vala_assert (_result_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS");
 #line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp2_) {
-#line 10543 "BatchImport.c"
-		ImportResult _tmp3_;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = _result_;
+	if (import_result_is_abort (_result_)) {
 #line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		background_import_job_abort (self, _tmp3_);
-#line 10549 "BatchImport.c"
+		background_import_job_abort (self, _result_);
+#line 11217 "BatchImport.c"
 	} else {
-		const gchar* _tmp4_;
-		ImportResult _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
+		gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = src_identifier;
+		_tmp0_ = import_result_to_string (_result_);
 #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = _result_;
-#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = import_result_to_string (_tmp5_);
+		_tmp1_ = _tmp0_;
 #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = _tmp6_;
+		g_warning ("BatchImport.vala:1405: Import failure %s: %s", src_identifier, _tmp1_);
 #line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1405: Import failure %s: %s", _tmp4_, _tmp7_);
-#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp7_);
-#line 10567 "BatchImport.c"
+		_g_free0 (_tmp1_);
+#line 11229 "BatchImport.c"
 	}
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = self->failed;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = job;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = file;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = src_identifier;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = dest_identifier;
-#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _result_;
+	_tmp2_ = self->failed;
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = batch_import_result_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, NULL, _tmp13_);
+	_tmp3_ = batch_import_result_new (job, file, src_identifier, dest_identifier, NULL, _result_);
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = _tmp14_;
+	_tmp4_ = _tmp3_;
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_);
 #line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_batch_import_result_unref0 (_tmp15_);
-#line 10589 "BatchImport.c"
+	_batch_import_result_unref0 (_tmp4_);
+#line 11241 "BatchImport.c"
 }
 
 
-void background_import_job_report_error (BackgroundImportJob* self, BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
+void
+background_import_job_report_error (BackgroundImportJob* self,
+                                    BatchImportJob* job,
+                                    GFile* file,
+                                    const gchar* src_identifier,
+                                    const gchar* dest_identifier,
+                                    GError* err,
+                                    ImportResult default_result)
+{
 	ImportResult _result_ = 0;
-	GError* _tmp0_;
+	const gchar* _tmp0_;
 	ImportResult _tmp1_;
-	ImportResult _tmp2_;
-	const gchar* _tmp3_;
-	GError* _tmp4_;
-	const gchar* _tmp5_;
-	ImportResult _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	ImportResult _tmp9_;
-	gboolean _tmp10_;
-	GeeList* _tmp12_;
-	BatchImportJob* _tmp13_;
-	GFile* _tmp14_;
-	const gchar* _tmp15_;
-	const gchar* _tmp16_;
-	GError* _tmp17_;
-	ImportResult _tmp18_;
-	BatchImportResult* _tmp19_;
-	BatchImportResult* _tmp20_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	ImportResult _tmp4_;
+	GeeList* _tmp6_;
+	BatchImportResult* _tmp7_;
+	BatchImportResult* _tmp8_;
 #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
 #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10629,79 +11277,59 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
 #line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
 #line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = err;
-#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = default_result;
-#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = import_result_convert_error (_tmp0_, _tmp1_);
-#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_result_ = _tmp2_;
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = src_identifier;
+	_result_ = import_result_convert_error (err, default_result);
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = err;
+	_tmp0_ = err->message;
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _tmp4_->message;
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = _result_;
+	_tmp1_ = _result_;
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = import_result_to_string (_tmp6_);
+	_tmp2_ = import_result_to_string (_tmp1_);
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = _tmp7_;
+	_tmp3_ = _tmp2_;
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_warning ("BatchImport.vala:1415: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_);
+	g_warning ("BatchImport.vala:1415: Import error %s: %s (%s)", src_identifier, _tmp0_, _tmp3_);
 #line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp8_);
+	_g_free0 (_tmp3_);
 #line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = _result_;
+	_tmp4_ = _result_;
 #line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = import_result_is_abort (_tmp9_);
-#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp10_) {
-#line 10655 "BatchImport.c"
-		ImportResult _tmp11_;
+	if (import_result_is_abort (_tmp4_)) {
+#line 11291 "BatchImport.c"
+		ImportResult _tmp5_;
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = _result_;
+		_tmp5_ = _result_;
 #line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		background_import_job_abort (self, _tmp11_);
-#line 10661 "BatchImport.c"
+		background_import_job_abort (self, _tmp5_);
+#line 11297 "BatchImport.c"
 	}
 #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = self->failed;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = job;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = file;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = src_identifier;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp16_ = dest_identifier;
+	_tmp6_ = self->failed;
 #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp17_ = err;
+	_tmp7_ = batch_import_result_new_from_error (job, file, src_identifier, dest_identifier, err, default_result);
 #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = default_result;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = batch_import_result_new_from_error (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_, _tmp18_);
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp20_ = _tmp19_;
+	_tmp8_ = _tmp7_;
 #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
 #line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_batch_import_result_unref0 (_tmp20_);
-#line 10685 "BatchImport.c"
+	_batch_import_result_unref0 (_tmp8_);
+#line 11309 "BatchImport.c"
 }
 
 
-static void background_import_job_class_init (BackgroundImportJobClass * klass) {
+static void
+background_import_job_class_init (BackgroundImportJobClass * klass)
+{
 #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = background_import_job_finalize;
-#line 10694 "BatchImport.c"
+#line 11320 "BatchImport.c"
 }
 
 
-static void background_import_job_instance_init (BackgroundImportJob * self) {
+static void
+background_import_job_instance_init (BackgroundImportJob * self)
+{
 	GeeArrayList* _tmp0_;
 #line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->abort_flag = IMPORT_RESULT_SUCCESS;
@@ -10709,11 +11337,13 @@ static void background_import_job_instance_init (BackgroundImportJob * self) {
 	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
 #line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 10706 "BatchImport.c"
+#line 11334 "BatchImport.c"
 }
 
 
-static void background_import_job_finalize (BackgroundJob * obj) {
+static void
+background_import_job_finalize (BackgroundJob * obj)
+{
 	BackgroundImportJob * self;
 #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob);
@@ -10721,11 +11351,13 @@ static void background_import_job_finalize (BackgroundJob * obj) {
 	_g_object_unref0 (self->failed);
 #line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj);
-#line 10718 "BatchImport.c"
+#line 11348 "BatchImport.c"
 }
 
 
-GType background_import_job_get_type (void) {
+GType
+background_import_job_get_type (void)
+{
 	static volatile gsize background_import_job_type_id__volatile = 0;
 	if (g_once_init_enter (&background_import_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (BackgroundImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) background_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (BackgroundImportJob), 0, (GInstanceInitFunc) background_import_job_instance_init, NULL };
@@ -10737,13 +11369,15 @@ GType background_import_job_get_type (void) {
 }
 
 
-FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job, GFile* file, gboolean copy_to_library) {
+FileToPrepare*
+file_to_prepare_construct (GType object_type,
+                           BatchImportJob* job,
+                           GFile* file,
+                           gboolean copy_to_library)
+{
 	FileToPrepare* self = NULL;
 	BatchImportJob* _tmp0_;
-	BatchImportJob* _tmp1_;
-	GFile* _tmp2_;
-	GFile* _tmp3_;
-	gboolean _tmp4_;
+	GFile* _tmp1_;
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10751,65 +11385,67 @@ FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (FileToPrepare*) g_type_create_instance (object_type);
 #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = job;
-#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
+	_tmp0_ = _batch_import_job_ref0 (job);
 #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
 #line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->job = _tmp1_;
+	self->job = _tmp0_;
 #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = file;
-#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (file);
 #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
 #line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->file = _tmp3_;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = copy_to_library;
+	self->file = _tmp1_;
 #line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->copy_to_library = _tmp4_;
+	self->copy_to_library = copy_to_library;
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10769 "BatchImport.c"
+#line 11397 "BatchImport.c"
 }
 
 
-FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) {
+FileToPrepare*
+file_to_prepare_new (BatchImportJob* job,
+                     GFile* file,
+                     gboolean copy_to_library)
+{
 #line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library);
-#line 10776 "BatchImport.c"
+#line 11408 "BatchImport.c"
 }
 
 
-static gpointer _file_to_prepare_ref0 (gpointer self) {
+static gpointer
+_file_to_prepare_ref0 (gpointer self)
+{
 #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? file_to_prepare_ref (self) : NULL;
-#line 10783 "BatchImport.c"
+#line 11417 "BatchImport.c"
 }
 
 
-void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) {
+void
+file_to_prepare_set_associated (FileToPrepare* self,
+                                FileToPrepare* a)
+{
 	FileToPrepare* _tmp0_;
-	FileToPrepare* _tmp1_;
 #line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_FILE_TO_PREPARE (self));
 #line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((a == NULL) || IS_FILE_TO_PREPARE (a));
 #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = a;
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _file_to_prepare_ref0 (_tmp0_);
+	_tmp0_ = _file_to_prepare_ref0 (a);
 #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
 #line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->associated = _tmp1_;
-#line 10802 "BatchImport.c"
+	self->associated = _tmp0_;
+#line 11436 "BatchImport.c"
 }
 
 
-gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
+gchar*
+file_to_prepare_get_parent_path (FileToPrepare* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
@@ -10819,7 +11455,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10816 "BatchImport.c"
+#line 11452 "BatchImport.c"
 		GFile* _tmp2_;
 		GFile* _tmp3_;
 		GFile* _tmp4_;
@@ -10838,7 +11474,7 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 		_tmp0_ = _tmp5_;
 #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp4_);
-#line 10835 "BatchImport.c"
+#line 11471 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp6_;
 		gchar* _tmp7_;
@@ -10850,17 +11486,19 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp7_;
-#line 10847 "BatchImport.c"
+#line 11483 "BatchImport.c"
 	}
 #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10853 "BatchImport.c"
+#line 11489 "BatchImport.c"
 }
 
 
-gchar* file_to_prepare_get_path (FileToPrepare* self) {
+gchar*
+file_to_prepare_get_path (FileToPrepare* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
@@ -10870,7 +11508,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10867 "BatchImport.c"
+#line 11505 "BatchImport.c"
 		GFile* _tmp2_;
 		gchar* _tmp3_;
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10881,7 +11519,7 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 10878 "BatchImport.c"
+#line 11516 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_;
 		gchar* _tmp5_;
@@ -10928,17 +11566,19 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 		_g_object_unref0 (_tmp8_);
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp6_);
-#line 10925 "BatchImport.c"
+#line 11563 "BatchImport.c"
 	}
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10931 "BatchImport.c"
+#line 11569 "BatchImport.c"
 }
 
 
-gchar* file_to_prepare_get_basename (FileToPrepare* self) {
+gchar*
+file_to_prepare_get_basename (FileToPrepare* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
@@ -10948,7 +11588,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10945 "BatchImport.c"
+#line 11585 "BatchImport.c"
 		GFile* _tmp2_;
 		gchar* _tmp3_;
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -10959,7 +11599,7 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 10956 "BatchImport.c"
+#line 11596 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_;
 		gchar* _tmp5_;
@@ -10971,17 +11611,19 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 		_g_free0 (_tmp0_);
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 10968 "BatchImport.c"
+#line 11608 "BatchImport.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10974 "BatchImport.c"
+#line 11614 "BatchImport.c"
 }
 
 
-gboolean file_to_prepare_is_directory (FileToPrepare* self) {
+gboolean
+file_to_prepare_is_directory (FileToPrepare* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
@@ -10991,133 +11633,152 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 	_tmp1_ = self->file;
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10988 "BatchImport.c"
+#line 11630 "BatchImport.c"
 		GFile* _tmp2_;
-		GFileType _tmp3_;
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY;
-#line 10997 "BatchImport.c"
+		_tmp0_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL) == G_FILE_TYPE_DIRECTORY;
+#line 11636 "BatchImport.c"
 	} else {
-		BatchImportJob* _tmp4_;
-		gboolean _tmp5_;
-#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = self->job;
+		BatchImportJob* _tmp3_;
 #line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = batch_import_job_is_directory (_tmp4_);
+		_tmp3_ = self->job;
 #line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp5_;
-#line 11007 "BatchImport.c"
+		_tmp0_ = batch_import_job_is_directory (_tmp3_);
+#line 11643 "BatchImport.c"
 	}
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
 #line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11013 "BatchImport.c"
+#line 11649 "BatchImport.c"
 }
 
 
-static void value_file_to_prepare_init (GValue* value) {
+static void
+value_file_to_prepare_init (GValue* value)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 11020 "BatchImport.c"
+#line 11658 "BatchImport.c"
 }
 
 
-static void value_file_to_prepare_free_value (GValue* value) {
+static void
+value_file_to_prepare_free_value (GValue* value)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (value->data[0].v_pointer);
-#line 11029 "BatchImport.c"
+#line 11669 "BatchImport.c"
 	}
 }
 
 
-static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_file_to_prepare_copy_value (const GValue* src_value,
+                                  GValue* dest_value)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer);
-#line 11039 "BatchImport.c"
+#line 11682 "BatchImport.c"
 	} else {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11043 "BatchImport.c"
+#line 11686 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_file_to_prepare_peek_pointer (const GValue* value) {
+static gpointer
+value_file_to_prepare_peek_pointer (const GValue* value)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11051 "BatchImport.c"
+#line 11696 "BatchImport.c"
 }
 
 
-static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_file_to_prepare_collect_value (GValue* value,
+                                     guint n_collect_values,
+                                     GTypeCValue* collect_values,
+                                     guint collect_flags)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 11058 "BatchImport.c"
+#line 11708 "BatchImport.c"
 		FileToPrepare * object;
 		object = collect_values[0].v_pointer;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11065 "BatchImport.c"
+#line 11715 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.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 11069 "BatchImport.c"
+#line 11719 "BatchImport.c"
 		}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = file_to_prepare_ref (object);
-#line 11073 "BatchImport.c"
+#line 11723 "BatchImport.c"
 	} else {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11077 "BatchImport.c"
+#line 11727 "BatchImport.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11081 "BatchImport.c"
+#line 11731 "BatchImport.c"
 }
 
 
-static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_file_to_prepare_lcopy_value (const GValue* value,
+                                   guint n_collect_values,
+                                   GTypeCValue* collect_values,
+                                   guint collect_flags)
+{
 	FileToPrepare ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11092 "BatchImport.c"
+#line 11747 "BatchImport.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 11098 "BatchImport.c"
+#line 11753 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11102 "BatchImport.c"
+#line 11757 "BatchImport.c"
 	} else {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = file_to_prepare_ref (value->data[0].v_pointer);
-#line 11106 "BatchImport.c"
+#line 11761 "BatchImport.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11110 "BatchImport.c"
+#line 11765 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_file_to_prepare (const gchar* name,
+                            const gchar* nick,
+                            const gchar* blurb,
+                            GType object_type,
+                            GParamFlags flags)
+{
 	ParamSpecFileToPrepare* spec;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_FILE_TO_PREPARE), NULL);
@@ -11127,20 +11788,25 @@ GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 11124 "BatchImport.c"
+#line 11785 "BatchImport.c"
 }
 
 
-gpointer value_get_file_to_prepare (const GValue* value) {
+gpointer
+value_get_file_to_prepare (const GValue* value)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL);
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11133 "BatchImport.c"
+#line 11796 "BatchImport.c"
 }
 
 
-void value_set_file_to_prepare (GValue* value, gpointer v_object) {
+void
+value_set_file_to_prepare (GValue* value,
+                           gpointer v_object)
+{
 	FileToPrepare * old;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
@@ -11156,22 +11822,25 @@ void value_set_file_to_prepare (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_ref (value->data[0].v_pointer);
-#line 11153 "BatchImport.c"
+#line 11819 "BatchImport.c"
 	} else {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11157 "BatchImport.c"
+#line 11823 "BatchImport.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11163 "BatchImport.c"
+#line 11829 "BatchImport.c"
 	}
 }
 
 
-void value_take_file_to_prepare (GValue* value, gpointer v_object) {
+void
+value_take_file_to_prepare (GValue* value,
+                            gpointer v_object)
+{
 	FileToPrepare * old;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
@@ -11185,40 +11854,46 @@ void value_take_file_to_prepare (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 11182 "BatchImport.c"
+#line 11851 "BatchImport.c"
 	} else {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11186 "BatchImport.c"
+#line 11855 "BatchImport.c"
 	}
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11192 "BatchImport.c"
+#line 11861 "BatchImport.c"
 	}
 }
 
 
-static void file_to_prepare_class_init (FileToPrepareClass * klass) {
+static void
+file_to_prepare_class_init (FileToPrepareClass * klass)
+{
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_to_prepare_parent_class = g_type_class_peek_parent (klass);
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize;
-#line 11202 "BatchImport.c"
+#line 11873 "BatchImport.c"
 }
 
 
-static void file_to_prepare_instance_init (FileToPrepare * self) {
+static void
+file_to_prepare_instance_init (FileToPrepare * self)
+{
 #line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = NULL;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 11211 "BatchImport.c"
+#line 11884 "BatchImport.c"
 }
 
 
-static void file_to_prepare_finalize (FileToPrepare * obj) {
+static void
+file_to_prepare_finalize (FileToPrepare * obj)
+{
 	FileToPrepare * self;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_TO_PREPARE, FileToPrepare);
@@ -11230,11 +11905,13 @@ static void file_to_prepare_finalize (FileToPrepare * obj) {
 	_g_object_unref0 (self->file);
 #line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 11227 "BatchImport.c"
+#line 11902 "BatchImport.c"
 }
 
 
-GType file_to_prepare_get_type (void) {
+GType
+file_to_prepare_get_type (void)
+{
 	static volatile gsize file_to_prepare_type_id__volatile = 0;
 	if (g_once_init_enter (&file_to_prepare_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_file_to_prepare_init, value_file_to_prepare_free_value, value_file_to_prepare_copy_value, value_file_to_prepare_peek_pointer, "p", value_file_to_prepare_collect_value, "p", value_file_to_prepare_lcopy_value };
@@ -11248,18 +11925,22 @@ GType file_to_prepare_get_type (void) {
 }
 
 
-gpointer file_to_prepare_ref (gpointer instance) {
+gpointer
+file_to_prepare_ref (gpointer instance)
+{
 	FileToPrepare * self;
 	self = instance;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 11252 "BatchImport.c"
+#line 11931 "BatchImport.c"
 }
 
 
-void file_to_prepare_unref (gpointer instance) {
+void
+file_to_prepare_unref (gpointer instance)
+{
 	FileToPrepare * self;
 	self = instance;
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11268,23 +11949,25 @@ void file_to_prepare_unref (gpointer instance) {
 		FILE_TO_PREPARE_GET_CLASS (self)->finalize (self);
 #line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11265 "BatchImport.c"
+#line 11946 "BatchImport.c"
 	}
 }
 
 
-WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
+WorkSniffer*
+work_sniffer_construct (GType object_type,
+                        BatchImport* owner,
+                        GeeIterable* jobs,
+                        CompletionCallback callback,
+                        void* callback_target,
+                        GCancellable* cancellable,
+                        CancellationCallback cancellation,
+                        void* cancellation_target,
+                        GeeHashSet* skipset)
+{
 	WorkSniffer* self = NULL;
-	BatchImport* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	CancellationCallback _tmp3_;
-	void* _tmp3__target;
-	GeeIterable* _tmp4_;
-	GeeIterable* _tmp5_;
-	GeeHashSet* _tmp6_;
-	GeeHashSet* _tmp7_;
+	GeeIterable* _tmp0_;
+	GeeHashSet* _tmp1_;
 #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
 #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11294,89 +11977,77 @@ WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeI
 #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((skipset == NULL) || GEE_IS_HASH_SET (skipset), NULL);
 #line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = owner;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = callback;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1__target = callback_target;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = cancellable;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cancellation;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3__target = cancellation_target;
-#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self = (WorkSniffer*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = jobs;
+	self = (WorkSniffer*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancellation, cancellation_target);
 #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp0_ = _g_object_ref0 (jobs);
 #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
 #line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->jobs = _tmp5_;
+	self->priv->jobs = _tmp0_;
 #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = skipset;
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _g_object_ref0 (_tmp6_);
+	_tmp1_ = _g_object_ref0 (skipset);
 #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
 #line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->skipset = _tmp7_;
+	self->priv->skipset = _tmp1_;
 #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11322 "BatchImport.c"
+#line 11989 "BatchImport.c"
 }
 
 
-WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
+WorkSniffer*
+work_sniffer_new (BatchImport* owner,
+                  GeeIterable* jobs,
+                  CompletionCallback callback,
+                  void* callback_target,
+                  GCancellable* cancellable,
+                  CancellationCallback cancellation,
+                  void* cancellation_target,
+                  GeeHashSet* skipset)
+{
 #line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset);
-#line 11329 "BatchImport.c"
+#line 12005 "BatchImport.c"
 }
 
 
-static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
+static gint
+__lambda11_ (WorkSniffer* self,
+             FileToPrepare* a,
+             FileToPrepare* b)
+{
 	gint result = 0;
 	FileToPrepare* file_a = NULL;
 	FileToPrepare* _tmp0_;
-	FileToPrepare* _tmp1_;
 	FileToPrepare* file_b = NULL;
-	FileToPrepare* _tmp2_;
-	FileToPrepare* _tmp3_;
+	FileToPrepare* _tmp1_;
 	gchar* sa = NULL;
-	gchar* _tmp4_;
+	gchar* _tmp2_;
 	gchar* sb = NULL;
-	gchar* _tmp5_;
-	gint _tmp6_;
+	gchar* _tmp3_;
 #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (a), 0);
 #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (b), 0);
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = a;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_FILE_TO_PREPARE, FileToPrepare));
+	_tmp0_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (a, TYPE_FILE_TO_PREPARE, FileToPrepare));
 #line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	file_a = _tmp1_;
+	file_a = _tmp0_;
 #line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = b;
+	_tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (b, TYPE_FILE_TO_PREPARE, FileToPrepare));
 #line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FILE_TO_PREPARE, FileToPrepare));
-#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	file_b = _tmp3_;
+	file_b = _tmp1_;
 #line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = file_to_prepare_get_path (file_a);
+	_tmp2_ = file_to_prepare_get_path (file_a);
 #line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	sa = _tmp4_;
+	sa = _tmp2_;
 #line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = file_to_prepare_get_path (file_b);
+	_tmp3_ = file_to_prepare_get_path (file_b);
 #line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	sb = _tmp5_;
-#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = utf8_cs_compare (sa, sb);
+	sb = _tmp3_;
 #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = _tmp6_;
+	result = utf8_cs_compare (sa, sb);
 #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (sb);
 #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11387,28 +12058,34 @@ static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
 	_file_to_prepare_unref0 (file_a);
 #line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11384 "BatchImport.c"
+#line 12055 "BatchImport.c"
 }
 
 
-static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+___lambda11__gcompare_data_func (gconstpointer a,
+                                 gconstpointer b,
+                                 gpointer self)
+{
 	gint result;
 	result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
 #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11393 "BatchImport.c"
+#line 12068 "BatchImport.c"
 }
 
 
-static void work_sniffer_real_execute (BackgroundJob* base) {
+static void
+work_sniffer_real_execute (BackgroundJob* base)
+{
 	WorkSniffer * self;
 	GeeList* sorted = NULL;
-	GeeArrayList* _tmp26_;
-	GeeList* _tmp42_;
+	GeeArrayList* _tmp23_;
+	GeeList* _tmp38_;
 	GError * _inner_error_ = NULL;
 #line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 11405 "BatchImport.c"
+#line 12082 "BatchImport.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeIterable* _tmp0_;
@@ -11421,86 +12098,79 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 		_job_it = _tmp1_;
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11418 "BatchImport.c"
+#line 12095 "BatchImport.c"
 			GeeIterator* _tmp2_;
-			gboolean _tmp3_;
 			BatchImportJob* job = NULL;
-			GeeIterator* _tmp4_;
-			gpointer _tmp5_;
+			GeeIterator* _tmp3_;
+			gpointer _tmp4_;
 			ImportResult _result_ = 0;
-			ImportResult _tmp6_;
-			ImportResult _tmp7_;
-			gboolean _tmp25_;
+			ImportResult _tmp5_;
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _job_it;
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!_tmp3_) {
+			if (!gee_iterator_next (_tmp2_)) {
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11436 "BatchImport.c"
+#line 12108 "BatchImport.c"
 			}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = _job_it;
+			_tmp3_ = _job_it;
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = gee_iterator_get (_tmp4_);
+			_tmp4_ = gee_iterator_get (_tmp3_);
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			job = (BatchImportJob*) _tmp5_;
-#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
+			job = (BatchImportJob*) _tmp4_;
 #line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_result_ = _tmp6_;
+			_result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
 #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp7_ = _result_;
+			_tmp5_ = _result_;
 #line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
-#line 11452 "BatchImport.c"
-				BatchImportJob* _tmp8_;
-				BatchImportJob* _tmp9_;
-				gchar* _tmp10_;
+			if (_tmp5_ != IMPORT_RESULT_SUCCESS) {
+#line 12122 "BatchImport.c"
+				BatchImportJob* _tmp6_;
+				BatchImportJob* _tmp7_;
+				gchar* _tmp8_;
+				gchar* _tmp9_;
+				BatchImportJob* _tmp10_;
 				gchar* _tmp11_;
-				BatchImportJob* _tmp12_;
-				gchar* _tmp13_;
-				gchar* _tmp14_;
-				ImportResult _tmp15_;
+				gchar* _tmp12_;
+				ImportResult _tmp13_;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp8_ = job;
+				_tmp6_ = job;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp9_ = job;
+				_tmp7_ = job;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp10_ = batch_import_job_get_source_identifier (_tmp9_);
+				_tmp8_ = batch_import_job_get_source_identifier (_tmp7_);
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = _tmp10_;
+				_tmp9_ = _tmp8_;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = job;
+				_tmp10_ = job;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp13_ = batch_import_job_get_dest_identifier (_tmp12_);
+				_tmp11_ = batch_import_job_get_dest_identifier (_tmp10_);
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp14_ = _tmp13_;
+				_tmp12_ = _tmp11_;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp15_ = _result_;
+				_tmp13_ = _result_;
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp8_, NULL, _tmp11_, _tmp14_, _tmp15_);
+				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp6_, NULL, _tmp9_, _tmp12_, _tmp13_);
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp14_);
+				_g_free0 (_tmp12_);
 #line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp11_);
+				_g_free0 (_tmp9_);
 #line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
 #line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 11487 "BatchImport.c"
+#line 12157 "BatchImport.c"
 			}
 			{
-				BatchImportJob* _tmp16_;
+				BatchImportJob* _tmp14_;
 #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp16_ = job;
+				_tmp14_ = job;
 #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				work_sniffer_sniff_job (self, _tmp16_, &_inner_error_);
+				work_sniffer_sniff_job (self, _tmp14_, &_inner_error_);
 #line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11497 "BatchImport.c"
+#line 12167 "BatchImport.c"
 					goto __catch426_g_error;
 				}
 			}
@@ -11508,43 +12178,43 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			__catch426_g_error:
 			{
 				GError* err = NULL;
-				BatchImportJob* _tmp17_;
-				BatchImportJob* _tmp18_;
-				gchar* _tmp19_;
+				BatchImportJob* _tmp15_;
+				BatchImportJob* _tmp16_;
+				gchar* _tmp17_;
+				gchar* _tmp18_;
+				BatchImportJob* _tmp19_;
 				gchar* _tmp20_;
-				BatchImportJob* _tmp21_;
-				gchar* _tmp22_;
-				gchar* _tmp23_;
-				GError* _tmp24_;
+				gchar* _tmp21_;
+				GError* _tmp22_;
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp17_ = job;
+				_tmp15_ = job;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = job;
+				_tmp16_ = job;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp19_ = batch_import_job_get_source_identifier (_tmp18_);
+				_tmp17_ = batch_import_job_get_source_identifier (_tmp16_);
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp20_ = _tmp19_;
+				_tmp18_ = _tmp17_;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp21_ = job;
+				_tmp19_ = job;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp22_ = batch_import_job_get_dest_identifier (_tmp21_);
+				_tmp20_ = batch_import_job_get_dest_identifier (_tmp19_);
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp23_ = _tmp22_;
+				_tmp21_ = _tmp20_;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp24_ = err;
+				_tmp22_ = err;
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp17_, NULL, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR);
+				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp15_, NULL, _tmp18_, _tmp21_, _tmp22_, IMPORT_RESULT_FILE_ERROR);
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp23_);
+				_g_free0 (_tmp21_);
 #line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp20_);
+				_g_free0 (_tmp18_);
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 11541 "BatchImport.c"
+#line 12211 "BatchImport.c"
 			}
 			__finally426:
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11559,212 +12229,203 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				g_clear_error (&_inner_error_);
 #line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 11556 "BatchImport.c"
+#line 12226 "BatchImport.c"
 			}
 #line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp25_) {
+			if (background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob))) {
 #line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
 #line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11566 "BatchImport.c"
+#line 12234 "BatchImport.c"
 			}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 11570 "BatchImport.c"
+#line 12238 "BatchImport.c"
 		}
 #line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_job_it);
-#line 11574 "BatchImport.c"
+#line 12242 "BatchImport.c"
 	}
 #line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
+	_tmp23_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
 #line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList);
-#line 11580 "BatchImport.c"
+	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_LIST, GeeList);
+#line 12248 "BatchImport.c"
 	{
 		GeeList* _ftp_list = NULL;
-		GeeList* _tmp27_;
-		GeeList* _tmp28_;
+		GeeList* _tmp24_;
+		GeeList* _tmp25_;
 		gint _ftp_size = 0;
-		GeeList* _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
+		GeeList* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
 		gint _ftp_index = 0;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = self->files_to_prepare;
+		_tmp24_ = self->files_to_prepare;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp28_ = _g_object_ref0 (_tmp27_);
+		_tmp25_ = _g_object_ref0 (_tmp24_);
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_ftp_list = _tmp28_;
+		_ftp_list = _tmp25_;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp29_ = _ftp_list;
+		_tmp26_ = _ftp_list;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = _tmp30_;
+		_tmp28_ = _tmp27_;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_ftp_size = _tmp31_;
+		_ftp_size = _tmp28_;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_index = -1;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11608 "BatchImport.c"
-			gint _tmp32_;
-			gint _tmp33_;
-			gint _tmp34_;
+#line 12276 "BatchImport.c"
+			gint _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
 			FileToPrepare* ftp = NULL;
-			GeeList* _tmp35_;
-			gint _tmp36_;
-			gpointer _tmp37_;
-			FileToPrepare* _tmp38_;
-			gboolean _tmp39_;
+			GeeList* _tmp32_;
+			gint _tmp33_;
+			gpointer _tmp34_;
+			FileToPrepare* _tmp35_;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp32_ = _ftp_index;
+			_tmp29_ = _ftp_index;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_ftp_index = _tmp32_ + 1;
+			_ftp_index = _tmp29_ + 1;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = _ftp_index;
+			_tmp30_ = _ftp_index;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = _ftp_size;
+			_tmp31_ = _ftp_size;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!(_tmp33_ < _tmp34_)) {
+			if (!(_tmp30_ < _tmp31_)) {
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11630 "BatchImport.c"
+#line 12297 "BatchImport.c"
 			}
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp35_ = _ftp_list;
+			_tmp32_ = _ftp_list;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp36_ = _ftp_index;
+			_tmp33_ = _ftp_index;
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp37_ = gee_list_get (_tmp35_, _tmp36_);
+			_tmp34_ = gee_list_get (_tmp32_, _tmp33_);
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			ftp = (FileToPrepare*) _tmp37_;
-#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp38_ = ftp;
+			ftp = (FileToPrepare*) _tmp34_;
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = file_to_prepare_is_directory (_tmp38_);
+			_tmp35_ = ftp;
 #line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!_tmp39_) {
-#line 11646 "BatchImport.c"
-				GeeList* _tmp40_;
-				FileToPrepare* _tmp41_;
+			if (!file_to_prepare_is_directory (_tmp35_)) {
+#line 12311 "BatchImport.c"
+				GeeList* _tmp36_;
+				FileToPrepare* _tmp37_;
 #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp40_ = sorted;
+				_tmp36_ = sorted;
 #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp41_ = ftp;
+				_tmp37_ = ftp;
 #line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 11655 "BatchImport.c"
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
+#line 12320 "BatchImport.c"
 			}
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (ftp);
-#line 11659 "BatchImport.c"
+#line 12324 "BatchImport.c"
 		}
 #line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_ftp_list);
-#line 11663 "BatchImport.c"
+#line 12328 "BatchImport.c"
 	}
 #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp42_ = sorted;
+	_tmp38_ = sorted;
 #line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
-#line 11669 "BatchImport.c"
+	gee_list_sort (_tmp38_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
+#line 12334 "BatchImport.c"
 	{
 		gint i = 0;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		i = 0;
-#line 11674 "BatchImport.c"
+#line 12339 "BatchImport.c"
 		{
-			gboolean _tmp43_ = FALSE;
+			gboolean _tmp39_ = FALSE;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = TRUE;
+			_tmp39_ = TRUE;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 11681 "BatchImport.c"
-				gint _tmp45_;
-				GeeList* _tmp46_;
-				gint _tmp47_;
-				gint _tmp48_;
+#line 12346 "BatchImport.c"
+				gint _tmp41_;
+				GeeList* _tmp42_;
+				gint _tmp43_;
+				gint _tmp44_;
 				gchar* name = NULL;
 				gchar* ext = NULL;
 				FileToPrepare* ftp = NULL;
-				GeeList* _tmp49_;
-				gint _tmp50_;
-				gpointer _tmp51_;
-				FileToPrepare* _tmp52_;
-				gchar* _tmp53_;
-				gchar* _tmp54_;
-				gchar* _tmp55_ = NULL;
-				gchar* _tmp56_ = NULL;
-				const gchar* _tmp57_;
-				gboolean _tmp58_;
-				RawFileFormatProperties* _tmp59_;
-				RawFileFormatProperties* _tmp60_;
-				const gchar* _tmp61_;
-				gboolean _tmp62_;
-				gboolean _tmp63_;
+				GeeList* _tmp45_;
+				gint _tmp46_;
+				gpointer _tmp47_;
+				FileToPrepare* _tmp48_;
+				gchar* _tmp49_;
+				gchar* _tmp50_;
+				gchar* _tmp51_ = NULL;
+				gchar* _tmp52_ = NULL;
+				const gchar* _tmp53_;
+				RawFileFormatProperties* _tmp54_;
+				RawFileFormatProperties* _tmp55_;
+				const gchar* _tmp56_;
+				gboolean _tmp57_;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!_tmp43_) {
-#line 11706 "BatchImport.c"
-					gint _tmp44_;
+				if (!_tmp39_) {
+#line 12369 "BatchImport.c"
+					gint _tmp40_;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp44_ = i;
+					_tmp40_ = i;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					i = _tmp44_ + 1;
-#line 11712 "BatchImport.c"
+					i = _tmp40_ + 1;
+#line 12375 "BatchImport.c"
 				}
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp43_ = FALSE;
+				_tmp39_ = FALSE;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp45_ = i;
+				_tmp41_ = i;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp46_ = sorted;
+				_tmp42_ = sorted;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp48_ = _tmp47_;
+				_tmp44_ = _tmp43_;
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp45_ < _tmp48_)) {
+				if (!(_tmp41_ < _tmp44_)) {
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 11728 "BatchImport.c"
+#line 12391 "BatchImport.c"
 				}
 #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp49_ = sorted;
+				_tmp45_ = sorted;
 #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp50_ = i;
+				_tmp46_ = i;
 #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp51_ = gee_list_get (_tmp49_, _tmp50_);
+				_tmp47_ = gee_list_get (_tmp45_, _tmp46_);
 #line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				ftp = (FileToPrepare*) _tmp51_;
+				ftp = (FileToPrepare*) _tmp47_;
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp52_ = ftp;
+				_tmp48_ = ftp;
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp53_ = file_to_prepare_get_basename (_tmp52_);
+				_tmp49_ = file_to_prepare_get_basename (_tmp48_);
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp54_ = _tmp53_;
+				_tmp50_ = _tmp49_;
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				disassemble_filename (_tmp54_, &_tmp55_, &_tmp56_);
+				disassemble_filename (_tmp50_, &_tmp51_, &_tmp52_);
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				name = _tmp55_;
+				name = _tmp51_;
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (ext);
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				ext = _tmp56_;
+				ext = _tmp52_;
 #line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp54_);
+				_g_free0 (_tmp50_);
 #line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp57_ = ext;
+				_tmp53_ = ext;
 #line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58_ = is_string_empty (_tmp57_);
-#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp58_) {
+				if (is_string_empty (_tmp53_)) {
 #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (ftp);
 #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11773,171 +12434,163 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 					_g_free0 (name);
 #line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 11770 "BatchImport.c"
+#line 12431 "BatchImport.c"
 				}
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = raw_file_format_properties_get_instance ();
-#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp60_ = _tmp59_;
+				_tmp54_ = raw_file_format_properties_get_instance ();
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp61_ = ext;
+				_tmp55_ = _tmp54_;
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp62_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp61_);
+				_tmp56_ = ext;
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = _tmp62_;
+				_tmp57_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp56_);
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_photo_file_format_properties_unref0 (_tmp60_);
+				_photo_file_format_properties_unref0 (_tmp55_);
 #line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp63_) {
-#line 11786 "BatchImport.c"
-					gboolean _tmp64_ = FALSE;
-					gint _tmp65_;
+				if (_tmp57_) {
+#line 12445 "BatchImport.c"
+					gboolean _tmp58_ = FALSE;
+					gint _tmp59_;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp65_ = i;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_tmp65_ > 0) {
-#line 11793 "BatchImport.c"
-						FileToPrepare* _tmp66_;
-						GeeList* _tmp67_;
-						gint _tmp68_;
-						gpointer _tmp69_;
-						FileToPrepare* _tmp70_;
-						gboolean _tmp71_;
+					_tmp59_ = i;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp66_ = ftp;
+					if (_tmp59_ > 0) {
+#line 12452 "BatchImport.c"
+						FileToPrepare* _tmp60_;
+						GeeList* _tmp61_;
+						gint _tmp62_;
+						gpointer _tmp63_;
+						FileToPrepare* _tmp64_;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp67_ = sorted;
+						_tmp60_ = ftp;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp68_ = i;
+						_tmp61_ = sorted;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp69_ = gee_list_get (_tmp67_, _tmp68_ - 1);
+						_tmp62_ = i;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp70_ = (FileToPrepare*) _tmp69_;
+						_tmp63_ = gee_list_get (_tmp61_, _tmp62_ - 1);
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp71_ = work_sniffer_is_paired (self, _tmp66_, _tmp70_);
+						_tmp64_ = (FileToPrepare*) _tmp63_;
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp64_ = _tmp71_;
+						_tmp58_ = work_sniffer_is_paired (self, _tmp60_, _tmp64_);
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_file_to_prepare_unref0 (_tmp70_);
-#line 11816 "BatchImport.c"
+						_file_to_prepare_unref0 (_tmp64_);
+#line 12472 "BatchImport.c"
 					} else {
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp64_ = FALSE;
-#line 11820 "BatchImport.c"
+						_tmp58_ = FALSE;
+#line 12476 "BatchImport.c"
 					}
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (_tmp64_) {
-#line 11824 "BatchImport.c"
+					if (_tmp58_) {
+#line 12480 "BatchImport.c"
 						FileToPrepare* associated_file = NULL;
-						GeeList* _tmp72_;
-						gint _tmp73_;
-						gpointer _tmp74_;
-						GeeList* _tmp75_;
-						FileToPrepare* _tmp76_;
-						FileToPrepare* _tmp77_;
-						FileToPrepare* _tmp78_;
+						GeeList* _tmp65_;
+						gint _tmp66_;
+						gpointer _tmp67_;
+						GeeList* _tmp68_;
+						FileToPrepare* _tmp69_;
+						FileToPrepare* _tmp70_;
+						FileToPrepare* _tmp71_;
 #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp72_ = sorted;
+						_tmp65_ = sorted;
 #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp73_ = i;
+						_tmp66_ = i;
 #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp74_ = gee_list_get (_tmp72_, _tmp73_ - 1);
+						_tmp67_ = gee_list_get (_tmp65_, _tmp66_ - 1);
 #line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						associated_file = (FileToPrepare*) _tmp74_;
+						associated_file = (FileToPrepare*) _tmp67_;
 #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp75_ = self->files_to_prepare;
+						_tmp68_ = self->files_to_prepare;
 #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp76_ = associated_file;
+						_tmp69_ = associated_file;
 #line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection), _tmp76_);
+						gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_);
 #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp77_ = ftp;
+						_tmp70_ = ftp;
 #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp78_ = associated_file;
+						_tmp71_ = associated_file;
 #line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						file_to_prepare_set_associated (_tmp77_, _tmp78_);
+						file_to_prepare_set_associated (_tmp70_, _tmp71_);
 #line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (associated_file);
-#line 11855 "BatchImport.c"
+#line 12511 "BatchImport.c"
 					} else {
-						gboolean _tmp79_ = FALSE;
-						gint _tmp80_;
-						GeeList* _tmp81_;
-						gint _tmp82_;
-						gint _tmp83_;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp80_ = i;
+						gboolean _tmp72_ = FALSE;
+						gint _tmp73_;
+						GeeList* _tmp74_;
+						gint _tmp75_;
+						gint _tmp76_;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp81_ = sorted;
+						_tmp73_ = i;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp74_ = sorted;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						_tmp83_ = _tmp82_;
+						_tmp75_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_tmp80_ < (_tmp83_ - 1)) {
-#line 11872 "BatchImport.c"
-							FileToPrepare* _tmp84_;
-							GeeList* _tmp85_;
-							gint _tmp86_;
-							gpointer _tmp87_;
-							FileToPrepare* _tmp88_;
-							gboolean _tmp89_;
+						_tmp76_ = _tmp75_;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp84_ = ftp;
+						if (_tmp73_ < (_tmp76_ - 1)) {
+#line 12528 "BatchImport.c"
+							FileToPrepare* _tmp77_;
+							GeeList* _tmp78_;
+							gint _tmp79_;
+							gpointer _tmp80_;
+							FileToPrepare* _tmp81_;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp85_ = sorted;
+							_tmp77_ = ftp;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp86_ = i;
+							_tmp78_ = sorted;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp87_ = gee_list_get (_tmp85_, _tmp86_ + 1);
+							_tmp79_ = i;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp88_ = (FileToPrepare*) _tmp87_;
+							_tmp80_ = gee_list_get (_tmp78_, _tmp79_ + 1);
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp89_ = work_sniffer_is_paired (self, _tmp84_, _tmp88_);
+							_tmp81_ = (FileToPrepare*) _tmp80_;
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp79_ = _tmp89_;
+							_tmp72_ = work_sniffer_is_paired (self, _tmp77_, _tmp81_);
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_file_to_prepare_unref0 (_tmp88_);
-#line 11895 "BatchImport.c"
+							_file_to_prepare_unref0 (_tmp81_);
+#line 12548 "BatchImport.c"
 						} else {
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp79_ = FALSE;
-#line 11899 "BatchImport.c"
+							_tmp72_ = FALSE;
+#line 12552 "BatchImport.c"
 						}
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						if (_tmp79_) {
-#line 11903 "BatchImport.c"
+						if (_tmp72_) {
+#line 12556 "BatchImport.c"
 							FileToPrepare* associated_file = NULL;
-							GeeList* _tmp90_;
-							gint _tmp91_;
-							gpointer _tmp92_;
-							GeeList* _tmp93_;
-							FileToPrepare* _tmp94_;
-							FileToPrepare* _tmp95_;
-							FileToPrepare* _tmp96_;
+							GeeList* _tmp82_;
+							gint _tmp83_;
+							gpointer _tmp84_;
+							GeeList* _tmp85_;
+							FileToPrepare* _tmp86_;
+							FileToPrepare* _tmp87_;
+							FileToPrepare* _tmp88_;
 #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp90_ = sorted;
+							_tmp82_ = sorted;
 #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp91_ = i;
+							_tmp83_ = i;
 #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp92_ = gee_list_get (_tmp90_, _tmp91_ + 1);
+							_tmp84_ = gee_list_get (_tmp82_, _tmp83_ + 1);
 #line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							associated_file = (FileToPrepare*) _tmp92_;
+							associated_file = (FileToPrepare*) _tmp84_;
 #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp93_ = self->files_to_prepare;
+							_tmp85_ = self->files_to_prepare;
 #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp94_ = associated_file;
+							_tmp86_ = associated_file;
 #line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp94_);
+							gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_COLLECTION, GeeCollection), _tmp86_);
 #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp95_ = ftp;
+							_tmp87_ = ftp;
 #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							_tmp96_ = associated_file;
+							_tmp88_ = associated_file;
 #line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							file_to_prepare_set_associated (_tmp95_, _tmp96_);
+							file_to_prepare_set_associated (_tmp87_, _tmp88_);
 #line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (associated_file);
-#line 11934 "BatchImport.c"
+#line 12587 "BatchImport.c"
 						}
 					}
 				}
@@ -11947,46 +12600,45 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_free0 (ext);
 #line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 11944 "BatchImport.c"
+#line 12597 "BatchImport.c"
 			}
 		}
 	}
 #line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (sorted);
-#line 11950 "BatchImport.c"
+#line 12603 "BatchImport.c"
 }
 
 
-static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired) {
+static gboolean
+work_sniffer_is_paired (WorkSniffer* self,
+                        FileToPrepare* raw,
+                        FileToPrepare* maybe_paired)
+{
 	gboolean result = FALSE;
-	FileToPrepare* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
-	FileToPrepare* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gboolean _tmp6_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
 	gchar* test_name = NULL;
 	gchar* test_ext = NULL;
-	FileToPrepare* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	JfifFileFormatProperties* _tmp12_;
-	JfifFileFormatProperties* _tmp13_;
-	const gchar* _tmp14_;
-	gboolean _tmp15_;
-	gboolean _tmp16_;
-	FileToPrepare* _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_;
-	const gchar* _tmp23_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	JfifFileFormatProperties* _tmp9_;
+	JfifFileFormatProperties* _tmp10_;
+	const gchar* _tmp11_;
+	gboolean _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_ = NULL;
+	gchar* _tmp16_ = NULL;
+	const gchar* _tmp17_;
+	const gchar* _tmp18_;
 #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_WORK_SNIFFER (self), FALSE);
 #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11994,63 +12646,55 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 #line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (maybe_paired), FALSE);
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = raw;
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = file_to_prepare_get_parent_path (_tmp0_);
+	_tmp0_ = file_to_prepare_get_parent_path (raw);
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = _tmp1_;
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = maybe_paired;
+	_tmp1_ = _tmp0_;
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = file_to_prepare_get_parent_path (_tmp3_);
+	_tmp2_ = file_to_prepare_get_parent_path (maybe_paired);
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0;
+	_tmp4_ = g_strcmp0 (_tmp1_, _tmp3_) != 0;
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp3_);
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp6_) {
+	if (_tmp4_) {
 #line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
 #line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12014 "BatchImport.c"
+#line 12662 "BatchImport.c"
 	}
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = maybe_paired;
+	_tmp5_ = file_to_prepare_get_basename (maybe_paired);
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = file_to_prepare_get_basename (_tmp7_);
-#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = _tmp5_;
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_);
+	disassemble_filename (_tmp6_, &_tmp7_, &_tmp8_);
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_name);
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	test_name = _tmp10_;
+	test_name = _tmp7_;
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	test_ext = _tmp11_;
+	test_ext = _tmp8_;
 #line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp6_);
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = jfif_file_format_properties_get_instance ();
+	_tmp9_ = jfif_file_format_properties_get_instance ();
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _tmp12_;
+	_tmp10_ = _tmp9_;
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = test_ext;
+	_tmp11_ = test_ext;
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp14_);
+	_tmp12_ = !photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp11_);
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp16_ = !_tmp15_;
+	_photo_file_format_properties_unref0 (_tmp10_);
 #line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_photo_file_format_properties_unref0 (_tmp13_);
-#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp16_) {
+	if (_tmp12_) {
 #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
 #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12063,32 +12707,30 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 		_g_free0 (name);
 #line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 12060 "BatchImport.c"
+#line 12704 "BatchImport.c"
 	}
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp17_ = raw;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = file_to_prepare_get_basename (_tmp17_);
+	_tmp13_ = file_to_prepare_get_basename (raw);
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = _tmp18_;
+	_tmp14_ = _tmp13_;
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	disassemble_filename (_tmp19_, &_tmp20_, &_tmp21_);
+	disassemble_filename (_tmp14_, &_tmp15_, &_tmp16_);
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (name);
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	name = _tmp20_;
+	name = _tmp15_;
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (ext);
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	ext = _tmp21_;
+	ext = _tmp16_;
 #line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp19_);
+	_g_free0 (_tmp14_);
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp22_ = name;
+	_tmp17_ = name;
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp23_ = test_name;
+	_tmp18_ = test_name;
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = g_strcmp0 (_tmp22_, _tmp23_) == 0;
+	result = g_strcmp0 (_tmp17_, _tmp18_) == 0;
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12099,81 +12741,72 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 	_g_free0 (name);
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 12096 "BatchImport.c"
+#line 12738 "BatchImport.c"
 }
 
 
-static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error) {
+static void
+work_sniffer_sniff_job (WorkSniffer* self,
+                        BatchImportJob* job,
+                        GError** error)
+{
 	guint64 size = 0ULL;
 	GFile* file_or_dir = NULL;
 	gboolean determined_size = FALSE;
-	BatchImportJob* _tmp0_;
-	guint64 _tmp1_ = 0ULL;
-	GFile* _tmp2_ = NULL;
+	guint64 _tmp0_ = 0ULL;
+	GFile* _tmp1_ = NULL;
+	gboolean _tmp2_;
 	gboolean _tmp3_;
-	gboolean _tmp4_;
-	BatchImportJob* _tmp7_;
-	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_WORK_SNIFFER (self));
 #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
 #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = job;
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = batch_import_job_determine_file_size (_tmp0_, &_tmp1_, &_tmp2_);
+	_tmp2_ = batch_import_job_determine_file_size (job, &_tmp0_, &_tmp1_);
 #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	size = _tmp1_;
+	size = _tmp0_;
 #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
 #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	file_or_dir = _tmp2_;
+	file_or_dir = _tmp1_;
 #line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	determined_size = _tmp3_;
+	determined_size = _tmp2_;
 #line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = determined_size;
+	_tmp3_ = determined_size;
 #line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp4_) {
-#line 12132 "BatchImport.c"
+	if (_tmp3_) {
+#line 12773 "BatchImport.c"
+		guint64 _tmp4_;
 		guint64 _tmp5_;
-		guint64 _tmp6_;
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = self->total_bytes;
+		_tmp4_ = self->total_bytes;
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = size;
+		_tmp5_ = size;
 #line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->total_bytes = _tmp5_ + _tmp6_;
-#line 12141 "BatchImport.c"
+		self->total_bytes = _tmp4_ + _tmp5_;
+#line 12782 "BatchImport.c"
 	}
 #line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = job;
-#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = batch_import_job_is_directory (_tmp7_);
-#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp8_) {
-#line 12149 "BatchImport.c"
+	if (batch_import_job_is_directory (job)) {
+#line 12786 "BatchImport.c"
 		GFile* dir = NULL;
 		gboolean copy_to_library = FALSE;
-		gboolean _tmp9_ = FALSE;
-		BatchImportJob* _tmp10_;
-		GFile* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		gboolean _tmp13_;
-		GFile* _tmp21_;
-		gboolean _tmp22_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = job;
+		gboolean _tmp6_ = FALSE;
+		GFile* _tmp7_ = NULL;
+		gboolean _tmp8_ = FALSE;
+		gboolean _tmp9_;
+		GFile* _tmp14_;
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = batch_import_job_prepare (_tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
+		_tmp9_ = batch_import_job_prepare (job, &_tmp7_, &_tmp8_, &_inner_error_);
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		dir = _tmp11_;
+		dir = _tmp7_;
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		copy_to_library = _tmp12_;
+		copy_to_library = _tmp8_;
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = _tmp13_;
+		_tmp6_ = _tmp9_;
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12184,74 +12817,54 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12181 "BatchImport.c"
+#line 12814 "BatchImport.c"
 		}
 #line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!_tmp9_) {
-#line 12185 "BatchImport.c"
-			BatchImportJob* _tmp14_;
-			BatchImportJob* _tmp15_;
-			gchar* _tmp16_;
-			gchar* _tmp17_;
-			BatchImportJob* _tmp18_;
-			gchar* _tmp19_;
-			gchar* _tmp20_;
-#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = job;
-#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp15_ = job;
-#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp16_ = batch_import_job_get_source_identifier (_tmp15_);
+		if (!_tmp6_) {
+#line 12818 "BatchImport.c"
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp17_ = _tmp16_;
+			_tmp10_ = batch_import_job_get_source_identifier (job);
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = job;
+			_tmp11_ = _tmp10_;
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
+			_tmp12_ = batch_import_job_get_dest_identifier (job);
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = _tmp19_;
+			_tmp13_ = _tmp12_;
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp14_, NULL, _tmp17_, _tmp20_, IMPORT_RESULT_FILE_ERROR);
+			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp11_, _tmp13_, IMPORT_RESULT_FILE_ERROR);
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp20_);
+			_g_free0 (_tmp13_);
 #line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp17_);
+			_g_free0 (_tmp11_);
 #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
 #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
 #line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12219 "BatchImport.c"
+#line 12843 "BatchImport.c"
 		}
 #line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = dir;
-#line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = query_is_directory (_tmp21_);
+		_tmp14_ = dir;
 #line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_assert (_tmp22_, "query_is_directory(dir)");
-#line 12227 "BatchImport.c"
+		_vala_assert (query_is_directory (_tmp14_), "query_is_directory(dir)");
+#line 12849 "BatchImport.c"
 		{
-			BatchImportJob* _tmp23_;
-			GFile* _tmp24_;
-			gboolean _tmp25_;
-			BatchImportJob* _tmp26_;
-			gboolean _tmp27_;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = job;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = dir;
-#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = copy_to_library;
+			GFile* _tmp15_;
+			gboolean _tmp16_;
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = job;
+			_tmp15_ = dir;
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = batch_import_job_recurse (_tmp26_);
+			_tmp16_ = copy_to_library;
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, _tmp27_, &_inner_error_);
+			work_sniffer_search_dir (self, job, _tmp15_, _tmp16_, batch_import_job_recurse (job), &_inner_error_);
 #line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12248 "BatchImport.c"
+#line 12861 "BatchImport.c"
 				goto __catch427_g_error;
 			}
 		}
@@ -12259,46 +12872,40 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		__catch427_g_error:
 		{
 			GError* err = NULL;
-			BatchImportJob* _tmp28_;
-			GFile* _tmp29_;
-			BatchImportJob* _tmp30_;
-			gchar* _tmp31_;
-			gchar* _tmp32_;
-			GFile* _tmp33_;
-			gchar* _tmp34_;
-			gchar* _tmp35_;
-			GError* _tmp36_;
+			GFile* _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
+			GFile* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+			GError* _tmp23_;
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp28_ = job;
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp29_ = dir;
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp30_ = job;
+			_tmp17_ = dir;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp31_ = batch_import_job_get_source_identifier (_tmp30_);
+			_tmp18_ = batch_import_job_get_source_identifier (job);
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp32_ = _tmp31_;
+			_tmp19_ = _tmp18_;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = dir;
+			_tmp20_ = dir;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = g_file_get_path (_tmp33_);
+			_tmp21_ = g_file_get_path (_tmp20_);
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp35_ = _tmp34_;
+			_tmp22_ = _tmp21_;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp36_ = err;
+			_tmp23_ = err;
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp28_, _tmp29_, _tmp32_, _tmp35_, _tmp36_, IMPORT_RESULT_FILE_ERROR);
+			background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, _tmp17_, _tmp19_, _tmp22_, _tmp23_, IMPORT_RESULT_FILE_ERROR);
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp35_);
+			_g_free0 (_tmp22_);
 #line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp32_);
+			_g_free0 (_tmp19_);
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 12295 "BatchImport.c"
+#line 12902 "BatchImport.c"
 		}
 		__finally427:
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12311,46 +12918,42 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_object_unref0 (file_or_dir);
 #line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12308 "BatchImport.c"
+#line 12915 "BatchImport.c"
 		}
 #line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 12312 "BatchImport.c"
+#line 12919 "BatchImport.c"
 	} else {
-		gboolean _tmp37_;
-		gboolean _tmp45_ = FALSE;
-		gboolean _tmp46_ = FALSE;
-		GFile* _tmp47_;
-		GeeList* _tmp52_;
-		BatchImportJob* _tmp53_;
-		FileToPrepare* _tmp54_;
-		FileToPrepare* _tmp55_;
+		gboolean _tmp24_;
+		gboolean _tmp31_ = FALSE;
+		gboolean _tmp32_ = FALSE;
+		GFile* _tmp33_;
+		GeeList* _tmp37_;
+		FileToPrepare* _tmp38_;
+		FileToPrepare* _tmp39_;
 #line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp37_ = determined_size;
+		_tmp24_ = determined_size;
 #line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!_tmp37_) {
-#line 12326 "BatchImport.c"
-			guint64 _tmp38_ = 0ULL;
-			GFile* _tmp39_;
-			GCancellable* _tmp40_;
-			GCancellable* _tmp41_;
-			guint64 _tmp42_;
-			guint64 _tmp43_;
-			guint64 _tmp44_;
-#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = file_or_dir;
+		if (!_tmp24_) {
+#line 12932 "BatchImport.c"
+			guint64 _tmp25_ = 0ULL;
+			GFile* _tmp26_;
+			GCancellable* _tmp27_;
+			GCancellable* _tmp28_;
+			guint64 _tmp29_;
+			guint64 _tmp30_;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp40_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+			_tmp26_ = file_or_dir;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = _tmp40_;
+			_tmp27_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp42_ = query_total_file_size (_tmp39_, _tmp41_, &_inner_error_);
+			_tmp28_ = _tmp27_;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = _tmp42_;
+			_tmp29_ = query_total_file_size (_tmp26_, _tmp28_, &_inner_error_);
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_object_unref0 (_tmp41_);
+			_g_object_unref0 (_tmp28_);
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp38_ = _tmp43_;
+			_tmp25_ = _tmp29_;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12359,82 +12962,83 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 				_g_object_unref0 (file_or_dir);
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12356 "BatchImport.c"
+#line 12959 "BatchImport.c"
 			}
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = self->total_bytes;
+			_tmp30_ = self->total_bytes;
 #line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			self->total_bytes = _tmp44_ + _tmp38_;
-#line 12362 "BatchImport.c"
+			self->total_bytes = _tmp30_ + _tmp25_;
+#line 12965 "BatchImport.c"
 		}
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp47_ = file_or_dir;
+		_tmp33_ = file_or_dir;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp47_ != NULL) {
-#line 12368 "BatchImport.c"
-			GeeHashSet* _tmp48_;
+		if (_tmp33_ != NULL) {
+#line 12971 "BatchImport.c"
+			GeeHashSet* _tmp34_;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp48_ = self->priv->skipset;
+			_tmp34_ = self->priv->skipset;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = _tmp48_ != NULL;
-#line 12374 "BatchImport.c"
+			_tmp32_ = _tmp34_ != NULL;
+#line 12977 "BatchImport.c"
 		} else {
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = FALSE;
-#line 12378 "BatchImport.c"
+			_tmp32_ = FALSE;
+#line 12981 "BatchImport.c"
 		}
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp46_) {
-#line 12382 "BatchImport.c"
-			GeeHashSet* _tmp49_;
-			GFile* _tmp50_;
-			gboolean _tmp51_;
-#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp49_ = self->priv->skipset;
+		if (_tmp32_) {
+#line 12985 "BatchImport.c"
+			GeeHashSet* _tmp35_;
+			GFile* _tmp36_;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp50_ = file_or_dir;
+			_tmp35_ = self->priv->skipset;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp51_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_);
+			_tmp36_ = file_or_dir;
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp45_ = _tmp51_;
-#line 12394 "BatchImport.c"
+			_tmp31_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
+#line 12994 "BatchImport.c"
 		} else {
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp45_ = FALSE;
-#line 12398 "BatchImport.c"
+			_tmp31_ = FALSE;
+#line 12998 "BatchImport.c"
 		}
 #line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp45_) {
+		if (_tmp31_) {
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12406 "BatchImport.c"
+#line 13006 "BatchImport.c"
 		}
 #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp52_ = self->files_to_prepare;
+		_tmp37_ = self->files_to_prepare;
 #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp53_ = job;
+		_tmp38_ = file_to_prepare_new (job, NULL, TRUE);
 #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp54_ = file_to_prepare_new (_tmp53_, NULL, TRUE);
+		_tmp39_ = _tmp38_;
 #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp55_ = _tmp54_;
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_);
 #line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_file_to_prepare_unref0 (_tmp55_);
-#line 12420 "BatchImport.c"
+		_file_to_prepare_unref0 (_tmp39_);
+#line 13018 "BatchImport.c"
 	}
 #line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 12424 "BatchImport.c"
+#line 13022 "BatchImport.c"
 }
 
 
-void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error) {
+void
+work_sniffer_search_dir (WorkSniffer* self,
+                         BatchImportJob* job,
+                         GFile* dir,
+                         gboolean copy_to_library,
+                         gboolean recurse,
+                         GError** error)
+{
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp0_;
-	GFileEnumerator* _tmp1_;
+	GFileEnumerator* _tmp0_;
 	GFileInfo* info = NULL;
 	GError * _inner_error_ = NULL;
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12444,56 +13048,51 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_IS_FILE (dir));
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = dir;
+	_tmp0_ = g_file_enumerate_children (dir, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = g_file_enumerate_children (_tmp0_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	enumerator = _tmp1_;
+	enumerator = _tmp0_;
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 12452 "BatchImport.c"
+#line 13054 "BatchImport.c"
 	}
 #line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	info = NULL;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 12458 "BatchImport.c"
-		GFileInfo* _tmp2_ = NULL;
-		GFileEnumerator* _tmp3_;
+#line 13060 "BatchImport.c"
+		GFileInfo* _tmp1_ = NULL;
+		GFileEnumerator* _tmp2_;
+		GCancellable* _tmp3_;
 		GCancellable* _tmp4_;
-		GCancellable* _tmp5_;
+		GFileInfo* _tmp5_;
 		GFileInfo* _tmp6_;
 		GFileInfo* _tmp7_;
 		GFileInfo* _tmp8_;
-		GFileInfo* _tmp9_;
-		gboolean _tmp10_;
 		GFile* child = NULL;
+		GFileInfo* _tmp9_;
+		const gchar* _tmp10_;
 		GFile* _tmp11_;
-		GFileInfo* _tmp12_;
-		const gchar* _tmp13_;
-		GFile* _tmp14_;
 		GFileType file_type = 0;
-		GFileInfo* _tmp15_;
-		GFileType _tmp16_;
-		GFileType _tmp17_;
+		GFileInfo* _tmp12_;
+		GFileType _tmp13_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = enumerator;
+		_tmp2_ = enumerator;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+		_tmp3_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = g_file_enumerator_next_file (_tmp3_, _tmp5_, &_inner_error_);
+		_tmp5_ = g_file_enumerator_next_file (_tmp2_, _tmp4_, &_inner_error_);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp5_);
+		_g_object_unref0 (_tmp4_);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = _tmp7_;
+		_tmp1_ = _tmp6_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12504,107 +13103,86 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			_g_object_unref0 (enumerator);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12501 "BatchImport.c"
+#line 13100 "BatchImport.c"
 		}
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp2_;
+		_tmp7_ = _tmp1_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = NULL;
+		_tmp1_ = NULL;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (info);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		info = _tmp8_;
+		info = _tmp7_;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = info;
+		_tmp8_ = info;
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!(_tmp9_ != NULL)) {
+		if (!(_tmp8_ != NULL)) {
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_object_unref0 (_tmp2_);
+			_g_object_unref0 (_tmp1_);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12519 "BatchImport.c"
+#line 13118 "BatchImport.c"
 		}
 #line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp10_) {
+		if (background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob))) {
 #line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_object_unref0 (_tmp2_);
+			_g_object_unref0 (_tmp1_);
 #line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12529 "BatchImport.c"
+#line 13126 "BatchImport.c"
 		}
 #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp11_ = dir;
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = info;
+		_tmp9_ = info;
 #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = g_file_info_get_name (_tmp12_);
+		_tmp10_ = g_file_info_get_name (_tmp9_);
 #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = g_file_get_child (_tmp11_, _tmp13_);
+		_tmp11_ = g_file_get_child (dir, _tmp10_);
 #line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		child = _tmp14_;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = info;
+		child = _tmp11_;
 #line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = g_file_info_get_file_type (_tmp15_);
+		_tmp12_ = info;
 #line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		file_type = _tmp16_;
+		file_type = g_file_info_get_file_type (_tmp12_);
 #line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = file_type;
+		_tmp13_ = file_type;
 #line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp17_ == G_FILE_TYPE_DIRECTORY) {
-#line 12551 "BatchImport.c"
-			gboolean _tmp18_;
-			GFileInfo* _tmp19_;
-			const gchar* _tmp20_;
-			gboolean _tmp21_;
-#line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = recurse;
+		if (_tmp13_ == G_FILE_TYPE_DIRECTORY) {
+#line 13144 "BatchImport.c"
+			GFileInfo* _tmp14_;
+			const gchar* _tmp15_;
 #line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (!_tmp18_) {
+			if (!recurse) {
 #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
 #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp2_);
+				_g_object_unref0 (_tmp1_);
 #line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 12566 "BatchImport.c"
+#line 13155 "BatchImport.c"
 			}
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = info;
+			_tmp14_ = info;
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = g_file_info_get_name (_tmp19_);
+			_tmp15_ = g_file_info_get_name (_tmp14_);
 #line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp21_ = g_str_has_prefix (_tmp20_, ".");
-#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp21_) {
+			if (g_str_has_prefix (_tmp15_, ".")) {
 #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
 #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp2_);
+				_g_object_unref0 (_tmp1_);
 #line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 12582 "BatchImport.c"
+#line 13169 "BatchImport.c"
 			}
 			{
-				BatchImportJob* _tmp22_;
-				GFile* _tmp23_;
-				gboolean _tmp24_;
-				gboolean _tmp25_;
-#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp22_ = job;
-#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp23_ = child;
-#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp24_ = copy_to_library;
+				GFile* _tmp16_;
 #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp25_ = recurse;
+				_tmp16_ = child;
 #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				work_sniffer_search_dir (self, _tmp22_, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
+				work_sniffer_search_dir (self, job, _tmp16_, copy_to_library, recurse, &_inner_error_);
 #line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12601 "BatchImport.c"
+#line 13179 "BatchImport.c"
 					goto __catch428_g_error;
 				}
 			}
@@ -12612,46 +13190,43 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 			__catch428_g_error:
 			{
 				GError* err = NULL;
-				BatchImportJob* _tmp26_;
-				GFile* _tmp27_;
-				GFile* _tmp28_;
-				gchar* _tmp29_;
-				gchar* _tmp30_;
-				GFile* _tmp31_;
-				gchar* _tmp32_;
-				gchar* _tmp33_;
-				GError* _tmp34_;
+				GFile* _tmp17_;
+				GFile* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				GFile* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				GError* _tmp24_;
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp26_ = job;
+				_tmp17_ = child;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp27_ = child;
+				_tmp18_ = child;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp28_ = child;
+				_tmp19_ = g_file_get_path (_tmp18_);
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp29_ = g_file_get_path (_tmp28_);
-#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp30_ = _tmp29_;
+				_tmp20_ = _tmp19_;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp31_ = child;
+				_tmp21_ = child;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = g_file_get_path (_tmp31_);
+				_tmp22_ = g_file_get_path (_tmp21_);
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp33_ = _tmp32_;
+				_tmp23_ = _tmp22_;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp34_ = err;
+				_tmp24_ = err;
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR);
+				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, _tmp17_, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR);
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp33_);
+				_g_free0 (_tmp23_);
 #line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp30_);
+				_g_free0 (_tmp20_);
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 12648 "BatchImport.c"
+#line 13223 "BatchImport.c"
 			}
 			__finally428:
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12661,176 +13236,157 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp2_);
+				_g_object_unref0 (_tmp1_);
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (info);
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (enumerator);
 #line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12665 "BatchImport.c"
+#line 13240 "BatchImport.c"
 			}
 		} else {
-			GFileType _tmp35_;
+			GFileType _tmp25_;
 #line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp35_ = file_type;
+			_tmp25_ = file_type;
 #line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp35_ == G_FILE_TYPE_REGULAR) {
-#line 12673 "BatchImport.c"
-				gboolean _tmp36_ = FALSE;
-				GeeHashSet* _tmp37_;
-				gboolean _tmp41_ = FALSE;
-				gboolean _tmp42_ = FALSE;
-				GFile* _tmp43_;
-				gboolean _tmp44_;
-#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp37_ = self->priv->skipset;
+			if (_tmp25_ == G_FILE_TYPE_REGULAR) {
+#line 13248 "BatchImport.c"
+				gboolean _tmp26_ = FALSE;
+				GeeHashSet* _tmp27_;
+				gboolean _tmp30_ = FALSE;
+				gboolean _tmp31_ = FALSE;
+				GFile* _tmp32_;
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp37_ != NULL) {
-#line 12684 "BatchImport.c"
-					GeeHashSet* _tmp38_;
-					GFile* _tmp39_;
-					gboolean _tmp40_;
+				_tmp27_ = self->priv->skipset;
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp38_ = self->priv->skipset;
+				if (_tmp27_ != NULL) {
+#line 13258 "BatchImport.c"
+					GeeHashSet* _tmp28_;
+					GFile* _tmp29_;
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp39_ = child;
+					_tmp28_ = self->priv->skipset;
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp40_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp39_);
+					_tmp29_ = child;
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp36_ = _tmp40_;
-#line 12696 "BatchImport.c"
+					_tmp26_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
+#line 13267 "BatchImport.c"
 				} else {
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp36_ = FALSE;
-#line 12700 "BatchImport.c"
+					_tmp26_ = FALSE;
+#line 13271 "BatchImport.c"
 				}
 #line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp36_) {
+				if (_tmp26_) {
 #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
 #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_object_unref0 (_tmp2_);
+					_g_object_unref0 (_tmp1_);
 #line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12710 "BatchImport.c"
+#line 13281 "BatchImport.c"
 				}
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp43_ = child;
+				_tmp32_ = child;
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp44_ = photo_is_file_image (_tmp43_);
+				if (photo_is_file_image (_tmp32_)) {
+#line 13287 "BatchImport.c"
+					GFile* _tmp33_;
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp44_) {
-#line 12718 "BatchImport.c"
-					GFile* _tmp45_;
-					gboolean _tmp46_;
+					_tmp33_ = child;
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp45_ = child;
-#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp46_ = photo_file_format_is_file_supported (_tmp45_);
-#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp42_ = _tmp46_;
-#line 12727 "BatchImport.c"
+					_tmp31_ = photo_file_format_is_file_supported (_tmp33_);
+#line 13293 "BatchImport.c"
 				} else {
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp42_ = FALSE;
-#line 12731 "BatchImport.c"
+					_tmp31_ = FALSE;
+#line 13297 "BatchImport.c"
 				}
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp42_) {
+				if (_tmp31_) {
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp41_ = TRUE;
-#line 12737 "BatchImport.c"
+					_tmp30_ = TRUE;
+#line 13303 "BatchImport.c"
 				} else {
-					GFile* _tmp47_;
-					gboolean _tmp48_;
-#line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp47_ = child;
+					GFile* _tmp34_;
 #line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp48_ = video_reader_is_supported_video_file (_tmp47_);
+					_tmp34_ = child;
 #line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp41_ = _tmp48_;
-#line 12747 "BatchImport.c"
+					_tmp30_ = video_reader_is_supported_video_file (_tmp34_);
+#line 13310 "BatchImport.c"
 				}
 #line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp41_) {
-#line 12751 "BatchImport.c"
-					guint64 _tmp49_;
-					GFileInfo* _tmp50_;
-					gint64 _tmp51_;
-					GeeList* _tmp52_;
-					BatchImportJob* _tmp53_;
-					GFile* _tmp54_;
-					gboolean _tmp55_;
-					FileToPrepare* _tmp56_;
-					FileToPrepare* _tmp57_;
+				if (_tmp30_) {
+#line 13314 "BatchImport.c"
+					guint64 _tmp35_;
+					GFileInfo* _tmp36_;
+					GeeList* _tmp37_;
+					GFile* _tmp38_;
+					FileToPrepare* _tmp39_;
+					FileToPrepare* _tmp40_;
 #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp49_ = self->total_bytes;
+					_tmp35_ = self->total_bytes;
 #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp50_ = info;
+					_tmp36_ = info;
 #line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp51_ = g_file_info_get_size (_tmp50_);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					self->total_bytes = _tmp49_ + _tmp51_;
-#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp52_ = self->files_to_prepare;
-#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp53_ = job;
+					self->total_bytes = _tmp35_ + g_file_info_get_size (_tmp36_);
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp54_ = child;
+					_tmp37_ = self->files_to_prepare;
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp55_ = copy_to_library;
+					_tmp38_ = child;
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp56_ = file_to_prepare_new (_tmp53_, _tmp54_, _tmp55_);
+					_tmp39_ = file_to_prepare_new (job, _tmp38_, copy_to_library);
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp57_ = _tmp56_;
+					_tmp40_ = _tmp39_;
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_);
+					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_);
 #line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_file_to_prepare_unref0 (_tmp57_);
+					_file_to_prepare_unref0 (_tmp40_);
 #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
 #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_object_unref0 (_tmp2_);
+					_g_object_unref0 (_tmp1_);
 #line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12791 "BatchImport.c"
+#line 13345 "BatchImport.c"
 				}
 			} else {
-				GFile* _tmp58_;
-				gchar* _tmp59_;
-				gchar* _tmp60_;
-				GFileType _tmp61_;
+				GFile* _tmp41_;
+				gchar* _tmp42_;
+				gchar* _tmp43_;
+				GFileType _tmp44_;
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58_ = child;
+				_tmp41_ = child;
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = g_file_get_path (_tmp58_);
+				_tmp42_ = g_file_get_path (_tmp41_);
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp60_ = _tmp59_;
+				_tmp43_ = _tmp42_;
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp61_ = file_type;
+				_tmp44_ = file_type;
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:1637: Ignoring import of %s file type %d", _tmp60_, (gint) _tmp61_);
+				g_warning ("BatchImport.vala:1637: Ignoring import of %s file type %d", _tmp43_, (gint) _tmp44_);
 #line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp60_);
-#line 12810 "BatchImport.c"
+				_g_free0 (_tmp43_);
+#line 13364 "BatchImport.c"
 			}
 		}
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (child);
 #line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp2_);
-#line 12817 "BatchImport.c"
+		_g_object_unref0 (_tmp1_);
+#line 13371 "BatchImport.c"
 	}
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (info);
 #line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (enumerator);
-#line 12823 "BatchImport.c"
+#line 13377 "BatchImport.c"
 }
 
 
-static void work_sniffer_class_init (WorkSnifferClass * klass) {
+static void
+work_sniffer_class_init (WorkSnifferClass * klass)
+{
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	work_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12839,11 +13395,13 @@ static void work_sniffer_class_init (WorkSnifferClass * klass) {
 	g_type_class_add_private (klass, sizeof (WorkSnifferPrivate));
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) work_sniffer_real_execute;
-#line 12836 "BatchImport.c"
+#line 13392 "BatchImport.c"
 }
 
 
-static void work_sniffer_instance_init (WorkSniffer * self) {
+static void
+work_sniffer_instance_init (WorkSniffer * self)
+{
 	GeeArrayList* _tmp0_;
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = WORK_SNIFFER_GET_PRIVATE (self);
@@ -12853,11 +13411,13 @@ static void work_sniffer_instance_init (WorkSniffer * self) {
 	self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
 #line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->total_bytes = (guint64) 0;
-#line 12850 "BatchImport.c"
+#line 13408 "BatchImport.c"
 }
 
 
-static void work_sniffer_finalize (BackgroundJob * obj) {
+static void
+work_sniffer_finalize (BackgroundJob * obj)
+{
 	WorkSniffer * self;
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORK_SNIFFER, WorkSniffer);
@@ -12869,11 +13429,13 @@ static void work_sniffer_finalize (BackgroundJob * obj) {
 	_g_object_unref0 (self->priv->skipset);
 #line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj);
-#line 12866 "BatchImport.c"
+#line 13426 "BatchImport.c"
 }
 
 
-GType work_sniffer_get_type (void) {
+GType
+work_sniffer_get_type (void)
+{
 	static volatile gsize work_sniffer_type_id__volatile = 0;
 	if (g_once_init_enter (&work_sniffer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (WorkSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) work_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WorkSniffer), 0, (GInstanceInitFunc) work_sniffer_instance_init, NULL };
@@ -12885,28 +13447,30 @@ GType work_sniffer_get_type (void) {
 }
 
 
-PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
+PreparedFile*
+prepared_file_construct (GType object_type,
+                         BatchImportJob* job,
+                         GFile* file,
+                         GFile* associated_file,
+                         const gchar* source_id,
+                         const gchar* dest_id,
+                         gboolean copy_to_library,
+                         const gchar* exif_md5,
+                         const gchar* thumbnail_md5,
+                         const gchar* full_md5,
+                         PhotoFileFormat file_format,
+                         guint64 filesize,
+                         gboolean is_video)
+{
 	PreparedFile* self = NULL;
 	BatchImportJob* _tmp0_;
-	BatchImportJob* _tmp1_;
+	GFile* _tmp1_;
 	GFile* _tmp2_;
-	GFile* _tmp3_;
-	GFile* _tmp4_;
-	GFile* _tmp5_;
-	const gchar* _tmp6_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	gchar* _tmp7_;
-	const gchar* _tmp8_;
-	gchar* _tmp9_;
-	gboolean _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	const gchar* _tmp13_;
-	gchar* _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	PhotoFileFormat _tmp17_;
-	guint64 _tmp18_;
-	gboolean _tmp19_;
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12920,198 +13484,212 @@ PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, G
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFile*) g_type_create_instance (object_type);
 #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = job;
-#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
+	_tmp0_ = _batch_import_job_ref0 (job);
 #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
 #line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->job = _tmp1_;
+	self->job = _tmp0_;
 #line 1662 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->result = IMPORT_RESULT_SUCCESS;
 #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = file;
-#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (file);
 #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
 #line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->file = _tmp3_;
+	self->file = _tmp1_;
 #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = associated_file;
-#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp2_ = _g_object_ref0 (associated_file);
 #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->associated_file);
 #line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->associated_file = _tmp5_;
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = source_id;
+	self->associated_file = _tmp2_;
 #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = g_strdup (_tmp6_);
+	_tmp3_ = g_strdup (source_id);
 #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->source_id);
 #line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->source_id = _tmp7_;
-#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = dest_id;
+	self->source_id = _tmp3_;
 #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = g_strdup (_tmp8_);
+	_tmp4_ = g_strdup (dest_id);
 #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_id);
 #line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->dest_id = _tmp9_;
+	self->dest_id = _tmp4_;
 #line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = copy_to_library;
-#line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->copy_to_library = _tmp10_;
-#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = exif_md5;
+	self->copy_to_library = copy_to_library;
 #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = g_strdup (_tmp11_);
+	_tmp5_ = g_strdup (exif_md5);
 #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->exif_md5);
 #line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->exif_md5 = _tmp12_;
+	self->exif_md5 = _tmp5_;
 #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = thumbnail_md5;
-#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = g_strdup (_tmp13_);
+	_tmp6_ = g_strdup (thumbnail_md5);
 #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->thumbnail_md5);
 #line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->thumbnail_md5 = _tmp14_;
-#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = full_md5;
+	self->thumbnail_md5 = _tmp6_;
 #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp16_ = g_strdup (_tmp15_);
+	_tmp7_ = g_strdup (full_md5);
 #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
 #line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->full_md5 = _tmp16_;
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp17_ = file_format;
+	self->full_md5 = _tmp7_;
 #line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->file_format = _tmp17_;
+	self->file_format = file_format;
 #line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = filesize;
-#line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->filesize = _tmp18_;
-#line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = is_video;
+	self->filesize = filesize;
 #line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->is_video = _tmp19_;
+	self->is_video = is_video;
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13000 "BatchImport.c"
-}
-
-
-PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
+#line 13540 "BatchImport.c"
+}
+
+
+PreparedFile*
+prepared_file_new (BatchImportJob* job,
+                   GFile* file,
+                   GFile* associated_file,
+                   const gchar* source_id,
+                   const gchar* dest_id,
+                   gboolean copy_to_library,
+                   const gchar* exif_md5,
+                   const gchar* thumbnail_md5,
+                   const gchar* full_md5,
+                   PhotoFileFormat file_format,
+                   guint64 filesize,
+                   gboolean is_video)
+{
 #line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video);
-#line 13007 "BatchImport.c"
+#line 13560 "BatchImport.c"
 }
 
 
-static void value_prepared_file_init (GValue* value) {
+static void
+value_prepared_file_init (GValue* value)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 13014 "BatchImport.c"
+#line 13569 "BatchImport.c"
 }
 
 
-static void value_prepared_file_free_value (GValue* value) {
+static void
+value_prepared_file_free_value (GValue* value)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (value->data[0].v_pointer);
-#line 13023 "BatchImport.c"
+#line 13580 "BatchImport.c"
 	}
 }
 
 
-static void value_prepared_file_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_prepared_file_copy_value (const GValue* src_value,
+                                GValue* dest_value)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer);
-#line 13033 "BatchImport.c"
+#line 13593 "BatchImport.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13037 "BatchImport.c"
+#line 13597 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_prepared_file_peek_pointer (const GValue* value) {
+static gpointer
+value_prepared_file_peek_pointer (const GValue* value)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13045 "BatchImport.c"
+#line 13607 "BatchImport.c"
 }
 
 
-static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_prepared_file_collect_value (GValue* value,
+                                   guint n_collect_values,
+                                   GTypeCValue* collect_values,
+                                   guint collect_flags)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 13052 "BatchImport.c"
+#line 13619 "BatchImport.c"
 		PreparedFile * object;
 		object = collect_values[0].v_pointer;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13059 "BatchImport.c"
+#line 13626 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.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 13063 "BatchImport.c"
+#line 13630 "BatchImport.c"
 		}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = prepared_file_ref (object);
-#line 13067 "BatchImport.c"
+#line 13634 "BatchImport.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13071 "BatchImport.c"
+#line 13638 "BatchImport.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13075 "BatchImport.c"
+#line 13642 "BatchImport.c"
 }
 
 
-static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_prepared_file_lcopy_value (const GValue* value,
+                                 guint n_collect_values,
+                                 GTypeCValue* collect_values,
+                                 guint collect_flags)
+{
 	PreparedFile ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13086 "BatchImport.c"
+#line 13658 "BatchImport.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 13092 "BatchImport.c"
+#line 13664 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13096 "BatchImport.c"
+#line 13668 "BatchImport.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = prepared_file_ref (value->data[0].v_pointer);
-#line 13100 "BatchImport.c"
+#line 13672 "BatchImport.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 13104 "BatchImport.c"
+#line 13676 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_prepared_file (const gchar* name,
+                          const gchar* nick,
+                          const gchar* blurb,
+                          GType object_type,
+                          GParamFlags flags)
+{
 	ParamSpecPreparedFile* spec;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREPARED_FILE), NULL);
@@ -13121,20 +13699,25 @@ GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 13118 "BatchImport.c"
+#line 13696 "BatchImport.c"
 }
 
 
-gpointer value_get_prepared_file (const GValue* value) {
+gpointer
+value_get_prepared_file (const GValue* value)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL);
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13127 "BatchImport.c"
+#line 13707 "BatchImport.c"
 }
 
 
-void value_set_prepared_file (GValue* value, gpointer v_object) {
+void
+value_set_prepared_file (GValue* value,
+                         gpointer v_object)
+{
 	PreparedFile * old;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
@@ -13150,22 +13733,25 @@ void value_set_prepared_file (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_ref (value->data[0].v_pointer);
-#line 13147 "BatchImport.c"
+#line 13730 "BatchImport.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13151 "BatchImport.c"
+#line 13734 "BatchImport.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13157 "BatchImport.c"
+#line 13740 "BatchImport.c"
 	}
 }
 
 
-void value_take_prepared_file (GValue* value, gpointer v_object) {
+void
+value_take_prepared_file (GValue* value,
+                          gpointer v_object)
+{
 	PreparedFile * old;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
@@ -13179,40 +13765,46 @@ void value_take_prepared_file (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 13176 "BatchImport.c"
+#line 13762 "BatchImport.c"
 	} else {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13180 "BatchImport.c"
+#line 13766 "BatchImport.c"
 	}
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13186 "BatchImport.c"
+#line 13772 "BatchImport.c"
 	}
 }
 
 
-static void prepared_file_class_init (PreparedFileClass * klass) {
+static void
+prepared_file_class_init (PreparedFileClass * klass)
+{
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_parent_class = g_type_class_peek_parent (klass);
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((PreparedFileClass *) klass)->finalize = prepared_file_finalize;
-#line 13196 "BatchImport.c"
+#line 13784 "BatchImport.c"
 }
 
 
-static void prepared_file_instance_init (PreparedFile * self) {
+static void
+prepared_file_instance_init (PreparedFile * self)
+{
 #line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated_file = NULL;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 13205 "BatchImport.c"
+#line 13795 "BatchImport.c"
 }
 
 
-static void prepared_file_finalize (PreparedFile * obj) {
+static void
+prepared_file_finalize (PreparedFile * obj)
+{
 	PreparedFile * self;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE, PreparedFile);
@@ -13234,11 +13826,13 @@ static void prepared_file_finalize (PreparedFile * obj) {
 	_g_free0 (self->thumbnail_md5);
 #line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 13231 "BatchImport.c"
+#line 13823 "BatchImport.c"
 }
 
 
-GType prepared_file_get_type (void) {
+GType
+prepared_file_get_type (void)
+{
 	static volatile gsize prepared_file_type_id__volatile = 0;
 	if (g_once_init_enter (&prepared_file_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_prepared_file_init, value_prepared_file_free_value, value_prepared_file_copy_value, value_prepared_file_peek_pointer, "p", value_prepared_file_collect_value, "p", value_prepared_file_lcopy_value };
@@ -13252,18 +13846,22 @@ GType prepared_file_get_type (void) {
 }
 
 
-gpointer prepared_file_ref (gpointer instance) {
+gpointer
+prepared_file_ref (gpointer instance)
+{
 	PreparedFile * self;
 	self = instance;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 13256 "BatchImport.c"
+#line 13852 "BatchImport.c"
 }
 
 
-void prepared_file_unref (gpointer instance) {
+void
+prepared_file_unref (gpointer instance)
+{
 	PreparedFile * self;
 	self = instance;
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13272,54 +13870,62 @@ void prepared_file_unref (gpointer instance) {
 		PREPARED_FILE_GET_CLASS (self)->finalize (self);
 #line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13269 "BatchImport.c"
+#line 13867 "BatchImport.c"
 	}
 }
 
 
-PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArrayList* list) {
+PreparedFileCluster*
+prepared_file_cluster_construct (GType object_type,
+                                 GeeArrayList* list)
+{
 	PreparedFileCluster* self = NULL;
 	GeeArrayList* _tmp0_;
-	GeeArrayList* _tmp1_;
 #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (list), NULL);
 #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFileCluster*) interlocked_notification_object_construct (object_type);
 #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = list;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (list);
 #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->list);
 #line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->list = _tmp1_;
+	self->list = _tmp0_;
 #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13292 "BatchImport.c"
+#line 13890 "BatchImport.c"
 }
 
 
-PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) {
+PreparedFileCluster*
+prepared_file_cluster_new (GeeArrayList* list)
+{
 #line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list);
-#line 13299 "BatchImport.c"
+#line 13899 "BatchImport.c"
 }
 
 
-static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass) {
+static void
+prepared_file_cluster_class_init (PreparedFileClusterClass * klass)
+{
 #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_cluster_parent_class = g_type_class_peek_parent (klass);
 #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize;
-#line 13308 "BatchImport.c"
+#line 13910 "BatchImport.c"
 }
 
 
-static void prepared_file_cluster_instance_init (PreparedFileCluster * self) {
+static void
+prepared_file_cluster_instance_init (PreparedFileCluster * self)
+{
 }
 
 
-static void prepared_file_cluster_finalize (NotificationObject * obj) {
+static void
+prepared_file_cluster_finalize (NotificationObject * obj)
+{
 	PreparedFileCluster * self;
 #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster);
@@ -13327,11 +13933,13 @@ static void prepared_file_cluster_finalize (NotificationObject * obj) {
 	_g_object_unref0 (self->list);
 #line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj);
-#line 13324 "BatchImport.c"
+#line 13930 "BatchImport.c"
 }
 
 
-GType prepared_file_cluster_get_type (void) {
+GType
+prepared_file_cluster_get_type (void)
+{
 	static volatile gsize prepared_file_cluster_type_id__volatile = 0;
 	if (g_once_init_enter (&prepared_file_cluster_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PreparedFileClusterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepared_file_cluster_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreparedFileCluster), 0, (GInstanceInitFunc) prepared_file_cluster_instance_init, NULL };
@@ -13343,21 +13951,21 @@ GType prepared_file_cluster_get_type (void) {
 }
 
 
-PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
+PrepareFilesJob*
+prepare_files_job_construct (GType object_type,
+                             BatchImport* owner,
+                             GeeList* files_to_prepare,
+                             NotificationCallback notification,
+                             void* notification_target,
+                             CompletionCallback callback,
+                             void* callback_target,
+                             GCancellable* cancellable,
+                             CancellationCallback cancellation,
+                             void* cancellation_target)
+{
 	PrepareFilesJob* self = NULL;
-	BatchImport* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	CancellationCallback _tmp3_;
-	void* _tmp3__target;
-	GeeList* _tmp4_;
-	GeeList* _tmp5_;
-	NotificationCallback _tmp6_;
-	void* _tmp6__target;
-	GFile* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
+	GeeList* _tmp0_;
+	GFile* _tmp1_;
 #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
 #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13365,139 +13973,125 @@ PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* ow
 #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = owner;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = callback;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1__target = callback_target;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = cancellable;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cancellation;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3__target = cancellation_target;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self = (PrepareFilesJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = files_to_prepare;
+	self = (PrepareFilesJob*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancellation, cancellation_target);
 #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp0_ = _g_object_ref0 (files_to_prepare);
 #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->files_to_prepare);
 #line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->files_to_prepare = _tmp5_;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = notification;
+	self->priv->files_to_prepare = _tmp0_;
 #line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6__target = notification_target;
+	self->priv->notification = notification;
 #line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->notification = _tmp6_;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->notification_target = _tmp6__target;
+	self->priv->notification_target = notification_target;
 #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = app_dirs_get_import_dir ();
+	_tmp1_ = app_dirs_get_import_dir ();
 #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->library_dir);
 #line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->library_dir = _tmp7_;
-#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY");
+	self->priv->library_dir = _tmp1_;
 #line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->fail_every = _tmp8_;
+	self->priv->fail_every = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY");
 #line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY");
-#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->skip_every = _tmp9_;
+	self->priv->skip_every = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY");
 #line 1709 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13409 "BatchImport.c"
+#line 13995 "BatchImport.c"
 }
 
 
-PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
+PrepareFilesJob*
+prepare_files_job_new (BatchImport* owner,
+                       GeeList* files_to_prepare,
+                       NotificationCallback notification,
+                       void* notification_target,
+                       CompletionCallback callback,
+                       void* callback_target,
+                       GCancellable* cancellable,
+                       CancellationCallback cancellation,
+                       void* cancellation_target)
+{
 #line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 13416 "BatchImport.c"
+#line 14012 "BatchImport.c"
 }
 
 
-static gint prepare_files_job_get_test_variable (const gchar* name) {
+static gint
+prepare_files_job_get_test_variable (const gchar* name)
+{
 	gint result = 0;
 	gchar* value = NULL;
 	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_;
+	gchar* _tmp1_;
+	gint _tmp2_ = 0;
+	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp4_;
 #line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (name != NULL, 0);
 #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = name;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = g_getenv (_tmp0_);
+	_tmp0_ = g_getenv (name);
 #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_tmp0_);
 #line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	value = _tmp2_;
+	value = _tmp1_;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = value;
+	_tmp4_ = value;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = TRUE;
-#line 13445 "BatchImport.c"
+		_tmp3_ = TRUE;
+#line 14040 "BatchImport.c"
 	} else {
-		const gchar* _tmp6_;
+		const gchar* _tmp5_;
+		gint _tmp6_;
 		gint _tmp7_;
-		gint _tmp8_;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = value;
+		_tmp5_ = value;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = strlen (_tmp6_);
+		_tmp6_ = strlen (_tmp5_);
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = _tmp8_ == 0;
-#line 13458 "BatchImport.c"
+		_tmp3_ = _tmp7_ == 0;
+#line 14053 "BatchImport.c"
 	}
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp4_) {
+	if (_tmp3_) {
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = 0;
-#line 13464 "BatchImport.c"
+		_tmp2_ = 0;
+#line 14059 "BatchImport.c"
 	} else {
-		const gchar* _tmp9_;
-		gint _tmp10_;
+		const gchar* _tmp8_;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = value;
+		_tmp8_ = value;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp10_ = atoi (_tmp9_);
-#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = _tmp10_;
-#line 13474 "BatchImport.c"
+		_tmp2_ = atoi (_tmp8_);
+#line 14066 "BatchImport.c"
 	}
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (value);
 #line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 13482 "BatchImport.c"
+#line 14074 "BatchImport.c"
 }
 
 
-static void prepare_files_job_real_execute (BackgroundJob* base) {
+static void
+prepare_files_job_real_execute (BackgroundJob* base)
+{
 	PrepareFilesJob * self;
 	GTimer* timer = NULL;
 	GTimer* _tmp0_;
 	GeeArrayList* list = NULL;
 	GeeArrayList* _tmp1_;
-	GeeArrayList* _tmp90_;
+	GeeArrayList* _tmp89_;
+	gint _tmp90_;
 	gint _tmp91_;
-	gint _tmp92_;
 #line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
 #line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13508,7 +14102,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 	_tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
 #line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	list = _tmp1_;
-#line 13505 "BatchImport.c"
+#line 14099 "BatchImport.c"
 	{
 		GeeList* _file_to_prepare_list = NULL;
 		GeeList* _tmp2_;
@@ -13536,7 +14130,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 		_file_to_prepare_index = -1;
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 13533 "BatchImport.c"
+#line 14127 "BatchImport.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -13546,38 +14140,37 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			gpointer _tmp12_;
 			ImportResult _result_ = 0;
 			ImportResult _tmp13_;
-			ImportResult _tmp14_;
 			BatchImportJob* job = NULL;
-			FileToPrepare* _tmp26_;
+			FileToPrepare* _tmp25_;
+			BatchImportJob* _tmp26_;
 			BatchImportJob* _tmp27_;
-			BatchImportJob* _tmp28_;
 			GFile* file = NULL;
-			FileToPrepare* _tmp29_;
+			FileToPrepare* _tmp28_;
+			GFile* _tmp29_;
 			GFile* _tmp30_;
-			GFile* _tmp31_;
-			GFile* _tmp32_ = NULL;
+			GFile* _tmp31_ = NULL;
+			FileToPrepare* _tmp32_;
 			FileToPrepare* _tmp33_;
-			FileToPrepare* _tmp34_;
 			GFile* associated = NULL;
-			GFile* _tmp38_;
+			GFile* _tmp37_;
 			gboolean copy_to_library = FALSE;
-			FileToPrepare* _tmp39_;
-			gboolean _tmp40_;
-			GFile* _tmp41_;
-			gboolean _tmp46_ = FALSE;
-			GFile* _tmp47_;
+			FileToPrepare* _tmp38_;
+			gboolean _tmp39_;
+			GFile* _tmp40_;
+			gboolean _tmp45_ = FALSE;
+			GFile* _tmp46_;
 			PreparedFile* prepared_file = NULL;
-			BatchImportJob* _tmp55_;
+			BatchImportJob* _tmp54_;
+			GFile* _tmp55_;
 			GFile* _tmp56_;
-			GFile* _tmp57_;
-			gboolean _tmp58_;
-			PreparedFile* _tmp59_ = NULL;
+			gboolean _tmp57_;
+			PreparedFile* _tmp58_ = NULL;
+			ImportResult _tmp59_;
 			ImportResult _tmp60_;
-			ImportResult _tmp61_;
-			gboolean _tmp74_ = FALSE;
-			GeeArrayList* _tmp75_;
+			gboolean _tmp73_ = FALSE;
+			GeeArrayList* _tmp74_;
+			gint _tmp75_;
 			gint _tmp76_;
-			gint _tmp77_;
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _file_to_prepare_index;
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13590,7 +14183,7 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			if (!(_tmp8_ < _tmp9_)) {
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 13587 "BatchImport.c"
+#line 14180 "BatchImport.c"
 			}
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _file_to_prepare_list;
@@ -13601,130 +14194,128 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			file_to_prepare = (FileToPrepare*) _tmp12_;
 #line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp13_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_result_ = _tmp13_;
+			_result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
 #line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp14_ = _result_;
+			_tmp13_ = _result_;
 #line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp14_ != IMPORT_RESULT_SUCCESS) {
-#line 13605 "BatchImport.c"
-				FileToPrepare* _tmp15_;
-				BatchImportJob* _tmp16_;
-				FileToPrepare* _tmp17_;
-				BatchImportJob* _tmp18_;
+			if (_tmp13_ != IMPORT_RESULT_SUCCESS) {
+#line 14196 "BatchImport.c"
+				FileToPrepare* _tmp14_;
+				BatchImportJob* _tmp15_;
+				FileToPrepare* _tmp16_;
+				BatchImportJob* _tmp17_;
+				gchar* _tmp18_;
 				gchar* _tmp19_;
-				gchar* _tmp20_;
-				FileToPrepare* _tmp21_;
-				BatchImportJob* _tmp22_;
+				FileToPrepare* _tmp20_;
+				BatchImportJob* _tmp21_;
+				gchar* _tmp22_;
 				gchar* _tmp23_;
-				gchar* _tmp24_;
-				ImportResult _tmp25_;
+				ImportResult _tmp24_;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp15_ = file_to_prepare;
+				_tmp14_ = file_to_prepare;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp16_ = _tmp15_->job;
+				_tmp15_ = _tmp14_->job;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp17_ = file_to_prepare;
+				_tmp16_ = file_to_prepare;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = _tmp17_->job;
+				_tmp17_ = _tmp16_->job;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
+				_tmp18_ = batch_import_job_get_dest_identifier (_tmp17_);
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp20_ = _tmp19_;
+				_tmp19_ = _tmp18_;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp21_ = file_to_prepare;
+				_tmp20_ = file_to_prepare;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp22_ = _tmp21_->job;
+				_tmp21_ = _tmp20_->job;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp23_ = batch_import_job_get_source_identifier (_tmp22_);
+				_tmp22_ = batch_import_job_get_source_identifier (_tmp21_);
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp24_ = _tmp23_;
+				_tmp23_ = _tmp22_;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp25_ = _result_;
+				_tmp24_ = _result_;
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp16_, NULL, _tmp20_, _tmp24_, _tmp25_);
+				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp15_, NULL, _tmp19_, _tmp23_, _tmp24_);
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp24_);
+				_g_free0 (_tmp23_);
 #line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp20_);
+				_g_free0 (_tmp19_);
 #line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_file_to_prepare_unref0 (file_to_prepare);
 #line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 13649 "BatchImport.c"
+#line 14240 "BatchImport.c"
 			}
 #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = file_to_prepare;
+			_tmp25_ = file_to_prepare;
 #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = _tmp26_->job;
+			_tmp26_ = _tmp25_->job;
 #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp28_ = _batch_import_job_ref0 (_tmp27_);
+			_tmp27_ = _batch_import_job_ref0 (_tmp26_);
 #line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			job = _tmp28_;
+			job = _tmp27_;
 #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp29_ = file_to_prepare;
+			_tmp28_ = file_to_prepare;
 #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp30_ = _tmp29_->file;
+			_tmp29_ = _tmp28_->file;
 #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp31_ = _g_object_ref0 (_tmp30_);
+			_tmp30_ = _g_object_ref0 (_tmp29_);
 #line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			file = _tmp31_;
+			file = _tmp30_;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = file_to_prepare;
+			_tmp32_ = file_to_prepare;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = _tmp33_->associated;
+			_tmp33_ = _tmp32_->associated;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp34_ != NULL) {
-#line 13673 "BatchImport.c"
+			if (_tmp33_ != NULL) {
+#line 14264 "BatchImport.c"
+				FileToPrepare* _tmp34_;
 				FileToPrepare* _tmp35_;
-				FileToPrepare* _tmp36_;
-				GFile* _tmp37_;
+				GFile* _tmp36_;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp35_ = file_to_prepare;
+				_tmp34_ = file_to_prepare;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp36_ = _tmp35_->associated;
+				_tmp35_ = _tmp34_->associated;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp37_ = _tmp36_->file;
+				_tmp36_ = _tmp35_->file;
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = _tmp37_;
-#line 13685 "BatchImport.c"
+				_tmp31_ = _tmp36_;
+#line 14276 "BatchImport.c"
 			} else {
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = NULL;
-#line 13689 "BatchImport.c"
+				_tmp31_ = NULL;
+#line 14280 "BatchImport.c"
 			}
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp38_ = _g_object_ref0 (_tmp32_);
+			_tmp37_ = _g_object_ref0 (_tmp31_);
 #line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			associated = _tmp38_;
+			associated = _tmp37_;
 #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = file_to_prepare;
+			_tmp38_ = file_to_prepare;
 #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp40_ = _tmp39_->copy_to_library;
+			_tmp39_ = _tmp38_->copy_to_library;
 #line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			copy_to_library = _tmp40_;
+			copy_to_library = _tmp39_;
 #line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = file;
+			_tmp40_ = file;
 #line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp41_ == NULL) {
-#line 13705 "BatchImport.c"
-				BatchImportJob* _tmp42_;
-				GFile* _tmp43_ = NULL;
-				gboolean _tmp44_ = FALSE;
-				gboolean _tmp45_;
+			if (_tmp40_ == NULL) {
+#line 14296 "BatchImport.c"
+				BatchImportJob* _tmp41_;
+				GFile* _tmp42_ = NULL;
+				gboolean _tmp43_ = FALSE;
+				gboolean _tmp44_;
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp42_ = job;
+				_tmp41_ = job;
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp45_ = prepare_files_job_create_file (self, _tmp42_, &_tmp43_, &_tmp44_);
+				_tmp44_ = prepare_files_job_create_file (self, _tmp41_, &_tmp42_, &_tmp43_);
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (file);
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				file = _tmp43_;
+				file = _tmp42_;
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				copy_to_library = _tmp44_;
+				copy_to_library = _tmp43_;
 #line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!_tmp45_) {
+				if (!_tmp44_) {
 #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (associated);
 #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13735,204 +14326,204 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 					_file_to_prepare_unref0 (file_to_prepare);
 #line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13732 "BatchImport.c"
+#line 14323 "BatchImport.c"
 				}
 			}
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp47_ = associated;
+			_tmp46_ = associated;
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp47_ == NULL) {
-#line 13739 "BatchImport.c"
+			if (_tmp46_ == NULL) {
+#line 14330 "BatchImport.c"
+				FileToPrepare* _tmp47_;
 				FileToPrepare* _tmp48_;
-				FileToPrepare* _tmp49_;
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp48_ = file_to_prepare;
+				_tmp47_ = file_to_prepare;
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp49_ = _tmp48_->associated;
+				_tmp48_ = _tmp47_->associated;
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp46_ = _tmp49_ != NULL;
-#line 13748 "BatchImport.c"
+				_tmp45_ = _tmp48_ != NULL;
+#line 14339 "BatchImport.c"
 			} else {
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp46_ = FALSE;
-#line 13752 "BatchImport.c"
+				_tmp45_ = FALSE;
+#line 14343 "BatchImport.c"
 			}
 #line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp46_) {
-#line 13756 "BatchImport.c"
+			if (_tmp45_) {
+#line 14347 "BatchImport.c"
+				FileToPrepare* _tmp49_;
 				FileToPrepare* _tmp50_;
-				FileToPrepare* _tmp51_;
-				BatchImportJob* _tmp52_;
-				GFile* _tmp53_ = NULL;
-				gboolean _tmp54_ = FALSE;
+				BatchImportJob* _tmp51_;
+				GFile* _tmp52_ = NULL;
+				gboolean _tmp53_ = FALSE;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp50_ = file_to_prepare;
+				_tmp49_ = file_to_prepare;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp51_ = _tmp50_->associated;
+				_tmp50_ = _tmp49_->associated;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp52_ = _tmp51_->job;
+				_tmp51_ = _tmp50_->job;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				prepare_files_job_create_file (self, _tmp52_, &_tmp53_, &_tmp54_);
+				prepare_files_job_create_file (self, _tmp51_, &_tmp52_, &_tmp53_);
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (associated);
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				associated = _tmp53_;
+				associated = _tmp52_;
 #line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				copy_to_library = _tmp54_;
-#line 13776 "BatchImport.c"
+				copy_to_library = _tmp53_;
+#line 14367 "BatchImport.c"
 			}
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp55_ = job;
+			_tmp54_ = job;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp56_ = file;
+			_tmp55_ = file;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp57_ = associated;
+			_tmp56_ = associated;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp58_ = copy_to_library;
+			_tmp57_ = copy_to_library;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp60_ = prepare_files_job_prepare_file (self, _tmp55_, _tmp56_, _tmp57_, _tmp58_, &_tmp59_);
+			_tmp59_ = prepare_files_job_prepare_file (self, _tmp54_, _tmp55_, _tmp56_, _tmp57_, &_tmp58_);
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			prepared_file = _tmp59_;
+			prepared_file = _tmp58_;
 #line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_result_ = _tmp60_;
+			_result_ = _tmp59_;
 #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp61_ = _result_;
+			_tmp60_ = _result_;
 #line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp61_ == IMPORT_RESULT_SUCCESS) {
-#line 13798 "BatchImport.c"
-				gint _tmp62_;
-				GeeArrayList* _tmp63_;
-				PreparedFile* _tmp64_;
+			if (_tmp60_ == IMPORT_RESULT_SUCCESS) {
+#line 14389 "BatchImport.c"
+				gint _tmp61_;
+				GeeArrayList* _tmp62_;
+				PreparedFile* _tmp63_;
 #line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp62_ = self->prepared_files;
+				_tmp61_ = self->prepared_files;
 #line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				self->prepared_files = _tmp62_ + 1;
+				self->prepared_files = _tmp61_ + 1;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = list;
+				_tmp62_ = list;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp64_ = prepared_file;
+				_tmp63_ = prepared_file;
 #line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_);
-#line 13812 "BatchImport.c"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp63_);
+#line 14403 "BatchImport.c"
 			} else {
-				BatchImportJob* _tmp65_;
-				GFile* _tmp66_;
-				BatchImportJob* _tmp67_;
+				BatchImportJob* _tmp64_;
+				GFile* _tmp65_;
+				BatchImportJob* _tmp66_;
+				gchar* _tmp67_;
 				gchar* _tmp68_;
-				gchar* _tmp69_;
-				GFile* _tmp70_;
+				GFile* _tmp69_;
+				gchar* _tmp70_;
 				gchar* _tmp71_;
-				gchar* _tmp72_;
-				ImportResult _tmp73_;
+				ImportResult _tmp72_;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp65_ = job;
+				_tmp64_ = job;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp66_ = file;
+				_tmp65_ = file;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp67_ = job;
+				_tmp66_ = job;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp68_ = batch_import_job_get_source_identifier (_tmp67_);
+				_tmp67_ = batch_import_job_get_source_identifier (_tmp66_);
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp69_ = _tmp68_;
+				_tmp68_ = _tmp67_;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp70_ = file;
+				_tmp69_ = file;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp71_ = g_file_get_path (_tmp70_);
+				_tmp70_ = g_file_get_path (_tmp69_);
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp72_ = _tmp71_;
+				_tmp71_ = _tmp70_;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp73_ = _result_;
+				_tmp72_ = _result_;
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp65_, _tmp66_, _tmp69_, _tmp72_, _tmp73_);
+				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp64_, _tmp65_, _tmp68_, _tmp71_, _tmp72_);
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp72_);
+				_g_free0 (_tmp71_);
 #line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp69_);
-#line 13847 "BatchImport.c"
+				_g_free0 (_tmp68_);
+#line 14438 "BatchImport.c"
 			}
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp75_ = list;
+			_tmp74_ = list;
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp77_ = _tmp76_;
+			_tmp76_ = _tmp75_;
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) {
+			if (_tmp76_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) {
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp74_ = TRUE;
-#line 13859 "BatchImport.c"
+				_tmp73_ = TRUE;
+#line 14450 "BatchImport.c"
 			} else {
-				gboolean _tmp78_ = FALSE;
-				GTimer* _tmp79_;
-				gdouble _tmp80_;
+				gboolean _tmp77_ = FALSE;
+				GTimer* _tmp78_;
+				gdouble _tmp79_;
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp79_ = timer;
+				_tmp78_ = timer;
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp80_ = g_timer_elapsed (_tmp79_, NULL);
+				_tmp79_ = g_timer_elapsed (_tmp78_, NULL);
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
-#line 13870 "BatchImport.c"
-					GeeArrayList* _tmp81_;
+				if ((_tmp79_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
+#line 14461 "BatchImport.c"
+					GeeArrayList* _tmp80_;
+					gint _tmp81_;
 					gint _tmp82_;
-					gint _tmp83_;
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp81_ = list;
+					_tmp80_ = list;
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp83_ = _tmp82_;
+					_tmp82_ = _tmp81_;
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp78_ = _tmp83_ > 0;
-#line 13882 "BatchImport.c"
+					_tmp77_ = _tmp82_ > 0;
+#line 14473 "BatchImport.c"
 				} else {
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp78_ = FALSE;
-#line 13886 "BatchImport.c"
+					_tmp77_ = FALSE;
+#line 14477 "BatchImport.c"
 				}
 #line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp74_ = _tmp78_;
-#line 13890 "BatchImport.c"
+				_tmp73_ = _tmp77_;
+#line 14481 "BatchImport.c"
 			}
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp74_) {
-#line 13894 "BatchImport.c"
+			if (_tmp73_) {
+#line 14485 "BatchImport.c"
 				PreparedFileCluster* cluster = NULL;
-				GeeArrayList* _tmp84_;
-				PreparedFileCluster* _tmp85_;
-				GeeArrayList* _tmp86_;
-				NotificationCallback _tmp87_;
-				void* _tmp87__target;
-				PreparedFileCluster* _tmp88_;
-				GTimer* _tmp89_;
+				GeeArrayList* _tmp83_;
+				PreparedFileCluster* _tmp84_;
+				GeeArrayList* _tmp85_;
+				NotificationCallback _tmp86_;
+				void* _tmp86__target;
+				PreparedFileCluster* _tmp87_;
+				GTimer* _tmp88_;
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp84_ = list;
+				_tmp83_ = list;
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp85_ = prepared_file_cluster_new (_tmp84_);
+				_tmp84_ = prepared_file_cluster_new (_tmp83_);
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				cluster = _tmp85_;
+				cluster = _tmp84_;
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
+				_tmp85_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (list);
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				list = _tmp86_;
+				list = _tmp85_;
 #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp87_ = self->priv->notification;
+				_tmp86_ = self->priv->notification;
 #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp87__target = self->priv->notification_target;
+				_tmp86__target = self->priv->notification_target;
 #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp88_ = cluster;
+				_tmp87_ = cluster;
 #line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp87_, _tmp87__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
+				background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp86_, _tmp86__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
 #line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp89_ = timer;
+				_tmp88_ = timer;
 #line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_timer_start (_tmp89_);
+				g_timer_start (_tmp88_);
 #line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_notification_object_unref0 (cluster);
-#line 13929 "BatchImport.c"
+#line 14520 "BatchImport.c"
 			}
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
@@ -13944,192 +14535,189 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			_batch_import_job_unref0 (job);
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (file_to_prepare);
-#line 13941 "BatchImport.c"
+#line 14532 "BatchImport.c"
 		}
 #line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_file_to_prepare_list);
-#line 13945 "BatchImport.c"
+#line 14536 "BatchImport.c"
 	}
 #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp90_ = list;
+	_tmp89_ = list;
 #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp90_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp92_ = _tmp91_;
+	_tmp91_ = _tmp90_;
 #line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp92_ > 0) {
-#line 13955 "BatchImport.c"
+	if (_tmp91_ > 0) {
+#line 14546 "BatchImport.c"
 		ImportResult _result_ = 0;
-		ImportResult _tmp93_;
-		ImportResult _tmp94_;
+		ImportResult _tmp92_;
 #line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp93_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_result_ = _tmp93_;
+		_result_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
 #line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp94_ = _result_;
+		_tmp92_ = _result_;
 #line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp94_ == IMPORT_RESULT_SUCCESS) {
-#line 13967 "BatchImport.c"
-			NotificationCallback _tmp95_;
-			void* _tmp95__target;
-			GeeArrayList* _tmp96_;
-			PreparedFileCluster* _tmp97_;
-			PreparedFileCluster* _tmp98_;
+		if (_tmp92_ == IMPORT_RESULT_SUCCESS) {
+#line 14555 "BatchImport.c"
+			NotificationCallback _tmp93_;
+			void* _tmp93__target;
+			GeeArrayList* _tmp94_;
+			PreparedFileCluster* _tmp95_;
+			PreparedFileCluster* _tmp96_;
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp95_ = self->priv->notification;
+			_tmp93_ = self->priv->notification;
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp95__target = self->priv->notification_target;
+			_tmp93__target = self->priv->notification_target;
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp96_ = list;
+			_tmp94_ = list;
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp97_ = prepared_file_cluster_new (_tmp96_);
+			_tmp95_ = prepared_file_cluster_new (_tmp94_);
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp98_ = _tmp97_;
+			_tmp96_ = _tmp95_;
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
+			background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp93_, _tmp93__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
 #line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_notification_object_unref0 (_tmp98_);
-#line 13987 "BatchImport.c"
+			_notification_object_unref0 (_tmp96_);
+#line 14575 "BatchImport.c"
 		} else {
+			gint _tmp97_;
+			GeeArrayList* _tmp98_;
 			gint _tmp99_;
-			GeeArrayList* _tmp100_;
+			gint _tmp100_;
 			gint _tmp101_;
-			gint _tmp102_;
+			GeeArrayList* _tmp102_;
 			gint _tmp103_;
-			GeeArrayList* _tmp104_;
-			gint _tmp105_;
-			gint _tmp106_;
+			gint _tmp104_;
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp99_ = self->prepared_files;
+			_tmp97_ = self->prepared_files;
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp100_ = list;
+			_tmp98_ = list;
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp99_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp102_ = _tmp101_;
+			_tmp100_ = _tmp99_;
 #line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_vala_assert (_tmp99_ >= _tmp102_, "prepared_files >= list.size");
+			_vala_assert (_tmp97_ >= _tmp100_, "prepared_files >= list.size");
 #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp103_ = self->prepared_files;
+			_tmp101_ = self->prepared_files;
 #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp104_ = list;
+			_tmp102_ = list;
 #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp103_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp106_ = _tmp105_;
+			_tmp104_ = _tmp103_;
 #line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			self->prepared_files = _tmp103_ - _tmp106_;
-#line 14017 "BatchImport.c"
+			self->prepared_files = _tmp101_ - _tmp104_;
+#line 14605 "BatchImport.c"
 			{
 				GeeArrayList* _prepared_file_list = NULL;
-				GeeArrayList* _tmp107_;
-				GeeArrayList* _tmp108_;
+				GeeArrayList* _tmp105_;
+				GeeArrayList* _tmp106_;
 				gint _prepared_file_size = 0;
-				GeeArrayList* _tmp109_;
-				gint _tmp110_;
-				gint _tmp111_;
+				GeeArrayList* _tmp107_;
+				gint _tmp108_;
+				gint _tmp109_;
 				gint _prepared_file_index = 0;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp107_ = list;
+				_tmp105_ = list;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp108_ = _g_object_ref0 (_tmp107_);
+				_tmp106_ = _g_object_ref0 (_tmp105_);
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_prepared_file_list = _tmp108_;
+				_prepared_file_list = _tmp106_;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp109_ = _prepared_file_list;
+				_tmp107_ = _prepared_file_list;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+				_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp111_ = _tmp110_;
+				_tmp109_ = _tmp108_;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_prepared_file_size = _tmp111_;
+				_prepared_file_size = _tmp109_;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_index = -1;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				while (TRUE) {
-#line 14045 "BatchImport.c"
+#line 14633 "BatchImport.c"
+					gint _tmp110_;
+					gint _tmp111_;
 					gint _tmp112_;
-					gint _tmp113_;
-					gint _tmp114_;
 					PreparedFile* prepared_file = NULL;
-					GeeArrayList* _tmp115_;
-					gint _tmp116_;
-					gpointer _tmp117_;
+					GeeArrayList* _tmp113_;
+					gint _tmp114_;
+					gpointer _tmp115_;
+					PreparedFile* _tmp116_;
+					BatchImportJob* _tmp117_;
 					PreparedFile* _tmp118_;
-					BatchImportJob* _tmp119_;
+					GFile* _tmp119_;
 					PreparedFile* _tmp120_;
-					GFile* _tmp121_;
-					PreparedFile* _tmp122_;
-					BatchImportJob* _tmp123_;
-					gchar* _tmp124_;
-					gchar* _tmp125_;
-					PreparedFile* _tmp126_;
-					GFile* _tmp127_;
-					gchar* _tmp128_;
-					gchar* _tmp129_;
-					ImportResult _tmp130_;
+					BatchImportJob* _tmp121_;
+					gchar* _tmp122_;
+					gchar* _tmp123_;
+					PreparedFile* _tmp124_;
+					GFile* _tmp125_;
+					gchar* _tmp126_;
+					gchar* _tmp127_;
+					ImportResult _tmp128_;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp112_ = _prepared_file_index;
+					_tmp110_ = _prepared_file_index;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_prepared_file_index = _tmp112_ + 1;
+					_prepared_file_index = _tmp110_ + 1;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp113_ = _prepared_file_index;
+					_tmp111_ = _prepared_file_index;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp114_ = _prepared_file_size;
+					_tmp112_ = _prepared_file_size;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					if (!(_tmp113_ < _tmp114_)) {
+					if (!(_tmp111_ < _tmp112_)) {
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 14078 "BatchImport.c"
+#line 14666 "BatchImport.c"
 					}
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp115_ = _prepared_file_list;
+					_tmp113_ = _prepared_file_list;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp116_ = _prepared_file_index;
+					_tmp114_ = _prepared_file_index;
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp117_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp116_);
+					_tmp115_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp114_);
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					prepared_file = (PreparedFile*) _tmp117_;
+					prepared_file = (PreparedFile*) _tmp115_;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp118_ = prepared_file;
+					_tmp116_ = prepared_file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp119_ = _tmp118_->job;
+					_tmp117_ = _tmp116_->job;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp120_ = prepared_file;
+					_tmp118_ = prepared_file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp121_ = _tmp120_->file;
+					_tmp119_ = _tmp118_->file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp122_ = prepared_file;
+					_tmp120_ = prepared_file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp123_ = _tmp122_->job;
+					_tmp121_ = _tmp120_->job;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp124_ = batch_import_job_get_source_identifier (_tmp123_);
+					_tmp122_ = batch_import_job_get_source_identifier (_tmp121_);
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp125_ = _tmp124_;
+					_tmp123_ = _tmp122_;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp126_ = prepared_file;
+					_tmp124_ = prepared_file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp127_ = _tmp126_->file;
+					_tmp125_ = _tmp124_->file;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp128_ = g_file_get_path (_tmp127_);
+					_tmp126_ = g_file_get_path (_tmp125_);
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp129_ = _tmp128_;
+					_tmp127_ = _tmp126_;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp130_ = _result_;
+					_tmp128_ = _result_;
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp119_, _tmp121_, _tmp125_, _tmp129_, _tmp130_);
+					background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp117_, _tmp119_, _tmp123_, _tmp127_, _tmp128_);
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_free0 (_tmp129_);
+					_g_free0 (_tmp127_);
 #line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_g_free0 (_tmp125_);
+					_g_free0 (_tmp123_);
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_unref0 (prepared_file);
-#line 14122 "BatchImport.c"
+#line 14710 "BatchImport.c"
 				}
 #line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_prepared_file_list);
-#line 14126 "BatchImport.c"
+#line 14714 "BatchImport.c"
 			}
 		}
 	}
@@ -14137,11 +14725,16 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 	_g_object_unref0 (list);
 #line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_timer_destroy0 (timer);
-#line 14134 "BatchImport.c"
+#line 14722 "BatchImport.c"
 }
 
 
-static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImportJob* job, GFile* * file, gboolean* copy_to_library) {
+static gboolean
+prepare_files_job_create_file (PrepareFilesJob* self,
+                               BatchImportJob* job,
+                               GFile* * file,
+                               gboolean* copy_to_library)
+{
 	GFile* _vala_file = NULL;
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
@@ -14150,121 +14743,100 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE);
 #line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE);
-#line 14147 "BatchImport.c"
+#line 14740 "BatchImport.c"
 	{
 		gboolean _tmp0_ = FALSE;
-		BatchImportJob* _tmp1_;
-		GFile* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_;
-#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp1_ = job;
+		GFile* _tmp1_ = NULL;
+		gboolean _tmp2_ = FALSE;
+		gboolean _tmp3_;
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = batch_import_job_prepare (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_);
+		_tmp3_ = batch_import_job_prepare (job, &_tmp1_, &_tmp2_, &_inner_error_);
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_file = _tmp2_;
+		_vala_file = _tmp1_;
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_copy_to_library = _tmp3_;
+		_vala_copy_to_library = _tmp2_;
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp0_ = _tmp4_;
+		_tmp0_ = _tmp3_;
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14168 "BatchImport.c"
+#line 14758 "BatchImport.c"
 			goto __catch429_g_error;
 		}
 #line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
-#line 14173 "BatchImport.c"
-			BatchImportJob* _tmp5_;
-			BatchImportJob* _tmp6_;
+#line 14763 "BatchImport.c"
+			gchar* _tmp4_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
 			gchar* _tmp7_;
-			gchar* _tmp8_;
-			BatchImportJob* _tmp9_;
-			gchar* _tmp10_;
-			gchar* _tmp11_;
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = job;
+			_tmp4_ = batch_import_job_get_source_identifier (job);
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp6_ = job;
+			_tmp5_ = _tmp4_;
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp7_ = batch_import_job_get_source_identifier (_tmp6_);
+			_tmp6_ = batch_import_job_get_dest_identifier (job);
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp8_ = _tmp7_;
+			_tmp7_ = _tmp6_;
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp9_ = job;
+			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp5_, _tmp7_, IMPORT_RESULT_FILE_ERROR);
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp10_ = batch_import_job_get_dest_identifier (_tmp9_);
+			_g_free0 (_tmp7_);
 #line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp11_ = _tmp10_;
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp5_, NULL, _tmp8_, _tmp11_, IMPORT_RESULT_FILE_ERROR);
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp11_);
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp8_);
+			_g_free0 (_tmp5_);
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = FALSE;
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (file) {
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*file = _vala_file;
-#line 14207 "BatchImport.c"
+#line 14788 "BatchImport.c"
 			} else {
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_vala_file);
-#line 14211 "BatchImport.c"
+#line 14792 "BatchImport.c"
 			}
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (copy_to_library) {
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 14217 "BatchImport.c"
+#line 14798 "BatchImport.c"
 			}
 #line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14221 "BatchImport.c"
+#line 14802 "BatchImport.c"
 		}
 	}
 	goto __finally429;
 	__catch429_g_error:
 	{
 		GError* err = NULL;
-		BatchImportJob* _tmp12_;
-		BatchImportJob* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-		BatchImportJob* _tmp16_;
-		gchar* _tmp17_;
-		gchar* _tmp18_;
-		GError* _tmp19_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		GError* _tmp12_;
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = job;
+		_tmp8_ = batch_import_job_get_source_identifier (job);
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = job;
-#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp14_ = batch_import_job_get_source_identifier (_tmp13_);
-#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = _tmp14_;
-#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = job;
+		_tmp9_ = _tmp8_;
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = batch_import_job_get_dest_identifier (_tmp16_);
+		_tmp10_ = batch_import_job_get_dest_identifier (job);
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = _tmp17_;
+		_tmp11_ = _tmp10_;
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = err;
+		_tmp12_ = err;
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp12_, NULL, _tmp15_, _tmp18_, _tmp19_, IMPORT_RESULT_FILE_ERROR);
+		background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), job, NULL, _tmp9_, _tmp11_, _tmp12_, IMPORT_RESULT_FILE_ERROR);
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp18_);
+		_g_free0 (_tmp11_);
 #line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp9_);
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14273,34 +14845,34 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		if (file) {
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*file = _vala_file;
-#line 14270 "BatchImport.c"
+#line 14842 "BatchImport.c"
 		} else {
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_vala_file);
-#line 14274 "BatchImport.c"
+#line 14846 "BatchImport.c"
 		}
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (copy_to_library) {
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 14280 "BatchImport.c"
+#line 14852 "BatchImport.c"
 		}
 #line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14284 "BatchImport.c"
+#line 14856 "BatchImport.c"
 	}
 	__finally429:
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14289 "BatchImport.c"
-		gboolean _tmp20_ = FALSE;
+#line 14861 "BatchImport.c"
+		gboolean _tmp13_ = FALSE;
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
 #line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		return _tmp20_;
-#line 14297 "BatchImport.c"
+		return _tmp13_;
+#line 14869 "BatchImport.c"
 	}
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
@@ -14308,67 +14880,62 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 	if (file) {
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 14305 "BatchImport.c"
+#line 14877 "BatchImport.c"
 	} else {
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 14309 "BatchImport.c"
+#line 14881 "BatchImport.c"
 	}
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy_to_library) {
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 14315 "BatchImport.c"
+#line 14887 "BatchImport.c"
 	}
 #line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 14319 "BatchImport.c"
+#line 14891 "BatchImport.c"
 }
 
 
-static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, BatchImportJob* job, GFile* file, GFile* associated_file, gboolean copy_to_library, PreparedFile* * prepared_file) {
+static ImportResult
+prepare_files_job_prepare_file (PrepareFilesJob* self,
+                                BatchImportJob* job,
+                                GFile* file,
+                                GFile* associated_file,
+                                gboolean copy_to_library,
+                                PreparedFile* * prepared_file)
+{
 	PreparedFile* _vala_prepared_file = NULL;
 	ImportResult result = 0;
 	gboolean is_video = FALSE;
-	GFile* _tmp0_;
+	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_;
-	gint _tmp10_;
-	gint _tmp11_;
-	gint _tmp14_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp8_;
 	gchar* exif_only_md5 = NULL;
 	gchar* thumbnail_md5 = NULL;
 	gchar* full_md5 = NULL;
 	PhotoFileFormat file_format = 0;
-	GFile* _tmp28_;
-	PhotoFileFormat _tmp29_;
-	gboolean _tmp30_;
+	gboolean _tmp19_;
 	guint64 filesize = 0ULL;
 	gboolean is_in_library_dir = FALSE;
-	GFile* _tmp68_;
-	GFile* _tmp69_;
-	gboolean _tmp70_;
-	gboolean _tmp71_ = FALSE;
-	gboolean _tmp72_;
-	BatchImportJob* _tmp74_;
-	GFile* _tmp75_;
-	GFile* _tmp76_;
-	BatchImportJob* _tmp77_;
-	gchar* _tmp78_;
-	gchar* _tmp79_;
-	BatchImportJob* _tmp80_;
-	gchar* _tmp81_;
-	gchar* _tmp82_;
-	const gchar* _tmp83_;
-	const gchar* _tmp84_;
-	const gchar* _tmp85_;
-	PhotoFileFormat _tmp86_;
-	guint64 _tmp87_;
-	gboolean _tmp88_;
-	PreparedFile* _tmp89_;
+	GFile* _tmp50_;
+	gboolean _tmp51_ = FALSE;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	const gchar* _tmp57_;
+	const gchar* _tmp58_;
+	const gchar* _tmp59_;
+	PhotoFileFormat _tmp60_;
+	guint64 _tmp61_;
+	gboolean _tmp62_;
+	PreparedFile* _tmp63_;
 	GError * _inner_error_ = NULL;
 #line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), 0);
@@ -14383,147 +14950,129 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_prepared_file = NULL;
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = file;
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	is_video = _tmp1_;
+	is_video = video_reader_is_supported_video_file (file);
 #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = is_video;
+	_tmp1_ = is_video;
 #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (!_tmp3_) {
-#line 14389 "BatchImport.c"
-		GFile* _tmp4_;
-		gboolean _tmp5_;
-#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp4_ = file;
+	if (!_tmp1_) {
 #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp5_ = photo_is_file_image (_tmp4_);
-#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = !_tmp5_;
-#line 14398 "BatchImport.c"
+		_tmp0_ = !photo_is_file_image (file);
+#line 14954 "BatchImport.c"
 	} else {
 #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp2_ = FALSE;
-#line 14402 "BatchImport.c"
+		_tmp0_ = FALSE;
+#line 14958 "BatchImport.c"
 	}
 #line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp2_) {
+	if (_tmp0_) {
 #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
 #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
 #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14412 "BatchImport.c"
+#line 14968 "BatchImport.c"
 		} else {
 #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14416 "BatchImport.c"
+#line 14972 "BatchImport.c"
 		}
 #line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14420 "BatchImport.c"
+#line 14976 "BatchImport.c"
 	}
 #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = is_video;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (!_tmp7_) {
-#line 14426 "BatchImport.c"
-		GFile* _tmp8_;
-		gboolean _tmp9_;
-#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = file;
+	_tmp3_ = is_video;
 #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = photo_file_format_is_file_supported (_tmp8_);
+	if (!_tmp3_) {
 #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = !_tmp9_;
-#line 14435 "BatchImport.c"
+		_tmp2_ = !photo_file_format_is_file_supported (file);
+#line 14984 "BatchImport.c"
 	} else {
 #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = FALSE;
-#line 14439 "BatchImport.c"
+		_tmp2_ = FALSE;
+#line 14988 "BatchImport.c"
 	}
 #line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp6_) {
+	if (_tmp2_) {
 #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
 #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
 #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14449 "BatchImport.c"
+#line 14998 "BatchImport.c"
 		} else {
 #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14453 "BatchImport.c"
+#line 15002 "BatchImport.c"
 		}
 #line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14457 "BatchImport.c"
+#line 15006 "BatchImport.c"
 	}
 #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = self->priv->import_file_count;
+	_tmp4_ = self->priv->import_file_count;
 #line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->import_file_count = _tmp10_ + 1;
+	self->priv->import_file_count = _tmp4_ + 1;
 #line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = self->priv->fail_every;
+	_tmp5_ = self->priv->fail_every;
 #line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp11_ > 0) {
-#line 14467 "BatchImport.c"
-		gint _tmp12_;
-		gint _tmp13_;
+	if (_tmp5_ > 0) {
+#line 15016 "BatchImport.c"
+		gint _tmp6_;
+		gint _tmp7_;
 #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp12_ = self->priv->import_file_count;
+		_tmp6_ = self->priv->import_file_count;
 #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp13_ = self->priv->fail_every;
+		_tmp7_ = self->priv->fail_every;
 #line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if ((_tmp12_ % _tmp13_) == 0) {
+		if ((_tmp6_ % _tmp7_) == 0) {
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14482 "BatchImport.c"
+#line 15031 "BatchImport.c"
 			} else {
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14486 "BatchImport.c"
+#line 15035 "BatchImport.c"
 			}
 #line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14490 "BatchImport.c"
+#line 15039 "BatchImport.c"
 		}
 	}
 #line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = self->priv->skip_every;
+	_tmp8_ = self->priv->skip_every;
 #line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp14_ > 0) {
-#line 14497 "BatchImport.c"
-		gint _tmp15_;
-		gint _tmp16_;
+	if (_tmp8_ > 0) {
+#line 15046 "BatchImport.c"
+		gint _tmp9_;
+		gint _tmp10_;
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp15_ = self->priv->import_file_count;
+		_tmp9_ = self->priv->import_file_count;
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp16_ = self->priv->skip_every;
+		_tmp10_ = self->priv->skip_every;
 #line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if ((_tmp15_ % _tmp16_) == 0) {
+		if ((_tmp9_ % _tmp10_) == 0) {
 #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_NOT_A_FILE;
 #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
 #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14512 "BatchImport.c"
+#line 15061 "BatchImport.c"
 			} else {
 #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14516 "BatchImport.c"
+#line 15065 "BatchImport.c"
 			}
 #line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14520 "BatchImport.c"
+#line 15069 "BatchImport.c"
 		}
 	}
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14532,70 +15081,61 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	thumbnail_md5 = NULL;
 #line 1832 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	full_md5 = NULL;
-#line 14529 "BatchImport.c"
+#line 15078 "BatchImport.c"
 	{
-		gchar* _tmp17_ = NULL;
-		GFile* _tmp18_;
-		gchar* _tmp19_;
-		gchar* _tmp20_;
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp18_ = file;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp19_ = md5_file (_tmp18_, &_inner_error_);
+		_tmp12_ = md5_file (file, &_inner_error_);
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = _tmp19_;
+		_tmp11_ = _tmp12_;
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14543 "BatchImport.c"
+#line 15089 "BatchImport.c"
 			goto __catch430_g_error;
 		}
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp20_ = _tmp17_;
+		_tmp13_ = _tmp11_;
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp17_ = NULL;
+		_tmp11_ = NULL;
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
 #line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		full_md5 = _tmp20_;
+		full_md5 = _tmp13_;
 #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp17_);
-#line 14556 "BatchImport.c"
+		_g_free0 (_tmp11_);
+#line 15102 "BatchImport.c"
 	}
 	goto __finally430;
 	__catch430_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp21_;
-		gchar* _tmp22_;
-		gchar* _tmp23_;
-		GError* _tmp24_;
-		const gchar* _tmp25_;
-		GError* _tmp26_;
-		ImportResult _tmp27_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GError* _tmp16_;
+		const gchar* _tmp17_;
+		GError* _tmp18_;
 #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
 #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp21_ = file;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp22_ = g_file_get_path (_tmp21_);
+		_tmp14_ = g_file_get_path (file);
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp23_ = _tmp22_;
+		_tmp15_ = _tmp14_;
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp24_ = err;
+		_tmp16_ = err;
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp25_ = _tmp24_->message;
+		_tmp17_ = _tmp16_->message;
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1840: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_);
+		g_warning ("BatchImport.vala:1840: Unable to perform MD5 checksum on file %s: %s", _tmp15_, _tmp17_);
 #line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp23_);
-#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp26_ = err;
+		_g_free0 (_tmp15_);
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp27_ = import_result_convert_error (_tmp26_, IMPORT_RESULT_FILE_ERROR);
+		_tmp18_ = err;
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		result = _tmp27_;
+		result = import_result_convert_error (_tmp18_, IMPORT_RESULT_FILE_ERROR);
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14608,15 +15148,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14605 "BatchImport.c"
+#line 15145 "BatchImport.c"
 		} else {
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14609 "BatchImport.c"
+#line 15149 "BatchImport.c"
 		}
 #line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14613 "BatchImport.c"
+#line 15153 "BatchImport.c"
 	}
 	__finally430:
 #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14633,47 +15173,39 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		g_clear_error (&_inner_error_);
 #line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 14630 "BatchImport.c"
+#line 15170 "BatchImport.c"
 	}
 #line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp28_ = file;
-#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp29_ = photo_file_format_get_by_file_extension (_tmp28_);
-#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	file_format = _tmp29_;
+	file_format = photo_file_format_get_by_file_extension (file);
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp30_ = is_video;
+	_tmp19_ = is_video;
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (!_tmp30_) {
-#line 14642 "BatchImport.c"
-		PhotoFileFormat _tmp31_;
+	if (!_tmp19_) {
+#line 15178 "BatchImport.c"
+		PhotoFileFormat _tmp20_;
 		PhotoFileReader* reader = NULL;
-		PhotoFileFormat _tmp35_;
-		GFile* _tmp36_;
-		gchar* _tmp37_;
-		gchar* _tmp38_;
-		PhotoFileReader* _tmp39_;
-		PhotoFileReader* _tmp40_;
+		PhotoFileFormat _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		PhotoFileReader* _tmp26_;
+		PhotoFileReader* _tmp27_;
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp50_;
+		PhotoMetadata* _tmp36_;
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp31_ = file_format;
+		_tmp20_ = file_format;
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 14657 "BatchImport.c"
-			GFile* _tmp32_;
-			gchar* _tmp33_;
-			gchar* _tmp34_;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp32_ = file;
+		if (_tmp20_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 15192 "BatchImport.c"
+			gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = g_file_get_path (_tmp32_);
+			_tmp21_ = g_file_get_path (file);
 #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = _tmp33_;
+			_tmp22_ = _tmp21_;
 #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1851: Skipping %s: unrecognized file extension", _tmp34_);
+			g_warning ("BatchImport.vala:1851: Skipping %s: unrecognized file extension", _tmp22_);
 #line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp34_);
+			_g_free0 (_tmp22_);
 #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
 #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14686,94 +15218,89 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			if (prepared_file) {
 #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14683 "BatchImport.c"
+#line 15215 "BatchImport.c"
 			} else {
 #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14687 "BatchImport.c"
+#line 15219 "BatchImport.c"
 			}
 #line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14691 "BatchImport.c"
+#line 15223 "BatchImport.c"
 		}
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp35_ = file_format;
+		_tmp23_ = file_format;
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp36_ = file;
+		_tmp24_ = g_file_get_path (file);
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp37_ = g_file_get_path (_tmp36_);
+		_tmp25_ = _tmp24_;
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp38_ = _tmp37_;
+		_tmp26_ = photo_file_format_create_reader (_tmp23_, _tmp25_);
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp39_ = photo_file_format_create_reader (_tmp35_, _tmp38_);
+		_tmp27_ = _tmp26_;
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp40_ = _tmp39_;
+		_g_free0 (_tmp25_);
 #line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp38_);
-#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		reader = _tmp40_;
+		reader = _tmp27_;
 #line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		metadata = NULL;
-#line 14711 "BatchImport.c"
+#line 15241 "BatchImport.c"
 		{
-			PhotoMetadata* _tmp41_ = NULL;
-			PhotoFileReader* _tmp42_;
-			PhotoMetadata* _tmp43_;
-			PhotoMetadata* _tmp44_;
+			PhotoMetadata* _tmp28_ = NULL;
+			PhotoFileReader* _tmp29_;
+			PhotoMetadata* _tmp30_;
+			PhotoMetadata* _tmp31_;
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp42_ = reader;
+			_tmp29_ = reader;
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = photo_file_reader_read_metadata (_tmp42_, &_inner_error_);
+			_tmp30_ = photo_file_reader_read_metadata (_tmp29_, &_inner_error_);
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = _tmp43_;
+			_tmp28_ = _tmp30_;
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14725 "BatchImport.c"
+#line 15255 "BatchImport.c"
 				goto __catch431_g_error;
 			}
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = _tmp41_;
+			_tmp31_ = _tmp28_;
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp41_ = NULL;
+			_tmp28_ = NULL;
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (metadata);
 #line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			metadata = _tmp44_;
+			metadata = _tmp31_;
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_media_metadata_unref0 (_tmp41_);
-#line 14738 "BatchImport.c"
+			_media_metadata_unref0 (_tmp28_);
+#line 15268 "BatchImport.c"
 		}
 		goto __finally431;
 		__catch431_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp45_;
-			gchar* _tmp46_;
-			gchar* _tmp47_;
-			GError* _tmp48_;
-			const gchar* _tmp49_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
+			GError* _tmp34_;
+			const gchar* _tmp35_;
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp45_ = file;
-#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = g_file_get_path (_tmp45_);
+			_tmp32_ = g_file_get_path (file);
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp47_ = _tmp46_;
+			_tmp33_ = _tmp32_;
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp48_ = err;
+			_tmp34_ = err;
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp49_ = _tmp48_->message;
+			_tmp35_ = _tmp34_->message;
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_warning ("BatchImport.vala:1860: Unable to read metadata for %s (%s): continuing" \
-" to attempt import", _tmp47_, _tmp49_);
+" to attempt import", _tmp33_, _tmp35_);
 #line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp47_);
+			_g_free0 (_tmp33_);
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 14769 "BatchImport.c"
+#line 15296 "BatchImport.c"
 		}
 		__finally431:
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14794,109 +15321,97 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			g_clear_error (&_inner_error_);
 #line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return 0;
-#line 14790 "BatchImport.c"
+#line 15317 "BatchImport.c"
 		}
 #line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp50_ = metadata;
+		_tmp36_ = metadata;
 #line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp50_ != NULL) {
-#line 14796 "BatchImport.c"
-			PhotoMetadata* _tmp51_;
-			gchar* _tmp52_;
-			PhotoMetadata* _tmp53_;
-			gchar* _tmp54_;
+		if (_tmp36_ != NULL) {
+#line 15323 "BatchImport.c"
+			PhotoMetadata* _tmp37_;
+			gchar* _tmp38_;
+			PhotoMetadata* _tmp39_;
+			gchar* _tmp40_;
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp51_ = metadata;
+			_tmp37_ = metadata;
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp52_ = photo_metadata_exif_hash (_tmp51_);
+			_tmp38_ = photo_metadata_exif_hash (_tmp37_);
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (exif_only_md5);
 #line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			exif_only_md5 = _tmp52_;
+			exif_only_md5 = _tmp38_;
 #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp53_ = metadata;
+			_tmp39_ = metadata;
 #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp54_ = photo_metadata_thumbnail_hash (_tmp53_);
+			_tmp40_ = photo_metadata_thumbnail_hash (_tmp39_);
 #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (thumbnail_md5);
 #line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			thumbnail_md5 = _tmp54_;
-#line 14817 "BatchImport.c"
+			thumbnail_md5 = _tmp40_;
+#line 15344 "BatchImport.c"
 		}
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_media_metadata_unref0 (metadata);
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 14823 "BatchImport.c"
+#line 15350 "BatchImport.c"
 	}
 #line 1870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	filesize = (guint64) 0;
-#line 14827 "BatchImport.c"
+#line 15354 "BatchImport.c"
 	{
-		guint64 _tmp55_ = 0ULL;
-		GFile* _tmp56_;
-		GCancellable* _tmp57_;
-		GCancellable* _tmp58_;
-		guint64 _tmp59_;
-		guint64 _tmp60_;
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp56_ = file;
+		guint64 _tmp41_ = 0ULL;
+		GCancellable* _tmp42_;
+		GCancellable* _tmp43_;
+		guint64 _tmp44_;
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp57_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+		_tmp42_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp58_ = _tmp57_;
+		_tmp43_ = _tmp42_;
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp59_ = query_total_file_size (_tmp56_, _tmp58_, &_inner_error_);
+		_tmp44_ = query_total_file_size (file, _tmp43_, &_inner_error_);
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp60_ = _tmp59_;
+		_g_object_unref0 (_tmp43_);
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp58_);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp55_ = _tmp60_;
+		_tmp41_ = _tmp44_;
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14851 "BatchImport.c"
+#line 15372 "BatchImport.c"
 			goto __catch432_g_error;
 		}
 #line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		filesize = _tmp55_;
-#line 14856 "BatchImport.c"
+		filesize = _tmp41_;
+#line 15377 "BatchImport.c"
 	}
 	goto __finally432;
 	__catch432_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp61_;
-		gchar* _tmp62_;
-		gchar* _tmp63_;
-		GError* _tmp64_;
-		const gchar* _tmp65_;
-		GError* _tmp66_;
-		ImportResult _tmp67_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		GError* _tmp47_;
+		const gchar* _tmp48_;
+		GError* _tmp49_;
 #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
 #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp61_ = file;
+		_tmp45_ = g_file_get_path (file);
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp62_ = g_file_get_path (_tmp61_);
+		_tmp46_ = _tmp45_;
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp63_ = _tmp62_;
+		_tmp47_ = err;
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp64_ = err;
+		_tmp48_ = _tmp47_->message;
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp65_ = _tmp64_->message;
+		g_warning ("BatchImport.vala:1874: Unable to query file size of %s: %s", _tmp46_, _tmp48_);
 #line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1874: Unable to query file size of %s: %s", _tmp63_, _tmp65_);
-#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp63_);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp66_ = err;
+		_g_free0 (_tmp46_);
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp67_ = import_result_convert_error (_tmp66_, IMPORT_RESULT_FILE_ERROR);
+		_tmp49_ = err;
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		result = _tmp67_;
+		result = import_result_convert_error (_tmp49_, IMPORT_RESULT_FILE_ERROR);
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14909,15 +15424,15 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		if (prepared_file) {
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14905 "BatchImport.c"
+#line 15420 "BatchImport.c"
 		} else {
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14909 "BatchImport.c"
+#line 15424 "BatchImport.c"
 		}
 #line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14913 "BatchImport.c"
+#line 15428 "BatchImport.c"
 	}
 	__finally432:
 #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14934,72 +15449,56 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		g_clear_error (&_inner_error_);
 #line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 14930 "BatchImport.c"
+#line 15445 "BatchImport.c"
 	}
 #line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp68_ = file;
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp69_ = self->priv->library_dir;
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp70_ = g_file_has_prefix (_tmp68_, _tmp69_);
+	_tmp50_ = self->priv->library_dir;
 #line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	is_in_library_dir = _tmp70_;
+	is_in_library_dir = g_file_has_prefix (file, _tmp50_);
 #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp72_ = copy_to_library;
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp72_) {
-#line 14944 "BatchImport.c"
-		gboolean _tmp73_;
+	if (copy_to_library) {
+#line 15453 "BatchImport.c"
+		gboolean _tmp52_;
 #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp73_ = is_in_library_dir;
+		_tmp52_ = is_in_library_dir;
 #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp71_ = !_tmp73_;
-#line 14950 "BatchImport.c"
+		_tmp51_ = !_tmp52_;
+#line 15459 "BatchImport.c"
 	} else {
 #line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp71_ = FALSE;
-#line 14954 "BatchImport.c"
+		_tmp51_ = FALSE;
+#line 15463 "BatchImport.c"
 	}
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp74_ = job;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp75_ = file;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp76_ = associated_file;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp77_ = job;
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp78_ = batch_import_job_get_source_identifier (_tmp77_);
-#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp79_ = _tmp78_;
+	_tmp53_ = batch_import_job_get_source_identifier (job);
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp80_ = job;
+	_tmp54_ = _tmp53_;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp81_ = batch_import_job_get_dest_identifier (_tmp80_);
+	_tmp55_ = batch_import_job_get_dest_identifier (job);
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp82_ = _tmp81_;
+	_tmp56_ = _tmp55_;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp83_ = exif_only_md5;
+	_tmp57_ = exif_only_md5;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp84_ = thumbnail_md5;
+	_tmp58_ = thumbnail_md5;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp85_ = full_md5;
+	_tmp59_ = full_md5;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp86_ = file_format;
+	_tmp60_ = file_format;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp87_ = filesize;
+	_tmp61_ = filesize;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp88_ = is_video;
+	_tmp62_ = is_video;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp89_ = prepared_file_new (_tmp74_, _tmp75_, _tmp76_, _tmp79_, _tmp82_, _tmp71_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_, _tmp88_);
+	_tmp63_ = prepared_file_new (job, file, associated_file, _tmp54_, _tmp56_, _tmp51_, _tmp57_, _tmp58_, _tmp59_, _tmp60_, _tmp61_, _tmp62_);
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (_vala_prepared_file);
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_prepared_file = _tmp89_;
+	_vala_prepared_file = _tmp63_;
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp82_);
+	_g_free0 (_tmp56_);
 #line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp79_);
+	_g_free0 (_tmp54_);
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = IMPORT_RESULT_SUCCESS;
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15012,19 +15511,21 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	if (prepared_file) {
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*prepared_file = _vala_prepared_file;
-#line 15008 "BatchImport.c"
+#line 15507 "BatchImport.c"
 	} else {
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_vala_prepared_file);
-#line 15012 "BatchImport.c"
+#line 15511 "BatchImport.c"
 	}
 #line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15016 "BatchImport.c"
+#line 15515 "BatchImport.c"
 }
 
 
-static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
+static void
+prepare_files_job_class_init (PrepareFilesJobClass * klass)
+{
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepare_files_job_parent_class = g_type_class_peek_parent (klass);
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15033,11 +15534,13 @@ static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
 	g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate));
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepare_files_job_real_execute;
-#line 15029 "BatchImport.c"
+#line 15530 "BatchImport.c"
 }
 
 
-static void prepare_files_job_instance_init (PrepareFilesJob * self) {
+static void
+prepare_files_job_instance_init (PrepareFilesJob * self)
+{
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARE_FILES_JOB_GET_PRIVATE (self);
 #line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15048,11 +15551,13 @@ static void prepare_files_job_instance_init (PrepareFilesJob * self) {
 	self->priv->fail_every = 0;
 #line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = 0;
-#line 15044 "BatchImport.c"
+#line 15547 "BatchImport.c"
 }
 
 
-static void prepare_files_job_finalize (BackgroundJob * obj) {
+static void
+prepare_files_job_finalize (BackgroundJob * obj)
+{
 	PrepareFilesJob * self;
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
@@ -15062,11 +15567,13 @@ static void prepare_files_job_finalize (BackgroundJob * obj) {
 	_g_object_unref0 (self->priv->library_dir);
 #line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj);
-#line 15058 "BatchImport.c"
+#line 15563 "BatchImport.c"
 }
 
 
-GType prepare_files_job_get_type (void) {
+GType
+prepare_files_job_get_type (void)
+{
 	static volatile gsize prepare_files_job_type_id__volatile = 0;
 	if (g_once_init_enter (&prepare_files_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PrepareFilesJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepare_files_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PrepareFilesJob), 0, (GInstanceInitFunc) prepare_files_job_instance_init, NULL };
@@ -15078,50 +15585,58 @@ GType prepare_files_job_get_type (void) {
 }
 
 
-static gpointer _prepared_file_ref0 (gpointer self) {
+static gpointer
+_prepared_file_ref0 (gpointer self)
+{
 #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? prepared_file_ref (self) : NULL;
-#line 15077 "BatchImport.c"
+#line 15586 "BatchImport.c"
 }
 
 
-static gpointer _batch_import_result_ref0 (gpointer self) {
+static gpointer
+_batch_import_result_ref0 (gpointer self)
+{
 #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_result_ref (self) : NULL;
-#line 15084 "BatchImport.c"
+#line 15595 "BatchImport.c"
 }
 
 
-static gpointer _video_import_params_ref0 (gpointer self) {
+static gpointer
+_video_import_params_ref0 (gpointer self)
+{
 #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_import_params_ref (self) : NULL;
-#line 15091 "BatchImport.c"
+#line 15604 "BatchImport.c"
 }
 
 
-static gpointer _photo_import_params_ref0 (gpointer self) {
+static gpointer
+_photo_import_params_ref0 (gpointer self)
+{
 #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_import_params_ref (self) : NULL;
-#line 15098 "BatchImport.c"
+#line 15613 "BatchImport.c"
 }
 
 
-ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
+ReadyForImport*
+ready_for_import_construct (GType object_type,
+                            GFile* final_file,
+                            PreparedFile* prepared_file,
+                            PhotoImportParams* photo_import_params,
+                            VideoImportParams* video_import_params,
+                            BatchImportResult* batch_result)
+{
 	ReadyForImport* self = NULL;
-	PreparedFile* _tmp0_;
-	gboolean _tmp1_;
-	GFile* _tmp8_;
-	GFile* _tmp9_;
-	PreparedFile* _tmp10_;
-	PreparedFile* _tmp11_;
-	BatchImportResult* _tmp12_;
-	BatchImportResult* _tmp13_;
-	VideoImportParams* _tmp14_;
-	VideoImportParams* _tmp15_;
-	PhotoImportParams* _tmp16_;
-	PhotoImportParams* _tmp17_;
-	PreparedFile* _tmp18_;
-	gboolean _tmp19_;
+	gboolean _tmp0_;
+	GFile* _tmp3_;
+	PreparedFile* _tmp4_;
+	BatchImportResult* _tmp5_;
+	VideoImportParams* _tmp6_;
+	PhotoImportParams* _tmp7_;
+	gboolean _tmp8_;
 #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (final_file), NULL);
 #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15135,116 +15650,96 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
 #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ReadyForImport*) g_type_create_instance (object_type);
 #line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = prepared_file;
+	_tmp0_ = prepared_file->is_video;
 #line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _tmp0_->is_video;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp1_) {
-#line 15136 "BatchImport.c"
-		gboolean _tmp2_ = FALSE;
-		VideoImportParams* _tmp3_;
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp3_ = video_import_params;
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp3_ != NULL) {
-#line 15143 "BatchImport.c"
-			PhotoImportParams* _tmp4_;
+	if (_tmp0_) {
+#line 15649 "BatchImport.c"
+		gboolean _tmp1_ = FALSE;
 #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = photo_import_params;
+		if (video_import_params != NULL) {
 #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = _tmp4_ == NULL;
-#line 15149 "BatchImport.c"
+			_tmp1_ = photo_import_params == NULL;
+#line 15655 "BatchImport.c"
 		} else {
 #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = FALSE;
-#line 15153 "BatchImport.c"
+			_tmp1_ = FALSE;
+#line 15659 "BatchImport.c"
 		}
 #line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)");
-#line 15157 "BatchImport.c"
+		_vala_assert (_tmp1_, "(video_import_params != null) && (photo_import_params == null)");
+#line 15663 "BatchImport.c"
 	} else {
-		gboolean _tmp5_ = FALSE;
-		VideoImportParams* _tmp6_;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = video_import_params;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp6_ == NULL) {
-#line 15165 "BatchImport.c"
-			PhotoImportParams* _tmp7_;
+		gboolean _tmp2_ = FALSE;
 #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp7_ = photo_import_params;
+		if (video_import_params == NULL) {
 #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = _tmp7_ != NULL;
-#line 15171 "BatchImport.c"
+			_tmp2_ = photo_import_params != NULL;
+#line 15670 "BatchImport.c"
 		} else {
 #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = FALSE;
-#line 15175 "BatchImport.c"
+			_tmp2_ = FALSE;
+#line 15674 "BatchImport.c"
 		}
 #line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)");
-#line 15179 "BatchImport.c"
+		_vala_assert (_tmp2_, "(video_import_params == null) && (photo_import_params != null)");
+#line 15678 "BatchImport.c"
 	}
 #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = final_file;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
+	_tmp3_ = _g_object_ref0 (final_file);
 #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->final_file);
 #line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->final_file = _tmp9_;
-#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = prepared_file;
+	self->final_file = _tmp3_;
 #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp11_ = _prepared_file_ref0 (_tmp10_);
+	_tmp4_ = _prepared_file_ref0 (prepared_file);
 #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->prepared_file);
 #line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->prepared_file = _tmp11_;
+	self->prepared_file = _tmp4_;
 #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp12_ = batch_result;
-#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp13_ = _batch_import_result_ref0 (_tmp12_);
+	_tmp5_ = _batch_import_result_ref0 (batch_result);
 #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
 #line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->batch_result = _tmp13_;
-#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp14_ = video_import_params;
+	self->batch_result = _tmp5_;
 #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp15_ = _video_import_params_ref0 (_tmp14_);
+	_tmp6_ = _video_import_params_ref0 (video_import_params);
 #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (self->video_import_params);
 #line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->video_import_params = _tmp15_;
+	self->video_import_params = _tmp6_;
 #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp16_ = photo_import_params;
-#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp17_ = _photo_import_params_ref0 (_tmp16_);
+	_tmp7_ = _photo_import_params_ref0 (photo_import_params);
 #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (self->photo_import_params);
 #line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->photo_import_params = _tmp17_;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp18_ = prepared_file;
+	self->photo_import_params = _tmp7_;
 #line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp19_ = _tmp18_->is_video;
+	_tmp8_ = prepared_file->is_video;
 #line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->is_video = _tmp19_;
+	self->is_video = _tmp8_;
 #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15229 "BatchImport.c"
+#line 15716 "BatchImport.c"
 }
 
 
-ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
+ReadyForImport*
+ready_for_import_new (GFile* final_file,
+                      PreparedFile* prepared_file,
+                      PhotoImportParams* photo_import_params,
+                      VideoImportParams* video_import_params,
+                      BatchImportResult* batch_result)
+{
 #line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result);
-#line 15236 "BatchImport.c"
+#line 15729 "BatchImport.c"
 }
 
 
-BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
+BatchImportResult*
+ready_for_import_abort (ReadyForImport* self)
+{
 	BatchImportResult* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
@@ -15270,7 +15765,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	_tmp1_ = self->final_file;
 #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15266 "BatchImport.c"
+#line 15761 "BatchImport.c"
 		GFile* _tmp2_;
 		PreparedFile* _tmp3_;
 		GFile* _tmp4_;
@@ -15282,15 +15777,15 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 		_tmp4_ = _tmp3_->file;
 #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_ != _tmp4_;
-#line 15278 "BatchImport.c"
+#line 15773 "BatchImport.c"
 	} else {
 #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 15282 "BatchImport.c"
+#line 15777 "BatchImport.c"
 	}
 #line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 15286 "BatchImport.c"
+#line 15781 "BatchImport.c"
 		GFile* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
@@ -15304,7 +15799,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 		g_debug ("BatchImport.vala:1918: Deleting aborted import copy %s", _tmp7_);
 #line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 15300 "BatchImport.c"
+#line 15795 "BatchImport.c"
 		{
 			GFile* _tmp8_;
 #line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15313,7 +15808,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			g_file_delete (_tmp8_, NULL, &_inner_error_);
 #line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15309 "BatchImport.c"
+#line 15804 "BatchImport.c"
 				goto __catch433_g_error;
 			}
 		}
@@ -15347,7 +15842,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			_g_free0 (_tmp11_);
 #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15342 "BatchImport.c"
+#line 15837 "BatchImport.c"
 		}
 		__finally433:
 #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15358,7 +15853,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			g_clear_error (&_inner_error_);
 #line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return NULL;
-#line 15353 "BatchImport.c"
+#line 15848 "BatchImport.c"
 		}
 	}
 #line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15403,18 +15898,22 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	result = _tmp28_;
 #line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15398 "BatchImport.c"
+#line 15893 "BatchImport.c"
 }
 
 
-static gpointer _thumbnails_ref0 (gpointer self) {
+static gpointer
+_thumbnails_ref0 (gpointer self)
+{
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 15405 "BatchImport.c"
+#line 15902 "BatchImport.c"
 }
 
 
-Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
+Thumbnails*
+ready_for_import_get_thumbnails (ReadyForImport* self)
+{
 	Thumbnails* result = NULL;
 	Thumbnails* _tmp0_ = NULL;
 	PhotoImportParams* _tmp1_;
@@ -15425,7 +15924,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	_tmp1_ = self->photo_import_params;
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15420 "BatchImport.c"
+#line 15919 "BatchImport.c"
 		PhotoImportParams* _tmp2_;
 		Thumbnails* _tmp3_;
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15434,7 +15933,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 		_tmp3_ = _tmp2_->thumbnails;
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 15429 "BatchImport.c"
+#line 15928 "BatchImport.c"
 	} else {
 		VideoImportParams* _tmp4_;
 		Thumbnails* _tmp5_;
@@ -15444,7 +15943,7 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 		_tmp5_ = _tmp4_->thumbnails;
 #line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 15439 "BatchImport.c"
+#line 15938 "BatchImport.c"
 	}
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _thumbnails_ref0 (_tmp0_);
@@ -15452,108 +15951,133 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	result = _tmp6_;
 #line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15447 "BatchImport.c"
+#line 15946 "BatchImport.c"
 }
 
 
-static void value_ready_for_import_init (GValue* value) {
+static void
+value_ready_for_import_init (GValue* value)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 15454 "BatchImport.c"
+#line 15955 "BatchImport.c"
 }
 
 
-static void value_ready_for_import_free_value (GValue* value) {
+static void
+value_ready_for_import_free_value (GValue* value)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (value->data[0].v_pointer);
-#line 15463 "BatchImport.c"
+#line 15966 "BatchImport.c"
 	}
 }
 
 
-static void value_ready_for_import_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_ready_for_import_copy_value (const GValue* src_value,
+                                   GValue* dest_value)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer);
-#line 15473 "BatchImport.c"
+#line 15979 "BatchImport.c"
 	} else {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 15477 "BatchImport.c"
+#line 15983 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_ready_for_import_peek_pointer (const GValue* value) {
+static gpointer
+value_ready_for_import_peek_pointer (const GValue* value)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 15485 "BatchImport.c"
+#line 15993 "BatchImport.c"
 }
 
 
-static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_ready_for_import_collect_value (GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 15492 "BatchImport.c"
+#line 16005 "BatchImport.c"
 		ReadyForImport * object;
 		object = collect_values[0].v_pointer;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 15499 "BatchImport.c"
+#line 16012 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.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 15503 "BatchImport.c"
+#line 16016 "BatchImport.c"
 		}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = ready_for_import_ref (object);
-#line 15507 "BatchImport.c"
+#line 16020 "BatchImport.c"
 	} else {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15511 "BatchImport.c"
+#line 16024 "BatchImport.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 15515 "BatchImport.c"
+#line 16028 "BatchImport.c"
 }
 
 
-static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_ready_for_import_lcopy_value (const GValue* value,
+                                    guint n_collect_values,
+                                    GTypeCValue* collect_values,
+                                    guint collect_flags)
+{
 	ReadyForImport ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 15526 "BatchImport.c"
+#line 16044 "BatchImport.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 15532 "BatchImport.c"
+#line 16050 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 15536 "BatchImport.c"
+#line 16054 "BatchImport.c"
 	} else {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = ready_for_import_ref (value->data[0].v_pointer);
-#line 15540 "BatchImport.c"
+#line 16058 "BatchImport.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 15544 "BatchImport.c"
+#line 16062 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_ready_for_import (const gchar* name,
+                             const gchar* nick,
+                             const gchar* blurb,
+                             GType object_type,
+                             GParamFlags flags)
+{
 	ParamSpecReadyForImport* spec;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_READY_FOR_IMPORT), NULL);
@@ -15563,20 +16087,25 @@ GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 15558 "BatchImport.c"
+#line 16082 "BatchImport.c"
 }
 
 
-gpointer value_get_ready_for_import (const GValue* value) {
+gpointer
+value_get_ready_for_import (const GValue* value)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL);
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 15567 "BatchImport.c"
+#line 16093 "BatchImport.c"
 }
 
 
-void value_set_ready_for_import (GValue* value, gpointer v_object) {
+void
+value_set_ready_for_import (GValue* value,
+                            gpointer v_object)
+{
 	ReadyForImport * old;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
@@ -15592,22 +16121,25 @@ void value_set_ready_for_import (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_ref (value->data[0].v_pointer);
-#line 15587 "BatchImport.c"
+#line 16116 "BatchImport.c"
 	} else {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15591 "BatchImport.c"
+#line 16120 "BatchImport.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 15597 "BatchImport.c"
+#line 16126 "BatchImport.c"
 	}
 }
 
 
-void value_take_ready_for_import (GValue* value, gpointer v_object) {
+void
+value_take_ready_for_import (GValue* value,
+                             gpointer v_object)
+{
 	ReadyForImport * old;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
@@ -15621,38 +16153,44 @@ void value_take_ready_for_import (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 15616 "BatchImport.c"
+#line 16148 "BatchImport.c"
 	} else {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15620 "BatchImport.c"
+#line 16152 "BatchImport.c"
 	}
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 15626 "BatchImport.c"
+#line 16158 "BatchImport.c"
 	}
 }
 
 
-static void ready_for_import_class_init (ReadyForImportClass * klass) {
+static void
+ready_for_import_class_init (ReadyForImportClass * klass)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	ready_for_import_parent_class = g_type_class_peek_parent (klass);
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize;
-#line 15636 "BatchImport.c"
+#line 16170 "BatchImport.c"
 }
 
 
-static void ready_for_import_instance_init (ReadyForImport * self) {
+static void
+ready_for_import_instance_init (ReadyForImport * self)
+{
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 15643 "BatchImport.c"
+#line 16179 "BatchImport.c"
 }
 
 
-static void ready_for_import_finalize (ReadyForImport * obj) {
+static void
+ready_for_import_finalize (ReadyForImport * obj)
+{
 	ReadyForImport * self;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_READY_FOR_IMPORT, ReadyForImport);
@@ -15668,11 +16206,13 @@ static void ready_for_import_finalize (ReadyForImport * obj) {
 	_video_import_params_unref0 (self->video_import_params);
 #line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 15663 "BatchImport.c"
+#line 16201 "BatchImport.c"
 }
 
 
-GType ready_for_import_get_type (void) {
+GType
+ready_for_import_get_type (void)
+{
 	static volatile gsize ready_for_import_type_id__volatile = 0;
 	if (g_once_init_enter (&ready_for_import_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_ready_for_import_init, value_ready_for_import_free_value, value_ready_for_import_copy_value, value_ready_for_import_peek_pointer, "p", value_ready_for_import_collect_value, "p", value_ready_for_import_lcopy_value };
@@ -15686,18 +16226,22 @@ GType ready_for_import_get_type (void) {
 }
 
 
-gpointer ready_for_import_ref (gpointer instance) {
+gpointer
+ready_for_import_ref (gpointer instance)
+{
 	ReadyForImport * self;
 	self = instance;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 15688 "BatchImport.c"
+#line 16230 "BatchImport.c"
 }
 
 
-void ready_for_import_unref (gpointer instance) {
+void
+ready_for_import_unref (gpointer instance)
+{
 	ReadyForImport * self;
 	self = instance;
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15706,22 +16250,25 @@ void ready_for_import_unref (gpointer instance) {
 		READY_FOR_IMPORT_GET_CLASS (self)->finalize (self);
 #line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 15701 "BatchImport.c"
+#line 16245 "BatchImport.c"
 	}
 }
 
 
-PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
+PreparedFileImportJob*
+prepared_file_import_job_construct (GType object_type,
+                                    BatchImport* owner,
+                                    PreparedFile* prepared_file,
+                                    ImportID* import_id,
+                                    CompletionCallback callback,
+                                    void* callback_target,
+                                    GCancellable* cancellable,
+                                    CancellationCallback cancellation,
+                                    void* cancellation_target)
+{
 	PreparedFileImportJob* self = NULL;
-	BatchImport* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	CancellationCallback _tmp3_;
-	void* _tmp3__target;
-	ImportID _tmp4_;
-	PreparedFile* _tmp5_;
-	PreparedFile* _tmp6_;
+	ImportID _tmp0_;
+	PreparedFile* _tmp1_;
 #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
 #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15731,47 +16278,44 @@ PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, Ba
 #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = owner;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = callback;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1__target = callback_target;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = cancellable;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cancellation;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3__target = cancellation_target;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
+	self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), callback, callback_target, cancellable, cancellation, cancellation_target, NULL);
 #line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = *import_id;
+	_tmp0_ = *import_id;
 #line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->priv->import_id = _tmp4_;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = prepared_file;
+	self->priv->import_id = _tmp0_;
 #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = _prepared_file_ref0 (_tmp5_);
+	_tmp1_ = _prepared_file_ref0 (prepared_file);
 #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
 #line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->not_ready = _tmp6_;
+	self->not_ready = _tmp1_;
 #line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15755 "BatchImport.c"
+#line 16288 "BatchImport.c"
 }
 
 
-PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
+PreparedFileImportJob*
+prepared_file_import_job_new (BatchImport* owner,
+                              PreparedFile* prepared_file,
+                              ImportID* import_id,
+                              CompletionCallback callback,
+                              void* callback_target,
+                              GCancellable* cancellable,
+                              CancellationCallback cancellation,
+                              void* cancellation_target)
+{
 #line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 15762 "BatchImport.c"
+#line 16304 "BatchImport.c"
 }
 
 
-static void prepared_file_import_job_real_execute (BackgroundJob* base) {
+static void
+prepared_file_import_job_real_execute (BackgroundJob* base)
+{
 	PreparedFileImportJob * self;
 	PreparedFile* prepared_file = NULL;
 	PreparedFile* _tmp0_;
@@ -15795,23 +16339,23 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	PhotoImportParams* photo_import_params = NULL;
 	PreparedFile* _tmp58_;
 	gboolean _tmp59_;
-	gboolean _tmp86_ = FALSE;
-	ImportResult _tmp87_;
+	gboolean _tmp83_ = FALSE;
+	ImportResult _tmp84_;
 	BatchImportResult* batch_result = NULL;
-	PreparedFile* _tmp100_;
-	BatchImportJob* _tmp101_;
-	GFile* _tmp102_;
+	PreparedFile* _tmp97_;
+	BatchImportJob* _tmp98_;
+	GFile* _tmp99_;
+	GFile* _tmp100_;
+	gchar* _tmp101_;
+	gchar* _tmp102_;
 	GFile* _tmp103_;
 	gchar* _tmp104_;
 	gchar* _tmp105_;
-	GFile* _tmp106_;
-	gchar* _tmp107_;
-	gchar* _tmp108_;
-	ImportResult _tmp109_;
-	BatchImportResult* _tmp110_;
-	BatchImportResult* _tmp111_;
-	BatchImportResult* _tmp112_;
-	ImportResult _tmp113_;
+	ImportResult _tmp106_;
+	BatchImportResult* _tmp107_;
+	BatchImportResult* _tmp108_;
+	BatchImportResult* _tmp109_;
+	ImportResult _tmp110_;
 	GError * _inner_error_ = NULL;
 #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
@@ -15847,7 +16391,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_tmp9_ = _tmp8_->copy_to_library;
 #line 1964 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
-#line 15842 "BatchImport.c"
+#line 16386 "BatchImport.c"
 		{
 			GFile* _tmp10_ = NULL;
 			PreparedFile* _tmp11_;
@@ -15866,7 +16410,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp10_ = _tmp13_;
 #line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15861 "BatchImport.c"
+#line 16405 "BatchImport.c"
 				goto __catch434_g_error;
 			}
 #line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15881,7 +16425,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp15_ = final_file;
 #line 1968 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp15_ == NULL) {
-#line 15876 "BatchImport.c"
+#line 16420 "BatchImport.c"
 				PreparedFile* _tmp16_;
 				BatchImportJob* _tmp17_;
 				PreparedFile* _tmp18_;
@@ -15939,13 +16483,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_prepared_file_unref0 (prepared_file);
 #line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 15934 "BatchImport.c"
+#line 16478 "BatchImport.c"
 			}
 #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = final_associated_file;
 #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp29_ != NULL) {
-#line 15940 "BatchImport.c"
+#line 16484 "BatchImport.c"
 				GFile* _tmp30_ = NULL;
 				PreparedFile* _tmp31_;
 				GFile* _tmp32_;
@@ -15963,7 +16507,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
-#line 15958 "BatchImport.c"
+#line 16502 "BatchImport.c"
 					goto __catch434_g_error;
 				}
 #line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15976,11 +16520,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				final_associated_file = _tmp34_;
 #line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp30_);
-#line 15971 "BatchImport.c"
+#line 16515 "BatchImport.c"
 			}
 #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp10_);
-#line 15975 "BatchImport.c"
+#line 16519 "BatchImport.c"
 		}
 		goto __finally434;
 		__catch434_g_error:
@@ -16006,7 +16550,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_tmp36_ = final_file;
 #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp36_ != NULL) {
-#line 16001 "BatchImport.c"
+#line 16545 "BatchImport.c"
 				GFile* _tmp37_;
 				gchar* _tmp38_;
 #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16017,7 +16561,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp35_);
 #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp38_;
-#line 16012 "BatchImport.c"
+#line 16556 "BatchImport.c"
 			} else {
 				PreparedFile* _tmp39_;
 				const gchar* _tmp40_;
@@ -16032,7 +16576,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				_g_free0 (_tmp35_);
 #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp41_;
-#line 16027 "BatchImport.c"
+#line 16571 "BatchImport.c"
 			}
 #line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = g_strdup (_tmp35_);
@@ -16072,7 +16616,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_prepared_file_unref0 (prepared_file);
 #line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16067 "BatchImport.c"
+#line 16611 "BatchImport.c"
 		}
 		__finally434:
 #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16089,14 +16633,14 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			g_clear_error (&_inner_error_);
 #line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16084 "BatchImport.c"
+#line 16628 "BatchImport.c"
 		}
 	}
 #line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp51_ = final_associated_file;
 #line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp51_ == NULL) {
-#line 16091 "BatchImport.c"
+#line 16635 "BatchImport.c"
 		PreparedFile* _tmp52_;
 		BatchImportJob* _tmp53_;
 		GFile* _tmp54_;
@@ -16110,7 +16654,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (final_associated_file);
 #line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		final_associated_file = _tmp54_;
-#line 16105 "BatchImport.c"
+#line 16649 "BatchImport.c"
 	}
 #line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp55_ = final_file;
@@ -16134,7 +16678,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_tmp59_ = _tmp58_->is_video;
 #line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp59_) {
-#line 16129 "BatchImport.c"
+#line 16673 "BatchImport.c"
 		GFile* _tmp60_;
 		ImportID _tmp61_;
 		PreparedFile* _tmp62_;
@@ -16143,10 +16687,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		Thumbnails* _tmp65_;
 		PreparedFile* _tmp66_;
 		BatchImportJob* _tmp67_;
-		time_t _tmp68_;
+		VideoImportParams* _tmp68_;
 		VideoImportParams* _tmp69_;
-		VideoImportParams* _tmp70_;
-		ImportResult _tmp71_;
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp60_ = final_file;
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16164,123 +16706,116 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp67_ = _tmp66_->job;
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp68_ = batch_import_job_get_exposure_time_override (_tmp67_);
-#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp69_ = video_import_params_new (_tmp60_, &_tmp61_, _tmp63_, _tmp65_, _tmp68_);
+		_tmp68_ = video_import_params_new (_tmp60_, &_tmp61_, _tmp63_, _tmp65_, batch_import_job_get_exposure_time_override (_tmp67_));
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_video_import_params_unref0 (video_import_params);
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		video_import_params = _tmp69_;
+		video_import_params = _tmp68_;
 #line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_thumbnails_unref0 (_tmp65_);
 #line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp70_ = video_import_params;
+		_tmp69_ = video_import_params;
 #line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp71_ = video_reader_prepare_for_import (_tmp70_);
-#line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_result_ = _tmp71_;
-#line 16174 "BatchImport.c"
+		_result_ = video_reader_prepare_for_import (_tmp69_);
+#line 16712 "BatchImport.c"
 	} else {
-		GFile* _tmp72_;
-		GFile* _tmp73_;
-		ImportID _tmp74_;
+		GFile* _tmp70_;
+		GFile* _tmp71_;
+		ImportID _tmp72_;
+		PreparedFile* _tmp73_;
+		const gchar* _tmp74_;
 		PreparedFile* _tmp75_;
 		const gchar* _tmp76_;
 		PreparedFile* _tmp77_;
 		const gchar* _tmp78_;
-		PreparedFile* _tmp79_;
-		const gchar* _tmp80_;
-		Thumbnails* _tmp81_;
-		Thumbnails* _tmp82_;
-		PhotoImportParams* _tmp83_;
-		PhotoImportParams* _tmp84_;
-		ImportResult _tmp85_;
+		Thumbnails* _tmp79_;
+		Thumbnails* _tmp80_;
+		PhotoImportParams* _tmp81_;
+		PhotoImportParams* _tmp82_;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp72_ = final_file;
+		_tmp70_ = final_file;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp73_ = final_associated_file;
+		_tmp71_ = final_associated_file;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp74_ = self->priv->import_id;
+		_tmp72_ = self->priv->import_id;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp75_ = prepared_file;
+		_tmp73_ = prepared_file;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp76_ = _tmp75_->exif_md5;
+		_tmp74_ = _tmp73_->exif_md5;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp77_ = prepared_file;
+		_tmp75_ = prepared_file;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp78_ = _tmp77_->thumbnail_md5;
+		_tmp76_ = _tmp75_->thumbnail_md5;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp79_ = prepared_file;
+		_tmp77_ = prepared_file;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp80_ = _tmp79_->full_md5;
+		_tmp78_ = _tmp77_->full_md5;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp81_ = thumbnails_new ();
+		_tmp79_ = thumbnails_new ();
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp82_ = _tmp81_;
+		_tmp80_ = _tmp79_;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp83_ = photo_import_params_new (_tmp72_, _tmp73_, &_tmp74_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp76_, _tmp78_, _tmp80_, _tmp82_);
+		_tmp81_ = photo_import_params_new (_tmp70_, _tmp71_, &_tmp72_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp74_, _tmp76_, _tmp78_, _tmp80_);
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_import_params_unref0 (photo_import_params);
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		photo_import_params = _tmp83_;
+		photo_import_params = _tmp81_;
 #line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_thumbnails_unref0 (_tmp82_);
+		_thumbnails_unref0 (_tmp80_);
 #line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp84_ = photo_import_params;
+		_tmp82_ = photo_import_params;
 #line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp85_ = photo_prepare_for_import (_tmp84_);
-#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_result_ = _tmp85_;
-#line 16226 "BatchImport.c"
+		_result_ = photo_prepare_for_import (_tmp82_);
+#line 16761 "BatchImport.c"
 	}
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp87_ = _result_;
+	_tmp84_ = _result_;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp87_ != IMPORT_RESULT_SUCCESS) {
-#line 16232 "BatchImport.c"
-		GFile* _tmp88_;
-		PreparedFile* _tmp89_;
-		GFile* _tmp90_;
+	if (_tmp84_ != IMPORT_RESULT_SUCCESS) {
+#line 16767 "BatchImport.c"
+		GFile* _tmp85_;
+		PreparedFile* _tmp86_;
+		GFile* _tmp87_;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp88_ = final_file;
+		_tmp85_ = final_file;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp89_ = prepared_file;
+		_tmp86_ = prepared_file;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp90_ = _tmp89_->file;
+		_tmp87_ = _tmp86_->file;
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp86_ = _tmp88_ != _tmp90_;
-#line 16244 "BatchImport.c"
+		_tmp83_ = _tmp85_ != _tmp87_;
+#line 16779 "BatchImport.c"
 	} else {
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp86_ = FALSE;
-#line 16248 "BatchImport.c"
+		_tmp83_ = FALSE;
+#line 16783 "BatchImport.c"
 	}
 #line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp86_) {
-#line 16252 "BatchImport.c"
-		GFile* _tmp91_;
-		gchar* _tmp92_;
-		gchar* _tmp93_;
+	if (_tmp83_) {
+#line 16787 "BatchImport.c"
+		GFile* _tmp88_;
+		gchar* _tmp89_;
+		gchar* _tmp90_;
 #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp91_ = final_file;
+		_tmp88_ = final_file;
 #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp92_ = g_file_get_path (_tmp91_);
+		_tmp89_ = g_file_get_path (_tmp88_);
 #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp93_ = _tmp92_;
+		_tmp90_ = _tmp89_;
 #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:2015: Deleting failed imported copy %s", _tmp93_);
+		g_debug ("BatchImport.vala:2015: Deleting failed imported copy %s", _tmp90_);
 #line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp93_);
-#line 16266 "BatchImport.c"
+		_g_free0 (_tmp90_);
+#line 16801 "BatchImport.c"
 		{
-			GFile* _tmp94_;
+			GFile* _tmp91_;
 #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp94_ = final_file;
+			_tmp91_ = final_file;
 #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_file_delete (_tmp94_, NULL, &_inner_error_);
+			g_file_delete (_tmp91_, NULL, &_inner_error_);
 #line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16275 "BatchImport.c"
+#line 16810 "BatchImport.c"
 				goto __catch435_g_error;
 			}
 		}
@@ -16288,32 +16823,32 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 		__catch435_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp95_;
-			gchar* _tmp96_;
-			gchar* _tmp97_;
-			GError* _tmp98_;
-			const gchar* _tmp99_;
+			GFile* _tmp92_;
+			gchar* _tmp93_;
+			gchar* _tmp94_;
+			GError* _tmp95_;
+			const gchar* _tmp96_;
 #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
 #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp95_ = final_file;
+			_tmp92_ = final_file;
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp96_ = g_file_get_path (_tmp95_);
+			_tmp93_ = g_file_get_path (_tmp92_);
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp97_ = _tmp96_;
+			_tmp94_ = _tmp93_;
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp98_ = err;
+			_tmp95_ = err;
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp99_ = _tmp98_->message;
+			_tmp96_ = _tmp95_->message;
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:2020: Unable to delete copy of imported file %s: %s", _tmp97_, _tmp99_);
+			g_warning ("BatchImport.vala:2020: Unable to delete copy of imported file %s: %s", _tmp94_, _tmp96_);
 #line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp97_);
+			_g_free0 (_tmp94_);
 #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 16308 "BatchImport.c"
+#line 16843 "BatchImport.c"
 		}
 		__finally435:
 #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16334,15 +16869,21 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			g_clear_error (&_inner_error_);
 #line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16329 "BatchImport.c"
+#line 16864 "BatchImport.c"
 		}
 	}
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp100_ = prepared_file;
+	_tmp97_ = prepared_file;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp98_ = _tmp97_->job;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp99_ = final_file;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp101_ = _tmp100_->job;
+	_tmp100_ = final_file;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp102_ = final_file;
+	_tmp101_ = g_file_get_path (_tmp100_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp102_ = _tmp101_;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp103_ = final_file;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16350,65 +16891,59 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp105_ = _tmp104_;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp106_ = final_file;
+	_tmp106_ = _result_;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp107_ = g_file_get_path (_tmp106_);
+	_tmp107_ = batch_import_result_new (_tmp98_, _tmp99_, _tmp102_, _tmp105_, NULL, _tmp106_);
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp108_ = _tmp107_;
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp109_ = _result_;
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp110_ = batch_import_result_new (_tmp101_, _tmp102_, _tmp105_, _tmp108_, NULL, _tmp109_);
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp111_ = _tmp110_;
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp108_);
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp105_);
 #line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_result = _tmp111_;
+	_g_free0 (_tmp102_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	batch_result = _tmp108_;
 #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp112_ = batch_result;
+	_tmp109_ = batch_result;
 #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp113_ = _tmp112_->result;
+	_tmp110_ = _tmp109_->result;
 #line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp113_ != IMPORT_RESULT_SUCCESS) {
-#line 16368 "BatchImport.c"
-		BatchImportResult* _tmp114_;
-		BatchImportResult* _tmp115_;
+	if (_tmp110_ != IMPORT_RESULT_SUCCESS) {
+#line 16903 "BatchImport.c"
+		BatchImportResult* _tmp111_;
+		BatchImportResult* _tmp112_;
 #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp114_ = batch_result;
+		_tmp111_ = batch_result;
 #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp115_ = _batch_import_result_ref0 (_tmp114_);
+		_tmp112_ = _batch_import_result_ref0 (_tmp111_);
 #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_result_unref0 (self->failed);
 #line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->failed = _tmp115_;
-#line 16379 "BatchImport.c"
+		self->failed = _tmp112_;
+#line 16914 "BatchImport.c"
 	} else {
-		GFile* _tmp116_;
-		PreparedFile* _tmp117_;
-		PhotoImportParams* _tmp118_;
-		VideoImportParams* _tmp119_;
-		BatchImportResult* _tmp120_;
-		ReadyForImport* _tmp121_;
+		GFile* _tmp113_;
+		PreparedFile* _tmp114_;
+		PhotoImportParams* _tmp115_;
+		VideoImportParams* _tmp116_;
+		BatchImportResult* _tmp117_;
+		ReadyForImport* _tmp118_;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp116_ = final_file;
+		_tmp113_ = final_file;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp117_ = prepared_file;
+		_tmp114_ = prepared_file;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp118_ = photo_import_params;
+		_tmp115_ = photo_import_params;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp119_ = video_import_params;
+		_tmp116_ = video_import_params;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp120_ = batch_result;
+		_tmp117_ = batch_result;
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp121_ = ready_for_import_new (_tmp116_, _tmp117_, _tmp118_, _tmp119_, _tmp120_);
+		_tmp118_ = ready_for_import_new (_tmp113_, _tmp114_, _tmp115_, _tmp116_, _tmp117_);
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ready_for_import_unref0 (self->ready);
 #line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->ready = _tmp121_;
-#line 16403 "BatchImport.c"
+		self->ready = _tmp118_;
+#line 16938 "BatchImport.c"
 	}
 #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (batch_result);
@@ -16422,11 +16957,13 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	_g_object_unref0 (final_file);
 #line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (prepared_file);
-#line 16417 "BatchImport.c"
+#line 16952 "BatchImport.c"
 }
 
 
-static void prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) {
+static void
+prepared_file_import_job_class_init (PreparedFileImportJobClass * klass)
+{
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16435,22 +16972,26 @@ static void prepared_file_import_job_class_init (PreparedFileImportJobClass * kl
 	g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate));
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepared_file_import_job_real_execute;
-#line 16430 "BatchImport.c"
+#line 16967 "BatchImport.c"
 }
 
 
-static void prepared_file_import_job_instance_init (PreparedFileImportJob * self) {
+static void
+prepared_file_import_job_instance_init (PreparedFileImportJob * self)
+{
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARED_FILE_IMPORT_JOB_GET_PRIVATE (self);
 #line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ready = NULL;
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = NULL;
-#line 16441 "BatchImport.c"
+#line 16980 "BatchImport.c"
 }
 
 
-static void prepared_file_import_job_finalize (BackgroundJob * obj) {
+static void
+prepared_file_import_job_finalize (BackgroundJob * obj)
+{
 	PreparedFileImportJob * self;
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
@@ -16462,11 +17003,13 @@ static void prepared_file_import_job_finalize (BackgroundJob * obj) {
 	_batch_import_result_unref0 (self->failed);
 #line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj);
-#line 16457 "BatchImport.c"
+#line 16998 "BatchImport.c"
 }
 
 
-GType prepared_file_import_job_get_type (void) {
+GType
+prepared_file_import_job_get_type (void)
+{
 	static volatile gsize prepared_file_import_job_type_id__volatile = 0;
 	if (g_once_init_enter (&prepared_file_import_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PreparedFileImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) prepared_file_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreparedFileImportJob), 0, (GInstanceInitFunc) prepared_file_import_job_instance_init, NULL };
@@ -16478,18 +17021,19 @@ GType prepared_file_import_job_get_type (void) {
 }
 
 
-CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
+CompletedImportObject*
+completed_import_object_construct (GType object_type,
+                                   MediaSource* source,
+                                   Thumbnails* thumbnails,
+                                   BatchImportJob* original_job,
+                                   BatchImportResult* import_result)
+{
 	CompletedImportObject* self = NULL;
 	Thumbnails* _tmp0_;
-	Thumbnails* _tmp1_;
-	BatchImportResult* _tmp2_;
-	BatchImportResult* _tmp3_;
-	MediaSource* _tmp4_;
-	MediaSource* _tmp5_;
-	BatchImportJob* _tmp6_;
-	BatchImportJob* _tmp7_;
-	Thumbnails* _tmp8_;
-	GdkPixbuf* _tmp9_;
+	BatchImportResult* _tmp1_;
+	MediaSource* _tmp2_;
+	BatchImportJob* _tmp3_;
+	GdkPixbuf* _tmp4_;
 #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16501,156 +17045,176 @@ CompletedImportObject* completed_import_object_construct (GType object_type, Med
 #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (CompletedImportObject*) g_type_create_instance (object_type);
 #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = thumbnails;
-#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = _thumbnails_ref0 (_tmp0_);
+	_tmp0_ = _thumbnails_ref0 (thumbnails);
 #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (self->thumbnails);
 #line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->thumbnails = _tmp1_;
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = import_result;
+	self->thumbnails = _tmp0_;
 #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = _batch_import_result_ref0 (_tmp2_);
+	_tmp1_ = _batch_import_result_ref0 (import_result);
 #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
 #line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->batch_result = _tmp3_;
+	self->batch_result = _tmp1_;
 #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = source;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp2_ = _g_object_ref0 (source);
 #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->source);
 #line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->source = _tmp5_;
-#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = original_job;
+	self->source = _tmp2_;
 #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _batch_import_job_ref0 (_tmp6_);
+	_tmp3_ = _batch_import_job_ref0 (original_job);
 #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->original_job);
 #line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->original_job = _tmp7_;
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp8_ = thumbnails;
+	self->original_job = _tmp3_;
 #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_LARGEST);
+	_tmp4_ = thumbnails_get (thumbnails, THUMBNAIL_CACHE_SIZE_LARGEST);
 #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
 #line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->user_preview = _tmp9_;
+	self->user_preview = _tmp4_;
 #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 16537 "BatchImport.c"
+#line 17071 "BatchImport.c"
 }
 
 
-CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
+CompletedImportObject*
+completed_import_object_new (MediaSource* source,
+                             Thumbnails* thumbnails,
+                             BatchImportJob* original_job,
+                             BatchImportResult* import_result)
+{
 #line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result);
-#line 16544 "BatchImport.c"
+#line 17083 "BatchImport.c"
 }
 
 
-static void value_completed_import_object_init (GValue* value) {
+static void
+value_completed_import_object_init (GValue* value)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 16551 "BatchImport.c"
+#line 17092 "BatchImport.c"
 }
 
 
-static void value_completed_import_object_free_value (GValue* value) {
+static void
+value_completed_import_object_free_value (GValue* value)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (value->data[0].v_pointer);
-#line 16560 "BatchImport.c"
+#line 17103 "BatchImport.c"
 	}
 }
 
 
-static void value_completed_import_object_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_completed_import_object_copy_value (const GValue* src_value,
+                                          GValue* dest_value)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer);
-#line 16570 "BatchImport.c"
+#line 17116 "BatchImport.c"
 	} else {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16574 "BatchImport.c"
+#line 17120 "BatchImport.c"
 	}
 }
 
 
-static gpointer value_completed_import_object_peek_pointer (const GValue* value) {
+static gpointer
+value_completed_import_object_peek_pointer (const GValue* value)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16582 "BatchImport.c"
+#line 17130 "BatchImport.c"
 }
 
 
-static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_completed_import_object_collect_value (GValue* value,
+                                             guint n_collect_values,
+                                             GTypeCValue* collect_values,
+                                             guint collect_flags)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 16589 "BatchImport.c"
+#line 17142 "BatchImport.c"
 		CompletedImportObject * object;
 		object = collect_values[0].v_pointer;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16596 "BatchImport.c"
+#line 17149 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.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 16600 "BatchImport.c"
+#line 17153 "BatchImport.c"
 		}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = completed_import_object_ref (object);
-#line 16604 "BatchImport.c"
+#line 17157 "BatchImport.c"
 	} else {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16608 "BatchImport.c"
+#line 17161 "BatchImport.c"
 	}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16612 "BatchImport.c"
+#line 17165 "BatchImport.c"
 }
 
 
-static gchar* value_completed_import_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_completed_import_object_lcopy_value (const GValue* value,
+                                           guint n_collect_values,
+                                           GTypeCValue* collect_values,
+                                           guint collect_flags)
+{
 	CompletedImportObject ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16623 "BatchImport.c"
+#line 17181 "BatchImport.c"
 	}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 16629 "BatchImport.c"
+#line 17187 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16633 "BatchImport.c"
+#line 17191 "BatchImport.c"
 	} else {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = completed_import_object_ref (value->data[0].v_pointer);
-#line 16637 "BatchImport.c"
+#line 17195 "BatchImport.c"
 	}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16641 "BatchImport.c"
+#line 17199 "BatchImport.c"
 }
 
 
-GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_completed_import_object (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags)
+{
 	ParamSpecCompletedImportObject* spec;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
@@ -16660,20 +17224,25 @@ GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 16655 "BatchImport.c"
+#line 17219 "BatchImport.c"
 }
 
 
-gpointer value_get_completed_import_object (const GValue* value) {
+gpointer
+value_get_completed_import_object (const GValue* value)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16664 "BatchImport.c"
+#line 17230 "BatchImport.c"
 }
 
 
-void value_set_completed_import_object (GValue* value, gpointer v_object) {
+void
+value_set_completed_import_object (GValue* value,
+                                   gpointer v_object)
+{
 	CompletedImportObject * old;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
@@ -16689,22 +17258,25 @@ void value_set_completed_import_object (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_ref (value->data[0].v_pointer);
-#line 16684 "BatchImport.c"
+#line 17253 "BatchImport.c"
 	} else {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16688 "BatchImport.c"
+#line 17257 "BatchImport.c"
 	}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 16694 "BatchImport.c"
+#line 17263 "BatchImport.c"
 	}
 }
 
 
-void value_take_completed_import_object (GValue* value, gpointer v_object) {
+void
+value_take_completed_import_object (GValue* value,
+                                    gpointer v_object)
+{
 	CompletedImportObject * old;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
@@ -16718,38 +17290,44 @@ void value_take_completed_import_object (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 16713 "BatchImport.c"
+#line 17285 "BatchImport.c"
 	} else {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16717 "BatchImport.c"
+#line 17289 "BatchImport.c"
 	}
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 16723 "BatchImport.c"
+#line 17295 "BatchImport.c"
 	}
 }
 
 
-static void completed_import_object_class_init (CompletedImportObjectClass * klass) {
+static void
+completed_import_object_class_init (CompletedImportObjectClass * klass)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completed_import_object_parent_class = g_type_class_peek_parent (klass);
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize;
-#line 16733 "BatchImport.c"
+#line 17307 "BatchImport.c"
 }
 
 
-static void completed_import_object_instance_init (CompletedImportObject * self) {
+static void
+completed_import_object_instance_init (CompletedImportObject * self)
+{
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 16740 "BatchImport.c"
+#line 17316 "BatchImport.c"
 }
 
 
-static void completed_import_object_finalize (CompletedImportObject * obj) {
+static void
+completed_import_object_finalize (CompletedImportObject * obj)
+{
 	CompletedImportObject * self;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMPLETED_IMPORT_OBJECT, CompletedImportObject);
@@ -16765,11 +17343,13 @@ static void completed_import_object_finalize (CompletedImportObject * obj) {
 	_batch_import_job_unref0 (self->original_job);
 #line 2040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 16760 "BatchImport.c"
+#line 17338 "BatchImport.c"
 }
 
 
-GType completed_import_object_get_type (void) {
+GType
+completed_import_object_get_type (void)
+{
 	static volatile gsize completed_import_object_type_id__volatile = 0;
 	if (g_once_init_enter (&completed_import_object_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_completed_import_object_init, value_completed_import_object_free_value, value_completed_import_object_copy_value, value_completed_import_object_peek_pointer, "p", value_completed_import_object_collect_value, "p", value_completed_import_object_lcopy_value };
@@ -16783,18 +17363,22 @@ GType completed_import_object_get_type (void) {
 }
 
 
-gpointer completed_import_object_ref (gpointer instance) {
+gpointer
+completed_import_object_ref (gpointer instance)
+{
 	CompletedImportObject * self;
 	self = instance;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 16785 "BatchImport.c"
+#line 17367 "BatchImport.c"
 }
 
 
-void completed_import_object_unref (gpointer instance) {
+void
+completed_import_object_unref (gpointer instance)
+{
 	CompletedImportObject * self;
 	self = instance;
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16803,23 +17387,24 @@ void completed_import_object_unref (gpointer instance) {
 		COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self);
 #line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16798 "BatchImport.c"
+#line 17382 "BatchImport.c"
 	}
 }
 
 
-ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
+ThumbnailWriterJob*
+thumbnail_writer_job_construct (GType object_type,
+                                BatchImport* owner,
+                                CompletedImportObject* completed_import_source,
+                                CompletionCallback callback,
+                                void* callback_target,
+                                GCancellable* cancellable,
+                                CancellationCallback cancel_callback,
+                                void* cancel_callback_target)
+{
 	ThumbnailWriterJob* self = NULL;
-	BatchImport* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	CancellationCallback _tmp3_;
-	void* _tmp3__target;
-	CompletedImportObject* _tmp4_;
-	Thumbnails* _tmp5_;
-	CompletedImportObject* _tmp6_;
-	CompletedImportObject* _tmp7_;
+	Thumbnails* _tmp0_;
+	CompletedImportObject* _tmp1_;
 #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
 #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16827,55 +17412,49 @@ ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImpo
 #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = owner;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1_ = callback;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp1__target = callback_target;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp2_ = cancellable;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3_ = cancel_callback;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp3__target = cancel_callback_target;
-#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self = (ThumbnailWriterJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp4_ = completed_import_source;
+	self = (ThumbnailWriterJob*) background_import_job_construct (object_type, owner, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
 #line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = _tmp4_->thumbnails;
+	_tmp0_ = completed_import_source->thumbnails;
 #line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_assert (_tmp5_ != NULL, "completed_import_source.thumbnails != null");
+	_vala_assert (_tmp0_ != NULL, "completed_import_source.thumbnails != null");
 #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp6_ = completed_import_source;
-#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp7_ = _completed_import_object_ref0 (_tmp6_);
+	_tmp1_ = _completed_import_object_ref0 (completed_import_source);
 #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (self->completed_import_source);
 #line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	self->completed_import_source = _tmp7_;
+	self->completed_import_source = _tmp1_;
 #line 2062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 16853 "BatchImport.c"
+#line 17422 "BatchImport.c"
 }
 
 
-ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
+ThumbnailWriterJob*
+thumbnail_writer_job_new (BatchImport* owner,
+                          CompletedImportObject* completed_import_source,
+                          CompletionCallback callback,
+                          void* callback_target,
+                          GCancellable* cancellable,
+                          CancellationCallback cancel_callback,
+                          void* cancel_callback_target)
+{
 #line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
-#line 16860 "BatchImport.c"
+#line 17437 "BatchImport.c"
 }
 
 
-static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
+static void
+thumbnail_writer_job_real_execute (BackgroundJob* base)
+{
 	ThumbnailWriterJob * self;
-	CompletedImportObject* _tmp10_;
+	CompletedImportObject* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 2065 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 16870 "BatchImport.c"
+#line 17449 "BatchImport.c"
 	{
 		CompletedImportObject* _tmp0_;
 		MediaSource* _tmp1_;
@@ -16895,7 +17474,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_);
 #line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16890 "BatchImport.c"
+#line 17469 "BatchImport.c"
 			goto __catch436_g_error;
 		}
 #line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16904,7 +17483,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp5_ = _tmp4_->batch_result;
 #line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
-#line 16899 "BatchImport.c"
+#line 17478 "BatchImport.c"
 	}
 	goto __finally436;
 	__catch436_g_error:
@@ -16913,7 +17492,6 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		CompletedImportObject* _tmp6_;
 		BatchImportResult* _tmp7_;
 		GError* _tmp8_;
-		ImportResult _tmp9_;
 #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
 #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16925,12 +17503,10 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 #line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = err;
 #line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp9_ = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR);
-#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_->result = _tmp9_;
+		_tmp7_->result = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR);
 #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 16925 "BatchImport.c"
+#line 17501 "BatchImport.c"
 	}
 	__finally436:
 #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16941,34 +17517,40 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 16936 "BatchImport.c"
+#line 17512 "BatchImport.c"
 	}
 #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = self->completed_import_source;
+	_tmp9_ = self->completed_import_source;
 #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_thumbnails_unref0 (_tmp10_->thumbnails);
+	_thumbnails_unref0 (_tmp9_->thumbnails);
 #line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_->thumbnails = NULL;
-#line 16944 "BatchImport.c"
+	_tmp9_->thumbnails = NULL;
+#line 17520 "BatchImport.c"
 }
 
 
-static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) {
+static void
+thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass)
+{
 #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	thumbnail_writer_job_parent_class = g_type_class_peek_parent (klass);
 #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize;
 #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_writer_job_real_execute;
-#line 16955 "BatchImport.c"
+#line 17533 "BatchImport.c"
 }
 
 
-static void thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) {
+static void
+thumbnail_writer_job_instance_init (ThumbnailWriterJob * self)
+{
 }
 
 
-static void thumbnail_writer_job_finalize (BackgroundJob * obj) {
+static void
+thumbnail_writer_job_finalize (BackgroundJob * obj)
+{
 	ThumbnailWriterJob * self;
 #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
@@ -16976,11 +17558,13 @@ static void thumbnail_writer_job_finalize (BackgroundJob * obj) {
 	_completed_import_object_unref0 (self->completed_import_source);
 #line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj);
-#line 16971 "BatchImport.c"
+#line 17553 "BatchImport.c"
 }
 
 
-GType thumbnail_writer_job_get_type (void) {
+GType
+thumbnail_writer_job_get_type (void)
+{
 	static volatile gsize thumbnail_writer_job_type_id__volatile = 0;
 	if (g_once_init_enter (&thumbnail_writer_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ThumbnailWriterJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) thumbnail_writer_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThumbnailWriterJob), 0, (GInstanceInitFunc) thumbnail_writer_job_instance_init, NULL };