Merge branch 'feature/upstream' into develop

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-06-25 21:12:13 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-06-25 21:12:13 +0200
commit: 059a62ee3c820a42fbce980c3256049adecc9100 (patch)
tree: e51eab94fd7d65459640ca227fb2257bb41d2acb /src/data_imports
parent: 55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parent: e8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
5 files changed, 3324 insertions, 2825 deletions
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index c9fdbcb..edc0967 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.36.6, the Vala compiler
+/* DataImportJob.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImportJob.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>
@@ -335,9 +336,15 @@ extern TagSourceCollection* tag_global;
 
 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;
@@ -347,40 +354,63 @@ 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;
 GType spit_data_imports_data_import_job_get_type (void) G_GNUC_CONST;
 gpointer spit_data_imports_data_import_source_ref (gpointer instance);
 void spit_data_imports_data_import_source_unref (gpointer instance);
-GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object);
-void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object);
+GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
+                                                             const gchar* nick,
+                                                             const gchar* blurb,
+                                                             GType object_type,
+                                                             GParamFlags flags);
+void spit_data_imports_value_set_data_import_source (GValue* value,
+                                                     gpointer v_object);
+void spit_data_imports_value_take_data_import_source (GValue* value,
+                                                      gpointer v_object);
 gpointer spit_data_imports_value_get_data_import_source (const GValue* value);
 GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST;
 gpointer hierarchical_tag_index_ref (gpointer instance);
 void hierarchical_tag_index_unref (gpointer instance);
-GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_hierarchical_tag_index (GValue* value, gpointer v_object);
-void value_take_hierarchical_tag_index (GValue* value, gpointer v_object);
+GParamSpec* param_spec_hierarchical_tag_index (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void value_set_hierarchical_tag_index (GValue* value,
+                                       gpointer v_object);
+void value_take_hierarchical_tag_index (GValue* value,
+                                        gpointer v_object);
 gpointer value_get_hierarchical_tag_index (const GValue* value);
 GType hierarchical_tag_index_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJobPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_DUMMY_PROPERTY
-};
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source);
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source);
+SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type,
+                                                                           SpitDataImportsDataImportSource* import_source);
 BatchImportJob* batch_import_job_construct (GType object_type);
 GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self);
 guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self);
 time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self);
-static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1);
-gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components, int path_components_length1);
-gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1);
+static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self,
+                                                                               SpitDataImportsImportableTag** src_tags,
+                                                                               int src_tags_length1);
+gchar* hierarchical_tag_utilities_join_path_components (gchar** path_components,
+                                                        int path_components_length1);
+gchar** tag_prep_tag_names (gchar** names,
+                            int names_length1,
+                            int* result_length1);
+static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self,
+                                                                 SpitDataImportsImportableTag* tag,
+                                                                 int* result_length1);
 #define TAG_PATH_SEPARATOR_STRING "/"
 GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path);
 HierarchicalTagIndex* hierarchical_tag_index_from_paths (GeeCollection* client_paths);
@@ -391,11 +421,20 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
 static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base);
 static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base);
 static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base);
-static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
+static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base,
+                                                            BatchImportJob* associated);
+static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base,
+                                                                     guint64* filesize,
+                                                                     GFile* * file);
+static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base,
+                                                         GFile* * file_to_import,
+                                                         gboolean* copy_to_library,
+                                                         GError** error);
 SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
-static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
+static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base,
+                                                          MediaSource* source,
+                                                          BatchImportRoll* import_roll,
+                                                          GError** error);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
@@ -406,349 +445,358 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
 gchar* hierarchical_tag_utilities_hierarchical_to_flat (const gchar* path);
 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 source_collection_get_type (void) G_GNUC_CONST;
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
-gboolean tag_source_collection_exists (TagSourceCollection* self, const gchar* name, gboolean treat_htags_as_root);
+gboolean tag_source_collection_exists (TagSourceCollection* self,
+                                       const gchar* name,
+                                       gboolean treat_htags_as_root);
 void tag_promote (Tag* self);
-void tag_attach (Tag* self, MediaSource* source);
+void tag_attach (Tag* self,
+                 MediaSource* source);
 GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
-gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
+gchar* prepare_input_text (const gchar* text,
+                           PrepareInputTextOptions options,
+                           gint dest_length);
 GType view_collection_get_type (void) G_GNUC_CONST;
-void event_generate_single_event (MediaSource* media, ViewCollection* events_so_far, const gchar* event_name);
+void event_generate_single_event (MediaSource* media,
+                                  ViewCollection* events_so_far,
+                                  const gchar* event_name);
 GType import_id_get_type (void) G_GNUC_CONST;
 ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
 GType rating_get_type (void) G_GNUC_CONST;
 Rating rating_unserialize (gint value);
-void media_source_set_rating (MediaSource* self, Rating rating);
-void media_source_set_title (MediaSource* self, const gchar* title);
+void media_source_set_rating (MediaSource* self,
+                              Rating rating);
+void media_source_set_title (MediaSource* self,
+                             const gchar* title);
 GType dateable_get_type (void) G_GNUC_CONST;
-void dateable_set_exposure_time (Dateable* self, time_t target_time);
-void photo_set_import_id (Photo* self, ImportID* import_id);
+void dateable_set_exposure_time (Dateable* self,
+                                 time_t target_time);
+void photo_set_import_id (Photo* self,
+                          ImportID* import_id);
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
 static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 
 
-static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
+static gpointer
+_spit_data_imports_data_import_source_ref0 (gpointer self)
+{
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? spit_data_imports_data_import_source_ref (self) : NULL;
-#line 445 "DataImportJob.c"
+#line 507 "DataImportJob.c"
 }
 
 
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source) {
+SpitDataImportsDataImportJob*
+spit_data_imports_data_import_job_construct (GType object_type,
+                                             SpitDataImportsDataImportSource* import_source)
+{
 	SpitDataImportsDataImportJob* self = NULL;
 	SpitDataImportsDataImportSource* _tmp0_;
-	SpitDataImportsDataImportSource* _tmp1_;
-	SpitDataImportsDataImportSource* _tmp2_;
-	GFile* _tmp3_;
-	SpitDataImportsDataImportSource* _tmp4_;
-	guint64 _tmp5_;
-	SpitDataImportsDataImportSource* _tmp6_;
-	time_t _tmp7_;
+	GFile* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (import_source), NULL);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = (SpitDataImportsDataImportJob*) batch_import_job_construct (object_type);
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp0_ = import_source;
-#line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp1_ = _spit_data_imports_data_import_source_ref0 (_tmp0_);
+	_tmp0_ = _spit_data_imports_data_import_source_ref0 (import_source);
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_spit_data_imports_data_import_source_unref0 (self->priv->import_source);
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	self->priv->import_source = _tmp1_;
-#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp2_ = import_source;
+	self->priv->import_source = _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp3_ = spit_data_imports_data_import_source_get_file (_tmp2_);
+	_tmp1_ = spit_data_imports_data_import_source_get_file (import_source);
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_g_object_unref0 (self->priv->src_file);
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	self->priv->src_file = _tmp3_;
-#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp4_ = import_source;
-#line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp5_ = spit_data_imports_data_import_source_get_filesize (_tmp4_);
+	self->priv->src_file = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	self->priv->filesize = _tmp5_;
+	self->priv->filesize = spit_data_imports_data_import_source_get_filesize (import_source);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp6_ = import_source;
-#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp7_ = spit_data_imports_data_import_source_get_exposure_time (_tmp6_);
-#line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	self->priv->exposure_time = _tmp7_;
+	self->priv->exposure_time = spit_data_imports_data_import_source_get_exposure_time (import_source);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self;
-#line 493 "DataImportJob.c"
+#line 540 "DataImportJob.c"
 }
 
 
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) {
+SpitDataImportsDataImportJob*
+spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source)
+{
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source);
-#line 500 "DataImportJob.c"
+#line 549 "DataImportJob.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 507 "DataImportJob.c"
+#line 558 "DataImportJob.c"
 }
 
 
-static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag** src_tags, int src_tags_length1) {
+static HierarchicalTagIndex*
+spit_data_imports_data_import_job_build_exclusion_index (SpitDataImportsDataImportJob* self,
+                                                         SpitDataImportsImportableTag** src_tags,
+                                                         int src_tags_length1)
+{
 	HierarchicalTagIndex* result = NULL;
 	GeeSet* detected_htags = NULL;
 	GeeHashSet* _tmp0_;
-	SpitDataImportsImportableTag** _tmp1_;
-	gint _tmp1__length1;
-	HierarchicalTagIndex* _tmp33_ = NULL;
-	GeeSet* _tmp34_;
-	gint _tmp35_;
-	gint _tmp36_;
+	HierarchicalTagIndex* _tmp31_ = NULL;
+	GeeSet* _tmp32_;
+	gint _tmp33_;
+	gint _tmp34_;
 #line 29 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	detected_htags = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
-#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp1_ = src_tags;
-#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp1__length1 = src_tags_length1;
-#line 531 "DataImportJob.c"
+#line 580 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
 		gint _src_tag_collection_size_ = 0;
 		gint src_tag_it = 0;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		src_tag_collection = _tmp1_;
+		src_tag_collection = src_tags;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		src_tag_collection_length1 = _tmp1__length1;
+		src_tag_collection_length1 = src_tags_length1;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
-#line 543 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp2_;
+		for (src_tag_it = 0; src_tag_it < src_tags_length1; src_tag_it = src_tag_it + 1) {
+#line 592 "DataImportJob.c"
+			SpitDataImportsImportableTag* _tmp1_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
+			_tmp1_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			src_tag = _tmp2_;
-#line 550 "DataImportJob.c"
+			src_tag = _tmp1_;
+#line 599 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp3_;
-				gint _tmp4_;
+				SpitDataImportsImportableTag* _tmp2_;
+				gint _tmp3_;
+				gchar** _tmp4_;
 				gchar** _tmp5_;
-				gchar** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
+				gint _tmp5__length1;
+				gint _tmp6_;
+				gchar** _tmp7_;
 				gchar** _tmp8_;
-				gchar** _tmp9_;
-				gint _tmp9__length1;
+				gint _tmp8__length1;
+				gchar* _tmp9_;
 				gchar* _tmp10_;
-				gchar* _tmp11_;
-				gboolean _tmp12_ = FALSE;
-				const gchar* _tmp13_;
+				gboolean _tmp11_ = FALSE;
+				const gchar* _tmp12_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp3_ = src_tag;
+				_tmp2_ = src_tag;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp5_ = spit_data_imports_data_import_job_build_path_components (self, _tmp3_, &_tmp4_);
+				_tmp4_ = spit_data_imports_data_import_job_build_path_components (self, _tmp2_, &_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp6_ = _tmp5_;
+				_tmp5_ = _tmp4_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp6__length1 = _tmp4_;
+				_tmp5__length1 = _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp8_ = tag_prep_tag_names (_tmp6_, _tmp4_, &_tmp7_);
+				_tmp7_ = tag_prep_tag_names (_tmp5_, _tmp3_, &_tmp6_);
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp9_ = _tmp8_;
+				_tmp8_ = _tmp7_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp9__length1 = _tmp7_;
+				_tmp8__length1 = _tmp6_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp10_ = hierarchical_tag_utilities_join_path_components (_tmp9_, _tmp7_);
+				_tmp9_ = hierarchical_tag_utilities_join_path_components (_tmp8_, _tmp6_);
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp11_ = _tmp10_;
+				_tmp10_ = _tmp9_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) g_free), NULL);
+				_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
+				_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				prepped = _tmp11_;
+				prepped = _tmp10_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp13_ = prepped;
+				_tmp12_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (_tmp13_ != NULL) {
-#line 594 "DataImportJob.c"
-					const gchar* _tmp14_;
-					gboolean _tmp15_;
+				if (_tmp12_ != NULL) {
+#line 643 "DataImportJob.c"
+					const gchar* _tmp13_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp14_ = prepped;
+					_tmp13_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
-#line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp12_ = _tmp15_;
-#line 603 "DataImportJob.c"
+					_tmp11_ = g_str_has_prefix (_tmp13_, TAG_PATH_SEPARATOR_STRING);
+#line 649 "DataImportJob.c"
 				} else {
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp12_ = FALSE;
-#line 607 "DataImportJob.c"
+					_tmp11_ = FALSE;
+#line 653 "DataImportJob.c"
 				}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (_tmp12_) {
-#line 611 "DataImportJob.c"
-					GeeSet* _tmp16_;
-					const gchar* _tmp17_;
+				if (_tmp11_) {
+#line 657 "DataImportJob.c"
+					GeeSet* _tmp14_;
+					const gchar* _tmp15_;
 					GeeList* parents = NULL;
-					const gchar* _tmp18_;
-					GeeList* _tmp19_;
+					const gchar* _tmp16_;
+					GeeList* _tmp17_;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp16_ = detected_htags;
+					_tmp14_ = detected_htags;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp17_ = prepped;
+					_tmp15_ = prepped;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
+					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp18_ = prepped;
+					_tmp16_ = prepped;
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_);
+					_tmp17_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp16_);
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					parents = _tmp19_;
-#line 629 "DataImportJob.c"
+					parents = _tmp17_;
+#line 675 "DataImportJob.c"
 					{
 						GeeList* _parent_list = NULL;
-						GeeList* _tmp20_;
-						GeeList* _tmp21_;
+						GeeList* _tmp18_;
+						GeeList* _tmp19_;
 						gint _parent_size = 0;
-						GeeList* _tmp22_;
-						gint _tmp23_;
-						gint _tmp24_;
+						GeeList* _tmp20_;
+						gint _tmp21_;
+						gint _tmp22_;
 						gint _parent_index = 0;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp20_ = parents;
+						_tmp18_ = parents;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp21_ = _g_object_ref0 (_tmp20_);
+						_tmp19_ = _g_object_ref0 (_tmp18_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_parent_list = _tmp21_;
+						_parent_list = _tmp19_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp22_ = _parent_list;
+						_tmp20_ = _parent_list;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp24_ = _tmp23_;
+						_tmp22_ = _tmp21_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_parent_size = _tmp24_;
+						_parent_size = _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_parent_index = -1;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						while (TRUE) {
-#line 657 "DataImportJob.c"
+#line 703 "DataImportJob.c"
+							gint _tmp23_;
+							gint _tmp24_;
 							gint _tmp25_;
-							gint _tmp26_;
-							gint _tmp27_;
 							gchar* parent = NULL;
-							GeeList* _tmp28_;
-							gint _tmp29_;
-							gpointer _tmp30_;
-							GeeSet* _tmp31_;
-							const gchar* _tmp32_;
+							GeeList* _tmp26_;
+							gint _tmp27_;
+							gpointer _tmp28_;
+							GeeSet* _tmp29_;
+							const gchar* _tmp30_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp25_ = _parent_index;
+							_tmp23_ = _parent_index;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_parent_index = _tmp25_ + 1;
+							_parent_index = _tmp23_ + 1;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp26_ = _parent_index;
+							_tmp24_ = _parent_index;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp27_ = _parent_size;
+							_tmp25_ = _parent_size;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							if (!(_tmp26_ < _tmp27_)) {
+							if (!(_tmp24_ < _tmp25_)) {
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 								break;
-#line 679 "DataImportJob.c"
+#line 725 "DataImportJob.c"
 							}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp28_ = _parent_list;
+							_tmp26_ = _parent_list;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp29_ = _parent_index;
+							_tmp27_ = _parent_index;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp30_ = gee_list_get (_tmp28_, _tmp29_);
+							_tmp28_ = gee_list_get (_tmp26_, _tmp27_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							parent = (gchar*) _tmp30_;
+							parent = (gchar*) _tmp28_;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp31_ = detected_htags;
+							_tmp29_ = detected_htags;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp32_ = parent;
+							_tmp30_ = parent;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
+							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_free0 (parent);
-#line 697 "DataImportJob.c"
+#line 743 "DataImportJob.c"
 						}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (_parent_list);
-#line 701 "DataImportJob.c"
+#line 747 "DataImportJob.c"
 					}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (parents);
-#line 705 "DataImportJob.c"
+#line 751 "DataImportJob.c"
 				}
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 711 "DataImportJob.c"
+#line 757 "DataImportJob.c"
 			}
 		}
 	}
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp34_ = detected_htags;
+	_tmp32_ = detected_htags;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp36_ = _tmp35_;
+	_tmp34_ = _tmp33_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp36_ > 0) {
-#line 723 "DataImportJob.c"
-		GeeSet* _tmp37_;
-		HierarchicalTagIndex* _tmp38_;
+	if (_tmp34_ > 0) {
+#line 769 "DataImportJob.c"
+		GeeSet* _tmp35_;
+		HierarchicalTagIndex* _tmp36_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp37_ = detected_htags;
+		_tmp35_ = detected_htags;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp38_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp36_ = hierarchical_tag_index_from_paths (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_hierarchical_tag_index_unref0 (_tmp33_);
+		_hierarchical_tag_index_unref0 (_tmp31_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp33_ = _tmp38_;
-#line 734 "DataImportJob.c"
+		_tmp31_ = _tmp36_;
+#line 780 "DataImportJob.c"
 	} else {
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_hierarchical_tag_index_unref0 (_tmp33_);
+		_hierarchical_tag_index_unref0 (_tmp31_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp33_ = NULL;
-#line 740 "DataImportJob.c"
+		_tmp31_ = NULL;
+#line 786 "DataImportJob.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	result = _tmp33_;
+	result = _tmp31_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_g_object_unref0 (detected_htags);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 748 "DataImportJob.c"
+#line 794 "DataImportJob.c"
 }
 
 
-time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self) {
+time_t
+spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self)
+{
 	time_t result = 0;
 	time_t _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -759,11 +807,13 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 763 "DataImportJob.c"
+#line 811 "DataImportJob.c"
 }
 
 
-static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_dest_identifier (BatchImportJob* base)
+{
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
 	SpitDataImportsDataImportSource* _tmp0_;
@@ -778,11 +828,13 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 782 "DataImportJob.c"
+#line 832 "DataImportJob.c"
 }
 
 
-static gchar* spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_source_identifier (BatchImportJob* base)
+{
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
 	SpitDataImportsDataImportSource* _tmp0_;
@@ -797,11 +849,13 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
 	result = _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 801 "DataImportJob.c"
+#line 853 "DataImportJob.c"
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base) {
+static gboolean
+spit_data_imports_data_import_job_real_is_directory (BatchImportJob* base)
+{
 	SpitDataImportsDataImportJob * self;
 	gboolean result = FALSE;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -810,11 +864,13 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 	result = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 814 "DataImportJob.c"
+#line 868 "DataImportJob.c"
 }
 
 
-static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_basename (BatchImportJob* base)
+{
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
 	GFile* _tmp0_;
@@ -829,11 +885,13 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 833 "DataImportJob.c"
+#line 889 "DataImportJob.c"
 }
 
 
-static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* base) {
+static gchar*
+spit_data_imports_data_import_job_real_get_path (BatchImportJob* base)
+{
 	SpitDataImportsDataImportJob * self;
 	gchar* result = NULL;
 	GFile* _tmp0_;
@@ -859,38 +917,44 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b
 	result = _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 863 "DataImportJob.c"
+#line 921 "DataImportJob.c"
 }
 
 
-static gpointer _batch_import_job_ref0 (gpointer self) {
+static gpointer
+_batch_import_job_ref0 (gpointer self)
+{
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 870 "DataImportJob.c"
+#line 930 "DataImportJob.c"
 }
 
 
-static void spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
+static void
+spit_data_imports_data_import_job_real_set_associated (BatchImportJob* base,
+                                                       BatchImportJob* associated)
+{
 	SpitDataImportsDataImportJob * self;
-	BatchImportJob* _tmp0_;
-	SpitDataImportsDataImportJob* _tmp1_;
+	SpitDataImportsDataImportJob* _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp0_ = associated;
-#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) _tmp0_) : NULL);
+	_tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB) ? ((SpitDataImportsDataImportJob*) associated) : NULL);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_batch_import_job_unref0 (self->priv->associated);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	self->priv->associated = _tmp1_;
-#line 890 "DataImportJob.c"
+	self->priv->associated = _tmp0_;
+#line 950 "DataImportJob.c"
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
+static gboolean
+spit_data_imports_data_import_job_real_determine_file_size (BatchImportJob* base,
+                                                            guint64* filesize,
+                                                            GFile* * file)
+{
 	SpitDataImportsDataImportJob * self;
 	guint64 _vala_filesize = 0ULL;
 	GFile* _vala_file = NULL;
@@ -912,25 +976,30 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
 	if (filesize) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*filesize = _vala_filesize;
-#line 916 "DataImportJob.c"
+#line 980 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (file) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file = _vala_file;
-#line 922 "DataImportJob.c"
+#line 986 "DataImportJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file);
-#line 926 "DataImportJob.c"
+#line 990 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 930 "DataImportJob.c"
+#line 994 "DataImportJob.c"
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean
+spit_data_imports_data_import_job_real_prepare (BatchImportJob* base,
+                                                GFile* * file_to_import,
+                                                gboolean* copy_to_library,
+                                                GError** error)
+{
 	SpitDataImportsDataImportJob * self;
 	GFile* _vala_file_to_import = NULL;
 	gboolean _vala_copy_to_library = FALSE;
@@ -985,66 +1054,68 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob*
 	if (file_to_import) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file_to_import = _vala_file_to_import;
-#line 989 "DataImportJob.c"
+#line 1058 "DataImportJob.c"
 	} else {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 993 "DataImportJob.c"
+#line 1062 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (copy_to_library) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 999 "DataImportJob.c"
+#line 1068 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1003 "DataImportJob.c"
+#line 1072 "DataImportJob.c"
 }
 
 
-static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+static gboolean
+spit_data_imports_data_import_job_real_complete (BatchImportJob* base,
+                                                 MediaSource* source,
+                                                 BatchImportRoll* import_roll,
+                                                 GError** error)
+{
 	SpitDataImportsDataImportJob * self;
 	gboolean result = FALSE;
 	LibraryPhoto* photo = NULL;
-	MediaSource* _tmp0_;
+	LibraryPhoto* _tmp0_;
 	LibraryPhoto* _tmp1_;
-	LibraryPhoto* _tmp2_;
 	SpitDataImportsImportableMediaItem* src_photo = NULL;
-	SpitDataImportsDataImportSource* _tmp3_;
-	SpitDataImportsImportableMediaItem* _tmp4_;
-	HierarchicalTagIndex* _tmp5_;
+	SpitDataImportsDataImportSource* _tmp2_;
+	SpitDataImportsImportableMediaItem* _tmp3_;
+	HierarchicalTagIndex* _tmp4_;
 	SpitDataImportsImportableTag** src_tags = NULL;
-	SpitDataImportsImportableMediaItem* _tmp17_;
-	gint _tmp18_;
-	SpitDataImportsImportableTag** _tmp19_;
+	SpitDataImportsImportableMediaItem* _tmp15_;
+	gint _tmp16_;
+	SpitDataImportsImportableTag** _tmp17_;
 	gint src_tags_length1;
 	gint _src_tags_size_;
-	SpitDataImportsImportableTag** _tmp20_;
-	gint _tmp20__length1;
+	SpitDataImportsImportableTag** _tmp18_;
+	gint _tmp18__length1;
 	SpitDataImportsImportableEvent* src_event = NULL;
-	SpitDataImportsImportableMediaItem* _tmp61_;
-	SpitDataImportsImportableEvent* _tmp62_;
-	SpitDataImportsImportableEvent* _tmp63_;
+	SpitDataImportsImportableMediaItem* _tmp57_;
+	SpitDataImportsImportableEvent* _tmp58_;
+	SpitDataImportsImportableEvent* _tmp59_;
 	Rating dst_rating = 0;
 	SpitDataImportsImportableRating* src_rating = NULL;
-	SpitDataImportsImportableMediaItem* _tmp74_;
-	SpitDataImportsImportableRating* _tmp75_;
-	SpitDataImportsImportableRating* _tmp76_;
-	gboolean _tmp77_;
-	LibraryPhoto* _tmp83_;
-	Rating _tmp84_;
+	SpitDataImportsImportableMediaItem* _tmp69_;
+	SpitDataImportsImportableRating* _tmp70_;
+	SpitDataImportsImportableRating* _tmp71_;
+	LibraryPhoto* _tmp74_;
+	Rating _tmp75_;
 	gchar* title = NULL;
-	SpitDataImportsImportableMediaItem* _tmp85_;
-	gchar* _tmp86_;
-	const gchar* _tmp87_;
+	SpitDataImportsImportableMediaItem* _tmp76_;
+	gchar* _tmp77_;
+	const gchar* _tmp78_;
 	time_t* date_time = NULL;
-	SpitDataImportsImportableMediaItem* _tmp90_;
-	time_t* _tmp91_;
-	time_t* _tmp92_;
-	LibraryPhoto* _tmp95_;
-	BatchImportRoll* _tmp96_;
-	ImportID _tmp97_;
+	SpitDataImportsImportableMediaItem* _tmp81_;
+	time_t* _tmp82_;
+	time_t* _tmp83_;
+	LibraryPhoto* _tmp86_;
+	ImportID _tmp87_;
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1052,291 +1123,280 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 #line 95 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp0_ = source;
-#line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	photo = _tmp1_;
+	photo = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp2_ = photo;
+	_tmp1_ = photo;
 #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		result = FALSE;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (photo);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		return result;
-#line 1071 "DataImportJob.c"
+#line 1140 "DataImportJob.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp3_ = self->priv->import_source;
+	_tmp2_ = self->priv->import_source;
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp4_ = spit_data_imports_data_import_source_get_photo (_tmp3_);
+	_tmp3_ = spit_data_imports_data_import_source_get_photo (_tmp2_);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	src_photo = _tmp4_;
+	src_photo = _tmp3_;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp5_ = self->priv->detected_htags;
+	_tmp4_ = self->priv->detected_htags;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp5_ != NULL) {
-#line 1083 "DataImportJob.c"
+	if (_tmp4_ != NULL) {
+#line 1152 "DataImportJob.c"
 		GeeCollection* paths = NULL;
-		HierarchicalTagIndex* _tmp6_;
-		GeeCollection* _tmp7_;
+		HierarchicalTagIndex* _tmp5_;
+		GeeCollection* _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp6_ = self->priv->detected_htags;
+		_tmp5_ = self->priv->detected_htags;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_);
+		_tmp6_ = hierarchical_tag_index_get_all_paths (_tmp5_);
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		paths = _tmp7_;
-#line 1093 "DataImportJob.c"
+		paths = _tmp6_;
+#line 1162 "DataImportJob.c"
 		{
 			GeeIterator* _path_it = NULL;
-			GeeCollection* _tmp8_;
-			GeeIterator* _tmp9_;
+			GeeCollection* _tmp7_;
+			GeeIterator* _tmp8_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp8_ = paths;
+			_tmp7_ = paths;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_path_it = _tmp9_;
+			_path_it = _tmp8_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1106 "DataImportJob.c"
-				GeeIterator* _tmp10_;
-				gboolean _tmp11_;
+#line 1175 "DataImportJob.c"
+				GeeIterator* _tmp9_;
 				gchar* path = NULL;
-				GeeIterator* _tmp12_;
-				gpointer _tmp13_;
-				const gchar* _tmp14_;
-				Tag* _tmp15_;
-				Tag* _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp10_ = _path_it;
+				GeeIterator* _tmp10_;
+				gpointer _tmp11_;
+				const gchar* _tmp12_;
+				Tag* _tmp13_;
+				Tag* _tmp14_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp11_ = gee_iterator_next (_tmp10_);
+				_tmp9_ = _path_it;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (!_tmp11_) {
+				if (!gee_iterator_next (_tmp9_)) {
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1123 "DataImportJob.c"
+#line 1189 "DataImportJob.c"
 				}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp12_ = _path_it;
+				_tmp10_ = _path_it;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp13_ = gee_iterator_get (_tmp12_);
+				_tmp11_ = gee_iterator_get (_tmp10_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				path = (gchar*) _tmp13_;
+				path = (gchar*) _tmp11_;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp14_ = path;
+				_tmp12_ = path;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp15_ = tag_for_path (_tmp14_);
+				_tmp13_ = tag_for_path (_tmp12_);
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp16_ = _tmp15_;
+				_tmp14_ = _tmp13_;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_g_object_unref0 (_tmp16_);
+				_g_object_unref0 (_tmp14_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (path);
-#line 1141 "DataImportJob.c"
+#line 1207 "DataImportJob.c"
 			}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_g_object_unref0 (_path_it);
-#line 1145 "DataImportJob.c"
+#line 1211 "DataImportJob.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (paths);
-#line 1149 "DataImportJob.c"
+#line 1215 "DataImportJob.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp17_ = src_photo;
+	_tmp15_ = src_photo;
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp19_ = spit_data_imports_importable_media_item_get_tags (_tmp17_, &_tmp18_);
+	_tmp17_ = spit_data_imports_importable_media_item_get_tags (_tmp15_, &_tmp16_);
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	src_tags = _tmp19_;
+	src_tags = _tmp17_;
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	src_tags_length1 = _tmp18_;
+	src_tags_length1 = _tmp16_;
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_src_tags_size_ = src_tags_length1;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp20_ = src_tags;
+	_tmp18_ = src_tags;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp20__length1 = src_tags_length1;
-#line 1165 "DataImportJob.c"
+	_tmp18__length1 = src_tags_length1;
+#line 1231 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
 		gint _src_tag_collection_size_ = 0;
 		gint src_tag_it = 0;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		src_tag_collection = _tmp20_;
+		src_tag_collection = _tmp18_;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		src_tag_collection_length1 = _tmp20__length1;
+		src_tag_collection_length1 = _tmp18__length1;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
-#line 1177 "DataImportJob.c"
-			SpitDataImportsImportableTag* _tmp21_;
+		for (src_tag_it = 0; src_tag_it < _tmp18__length1; src_tag_it = src_tag_it + 1) {
+#line 1243 "DataImportJob.c"
+			SpitDataImportsImportableTag* _tmp19_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
+			_tmp19_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			src_tag = _tmp21_;
-#line 1184 "DataImportJob.c"
+			src_tag = _tmp19_;
+#line 1250 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
-				SpitDataImportsImportableTag* _tmp22_;
-				gint _tmp23_;
-				gchar** _tmp24_;
+				SpitDataImportsImportableTag* _tmp20_;
+				gint _tmp21_;
+				gchar** _tmp22_;
+				gchar** _tmp23_;
+				gint _tmp23__length1;
+				gint _tmp24_;
 				gchar** _tmp25_;
-				gint _tmp25__length1;
-				gint _tmp26_;
-				gchar** _tmp27_;
-				gchar** _tmp28_;
-				gint _tmp28__length1;
-				gchar* _tmp29_;
-				gchar* _tmp30_;
-				const gchar* _tmp31_;
+				gchar** _tmp26_;
+				gint _tmp26__length1;
+				gchar* _tmp27_;
+				gchar* _tmp28_;
+				const gchar* _tmp29_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp22_ = src_tag;
+				_tmp20_ = src_tag;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp24_ = spit_data_imports_data_import_job_build_path_components (self, _tmp22_, &_tmp23_);
+				_tmp22_ = spit_data_imports_data_import_job_build_path_components (self, _tmp20_, &_tmp21_);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp25_ = _tmp24_;
+				_tmp23_ = _tmp22_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp25__length1 = _tmp23_;
+				_tmp23__length1 = _tmp21_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp27_ = tag_prep_tag_names (_tmp25_, _tmp23_, &_tmp26_);
+				_tmp25_ = tag_prep_tag_names (_tmp23_, _tmp21_, &_tmp24_);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp28_ = _tmp27_;
+				_tmp26_ = _tmp25_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp28__length1 = _tmp26_;
+				_tmp26__length1 = _tmp24_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp29_ = hierarchical_tag_utilities_join_path_components (_tmp28_, _tmp26_);
+				_tmp27_ = hierarchical_tag_utilities_join_path_components (_tmp26_, _tmp24_);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp30_ = _tmp29_;
+				_tmp28_ = _tmp27_;
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_free), NULL);
+				_tmp26_ = (_vala_array_free (_tmp26_, _tmp26__length1, (GDestroyNotify) g_free), NULL);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp25_ = (_vala_array_free (_tmp25_, _tmp25__length1, (GDestroyNotify) g_free), NULL);
+				_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_free), NULL);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				prepped = _tmp30_;
+				prepped = _tmp28_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp31_ = prepped;
+				_tmp29_ = prepped;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (_tmp31_ != NULL) {
-#line 1227 "DataImportJob.c"
-					const gchar* _tmp32_;
-					GeeList* _tmp33_;
-					GeeList* _tmp34_;
-					gint _tmp35_;
-					gint _tmp36_;
-					gboolean _tmp37_;
-					const gchar* _tmp57_;
-					Tag* _tmp58_;
-					Tag* _tmp59_;
-					LibraryPhoto* _tmp60_;
+				if (_tmp29_ != NULL) {
+#line 1293 "DataImportJob.c"
+					const gchar* _tmp30_;
+					GeeList* _tmp31_;
+					GeeList* _tmp32_;
+					gint _tmp33_;
+					gint _tmp34_;
+					gboolean _tmp35_;
+					const gchar* _tmp53_;
+					Tag* _tmp54_;
+					Tag* _tmp55_;
+					LibraryPhoto* _tmp56_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp32_ = prepped;
+					_tmp30_ = prepped;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp33_ = hierarchical_tag_utilities_enumerate_path_components (_tmp32_);
+					_tmp31_ = hierarchical_tag_utilities_enumerate_path_components (_tmp30_);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp34_ = _tmp33_;
+					_tmp32_ = _tmp31_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
+					_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp36_ = _tmp35_;
+					_tmp34_ = _tmp33_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp37_ = _tmp36_ == 1;
+					_tmp35_ = _tmp34_ == 1;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_g_object_unref0 (_tmp34_);
+					_g_object_unref0 (_tmp32_);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					if (_tmp37_) {
-#line 1254 "DataImportJob.c"
-						const gchar* _tmp38_;
-						gboolean _tmp39_;
+					if (_tmp35_) {
+#line 1320 "DataImportJob.c"
+						const gchar* _tmp36_;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp38_ = prepped;
+						_tmp36_ = prepped;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING);
-#line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						if (_tmp39_) {
-#line 1263 "DataImportJob.c"
-							const gchar* _tmp40_;
-							gchar* _tmp41_;
+						if (g_str_has_prefix (_tmp36_, TAG_PATH_SEPARATOR_STRING)) {
+#line 1326 "DataImportJob.c"
+							const gchar* _tmp37_;
+							gchar* _tmp38_;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp40_ = prepped;
+							_tmp37_ = prepped;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp41_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp40_);
+							_tmp38_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp37_);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_free0 (prepped);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							prepped = _tmp41_;
-#line 1274 "DataImportJob.c"
+							prepped = _tmp38_;
+#line 1337 "DataImportJob.c"
 						}
 					} else {
 						GeeList* parents = NULL;
-						const gchar* _tmp42_;
-						GeeList* _tmp43_;
-						GeeList* _tmp44_;
-						gint _tmp45_;
-						gint _tmp46_;
+						const gchar* _tmp39_;
+						GeeList* _tmp40_;
+						GeeList* _tmp41_;
+						gint _tmp42_;
+						gint _tmp43_;
 						gchar* top_level_parent = NULL;
-						GeeList* _tmp47_;
-						gpointer _tmp48_;
+						GeeList* _tmp44_;
+						gpointer _tmp45_;
 						gchar* flat_top_level_parent = NULL;
+						const gchar* _tmp46_;
+						gchar* _tmp47_;
+						TagSourceCollection* _tmp48_;
 						const gchar* _tmp49_;
-						gchar* _tmp50_;
-						TagSourceCollection* _tmp51_;
-						const gchar* _tmp52_;
-						gboolean _tmp53_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp42_ = prepped;
+						_tmp39_ = prepped;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp43_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp42_);
+						_tmp40_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp39_);
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						parents = _tmp43_;
+						parents = _tmp40_;
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp44_ = parents;
+						_tmp41_ = parents;
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp45_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp42_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp46_ = _tmp45_;
+						_tmp43_ = _tmp42_;
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_vala_assert (_tmp46_ > 0, "parents.size > 0");
+						_vala_assert (_tmp43_ > 0, "parents.size > 0");
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp47_ = parents;
+						_tmp44_ = parents;
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp48_ = gee_list_get (_tmp47_, 0);
+						_tmp45_ = gee_list_get (_tmp44_, 0);
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						top_level_parent = (gchar*) _tmp48_;
+						top_level_parent = (gchar*) _tmp45_;
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp49_ = top_level_parent;
+						_tmp46_ = top_level_parent;
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp50_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp49_);
+						_tmp47_ = hierarchical_tag_utilities_hierarchical_to_flat (_tmp46_);
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						flat_top_level_parent = _tmp50_;
+						flat_top_level_parent = _tmp47_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp51_ = tag_global;
+						_tmp48_ = tag_global;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp52_ = flat_top_level_parent;
+						_tmp49_ = flat_top_level_parent;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						_tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE);
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-						if (_tmp53_) {
-#line 1326 "DataImportJob.c"
-							const gchar* _tmp54_;
-							Tag* _tmp55_;
-							Tag* _tmp56_;
+						if (tag_source_collection_exists (_tmp48_, _tmp49_, FALSE)) {
+#line 1386 "DataImportJob.c"
+							const gchar* _tmp50_;
+							Tag* _tmp51_;
+							Tag* _tmp52_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp54_ = flat_top_level_parent;
+							_tmp50_ = flat_top_level_parent;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp55_ = tag_for_path (_tmp54_);
+							_tmp51_ = tag_for_path (_tmp50_);
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_tmp56_ = _tmp55_;
+							_tmp52_ = _tmp51_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							tag_promote (_tmp56_);
+							tag_promote (_tmp52_);
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-							_g_object_unref0 (_tmp56_);
-#line 1340 "DataImportJob.c"
+							_g_object_unref0 (_tmp52_);
+#line 1400 "DataImportJob.c"
 						}
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_free0 (flat_top_level_parent);
@@ -1344,185 +1404,169 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_g_free0 (top_level_parent);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (parents);
-#line 1348 "DataImportJob.c"
+#line 1408 "DataImportJob.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp57_ = prepped;
+					_tmp53_ = prepped;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp58_ = tag_for_path (_tmp57_);
+					_tmp54_ = tag_for_path (_tmp53_);
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp59_ = _tmp58_;
+					_tmp55_ = _tmp54_;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp60_ = photo;
+					_tmp56_ = photo;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
+					tag_attach (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_g_object_unref0 (_tmp59_);
-#line 1362 "DataImportJob.c"
+					_g_object_unref0 (_tmp55_);
+#line 1422 "DataImportJob.c"
 				}
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 1368 "DataImportJob.c"
+#line 1428 "DataImportJob.c"
 			}
 		}
 	}
 #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp61_ = src_photo;
+	_tmp57_ = src_photo;
 #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp62_ = spit_data_imports_importable_media_item_get_event (_tmp61_);
+	_tmp58_ = spit_data_imports_importable_media_item_get_event (_tmp57_);
 #line 139 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	src_event = _tmp62_;
+	src_event = _tmp58_;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp63_ = src_event;
+	_tmp59_ = src_event;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp63_ != NULL) {
-#line 1382 "DataImportJob.c"
+	if (_tmp59_ != NULL) {
+#line 1442 "DataImportJob.c"
 		gchar* prepped = NULL;
-		SpitDataImportsImportableEvent* _tmp64_;
-		gchar* _tmp65_;
-		gchar* _tmp66_;
-		gchar* _tmp67_;
-		gchar* _tmp68_;
-		const gchar* _tmp69_;
+		SpitDataImportsImportableEvent* _tmp60_;
+		gchar* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
+		gchar* _tmp64_;
+		const gchar* _tmp65_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp64_ = src_event;
+		_tmp60_ = src_event;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp65_ = spit_data_imports_importable_event_get_name (_tmp64_);
+		_tmp61_ = spit_data_imports_importable_event_get_name (_tmp60_);
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp66_ = _tmp65_;
+		_tmp62_ = _tmp61_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp67_ = prepare_input_text (_tmp66_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
+		_tmp63_ = prepare_input_text (_tmp62_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT, -1);
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp68_ = _tmp67_;
+		_tmp64_ = _tmp63_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_g_free0 (_tmp66_);
+		_g_free0 (_tmp62_);
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		prepped = _tmp68_;
+		prepped = _tmp64_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp69_ = prepped;
+		_tmp65_ = prepped;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		if (_tmp69_ != NULL) {
-#line 1408 "DataImportJob.c"
-			LibraryPhoto* _tmp70_;
-			BatchImportRoll* _tmp71_;
-			ViewCollection* _tmp72_;
-			const gchar* _tmp73_;
-#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp70_ = photo;
+		if (_tmp65_ != NULL) {
+#line 1468 "DataImportJob.c"
+			LibraryPhoto* _tmp66_;
+			ViewCollection* _tmp67_;
+			const gchar* _tmp68_;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp71_ = import_roll;
+			_tmp66_ = photo;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp72_ = _tmp71_->generated_events;
+			_tmp67_ = import_roll->generated_events;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp73_ = prepped;
+			_tmp68_ = prepped;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_);
-#line 1423 "DataImportJob.c"
+			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_MEDIA_SOURCE, MediaSource), _tmp67_, _tmp68_);
+#line 1480 "DataImportJob.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_free0 (prepped);
-#line 1427 "DataImportJob.c"
+#line 1484 "DataImportJob.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp74_ = src_photo;
+	_tmp69_ = src_photo;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp75_ = spit_data_imports_importable_media_item_get_rating (_tmp74_);
+	_tmp70_ = spit_data_imports_importable_media_item_get_rating (_tmp69_);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	src_rating = _tmp75_;
+	src_rating = _tmp70_;
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp76_ = src_rating;
+	_tmp71_ = src_rating;
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp77_ = spit_data_imports_importable_rating_is_rejected (_tmp76_);
-#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp77_) {
+	if (spit_data_imports_importable_rating_is_rejected (_tmp71_)) {
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		dst_rating = RATING_REJECTED;
-#line 1443 "DataImportJob.c"
+#line 1498 "DataImportJob.c"
 	} else {
-		SpitDataImportsImportableRating* _tmp78_;
-		gboolean _tmp79_;
-#line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp78_ = src_rating;
+		SpitDataImportsImportableRating* _tmp72_;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp79_ = spit_data_imports_importable_rating_is_unrated (_tmp78_);
+		_tmp72_ = src_rating;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		if (_tmp79_) {
+		if (spit_data_imports_importable_rating_is_unrated (_tmp72_)) {
 #line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			dst_rating = RATING_UNRATED;
-#line 1455 "DataImportJob.c"
+#line 1507 "DataImportJob.c"
 		} else {
-			SpitDataImportsImportableRating* _tmp80_;
-			gint _tmp81_;
-			Rating _tmp82_;
+			SpitDataImportsImportableRating* _tmp73_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp80_ = src_rating;
+			_tmp73_ = src_rating;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp81_ = spit_data_imports_importable_rating_get_value (_tmp80_);
-#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp82_ = rating_unserialize (_tmp81_);
-#line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			dst_rating = _tmp82_;
-#line 1468 "DataImportJob.c"
+			dst_rating = rating_unserialize (spit_data_imports_importable_rating_get_value (_tmp73_));
+#line 1514 "DataImportJob.c"
 		}
 	}
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp83_ = photo;
+	_tmp74_ = photo;
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp84_ = dst_rating;
+	_tmp75_ = dst_rating;
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, TYPE_MEDIA_SOURCE, MediaSource), _tmp84_);
+	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_MEDIA_SOURCE, MediaSource), _tmp75_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp85_ = src_photo;
+	_tmp76_ = src_photo;
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp86_ = spit_data_imports_importable_media_item_get_title (_tmp85_);
+	_tmp77_ = spit_data_imports_importable_media_item_get_title (_tmp76_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	title = _tmp86_;
+	title = _tmp77_;
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp87_ = title;
+	_tmp78_ = title;
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp87_ != NULL) {
-#line 1487 "DataImportJob.c"
-		LibraryPhoto* _tmp88_;
-		const gchar* _tmp89_;
+	if (_tmp78_ != NULL) {
+#line 1533 "DataImportJob.c"
+		LibraryPhoto* _tmp79_;
+		const gchar* _tmp80_;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp88_ = photo;
+		_tmp79_ = photo;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp89_ = title;
+		_tmp80_ = title;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_);
-#line 1496 "DataImportJob.c"
+		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE, MediaSource), _tmp80_);
+#line 1542 "DataImportJob.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp90_ = src_photo;
+	_tmp81_ = src_photo;
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp91_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp90_);
+	_tmp82_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp81_);
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	date_time = _tmp91_;
+	date_time = _tmp82_;
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp92_ = date_time;
+	_tmp83_ = date_time;
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	if (_tmp92_ != NULL) {
-#line 1508 "DataImportJob.c"
-		LibraryPhoto* _tmp93_;
-		time_t* _tmp94_;
+	if (_tmp83_ != NULL) {
+#line 1554 "DataImportJob.c"
+		LibraryPhoto* _tmp84_;
+		time_t* _tmp85_;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp93_ = photo;
+		_tmp84_ = photo;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp94_ = date_time;
+		_tmp85_ = date_time;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_);
-#line 1517 "DataImportJob.c"
+		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_DATEABLE, Dateable), *_tmp85_);
+#line 1563 "DataImportJob.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp95_ = photo;
-#line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp96_ = import_roll;
+	_tmp86_ = photo;
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp97_ = _tmp96_->import_id;
+	_tmp87_ = import_roll->import_id;
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_PHOTO, Photo), &_tmp97_);
+	photo_set_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_PHOTO, Photo), &_tmp87_);
 #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	result = TRUE;
 #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1541,19 +1585,23 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_g_object_unref0 (photo);
 #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1545 "DataImportJob.c"
+#line 1589 "DataImportJob.c"
 }
 
 
-static gchar** spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self, SpitDataImportsImportableTag* tag, int* result_length1) {
+static gchar**
+spit_data_imports_data_import_job_build_path_components (SpitDataImportsDataImportJob* self,
+                                                         SpitDataImportsImportableTag* tag,
+                                                         int* result_length1)
+{
 	gchar** result = NULL;
 	GeeList* components = NULL;
 	GeeLinkedList* _tmp0_;
-	GeeList* _tmp13_;
-	gint _tmp14_;
-	gpointer* _tmp15_;
-	gchar** _tmp16_;
-	gint _tmp16__length1;
+	GeeList* _tmp12_;
+	gint _tmp13_;
+	gpointer* _tmp14_;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_JOB (self), NULL);
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1562,107 +1610,106 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1566 "DataImportJob.c"
+#line 1614 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag* current_tag = NULL;
 		SpitDataImportsImportableTag* _tmp1_;
-		SpitDataImportsImportableTag* _tmp2_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp1_ = tag;
+		_tmp1_ = _g_object_ref0 (tag);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		current_tag = _tmp2_;
-#line 1577 "DataImportJob.c"
+		current_tag = _tmp1_;
+#line 1622 "DataImportJob.c"
 		{
-			gboolean _tmp3_ = FALSE;
+			gboolean _tmp2_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-			_tmp3_ = TRUE;
+			_tmp2_ = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1584 "DataImportJob.c"
-				SpitDataImportsImportableTag* _tmp6_;
-				GeeList* _tmp7_;
-				SpitDataImportsImportableTag* _tmp8_;
+#line 1629 "DataImportJob.c"
+				SpitDataImportsImportableTag* _tmp5_;
+				GeeList* _tmp6_;
+				SpitDataImportsImportableTag* _tmp7_;
+				gchar* _tmp8_;
 				gchar* _tmp9_;
 				gchar* _tmp10_;
 				gchar* _tmp11_;
-				gchar* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (!_tmp3_) {
-#line 1594 "DataImportJob.c"
+				if (!_tmp2_) {
+#line 1639 "DataImportJob.c"
+					SpitDataImportsImportableTag* _tmp3_;
 					SpitDataImportsImportableTag* _tmp4_;
-					SpitDataImportsImportableTag* _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp4_ = current_tag;
+					_tmp3_ = current_tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					_tmp5_ = spit_data_imports_importable_tag_get_parent (_tmp4_);
+					_tmp4_ = spit_data_imports_importable_tag_get_parent (_tmp3_);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (current_tag);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-					current_tag = _tmp5_;
-#line 1605 "DataImportJob.c"
+					current_tag = _tmp4_;
+#line 1650 "DataImportJob.c"
 				}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp3_ = FALSE;
+				_tmp2_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp6_ = current_tag;
+				_tmp5_ = current_tag;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				if (!(_tmp6_ != NULL)) {
+				if (!(_tmp5_ != NULL)) {
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1615 "DataImportJob.c"
+#line 1660 "DataImportJob.c"
 				}
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp7_ = components;
+				_tmp6_ = components;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp8_ = current_tag;
+				_tmp7_ = current_tag;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp9_ = spit_data_imports_importable_tag_get_name (_tmp8_);
+				_tmp8_ = spit_data_imports_importable_tag_get_name (_tmp7_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp10_ = _tmp9_;
+				_tmp9_ = _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp11_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp10_);
+				_tmp10_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp9_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_tmp12_ = _tmp11_;
+				_tmp11_ = _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				gee_list_insert (_tmp7_, 0, _tmp12_);
+				gee_list_insert (_tmp6_, 0, _tmp11_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_g_free0 (_tmp12_);
+				_g_free0 (_tmp11_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-				_g_free0 (_tmp10_);
-#line 1635 "DataImportJob.c"
+				_g_free0 (_tmp9_);
+#line 1680 "DataImportJob.c"
 			}
 		}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (current_tag);
-#line 1640 "DataImportJob.c"
+#line 1685 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp13_ = components;
+	_tmp12_ = components;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp15_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp14_);
+	_tmp14_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp13_);
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	_tmp16__length1 = _tmp14_;
+	_tmp15__length1 = _tmp13_;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (result_length1) {
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-		*result_length1 = _tmp16__length1;
-#line 1654 "DataImportJob.c"
+		*result_length1 = _tmp15__length1;
+#line 1699 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
-	result = _tmp16_;
+	result = _tmp15_;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_g_object_unref0 (components);
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1662 "DataImportJob.c"
+#line 1707 "DataImportJob.c"
 }
 
 
-static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass) {
+static void
+spit_data_imports_data_import_job_class_init (SpitDataImportsDataImportJobClass * klass)
+{
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	spit_data_imports_data_import_job_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1687,22 +1734,26 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
 	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
-#line 1691 "DataImportJob.c"
+#line 1738 "DataImportJob.c"
 }
 
 
-static void spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self) {
+static void
+spit_data_imports_data_import_job_instance_init (SpitDataImportsDataImportJob * self)
+{
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv = SPIT_DATA_IMPORTS_DATA_IMPORT_JOB_GET_PRIVATE (self);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->associated = NULL;
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->detected_htags = NULL;
-#line 1702 "DataImportJob.c"
+#line 1751 "DataImportJob.c"
 }
 
 
-static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
+static void
+spit_data_imports_data_import_job_finalize (BatchImportJob * obj)
+{
 	SpitDataImportsDataImportJob * self;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob);
@@ -1716,14 +1767,16 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
 	_hierarchical_tag_index_unref0 (self->priv->detected_htags);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj);
-#line 1720 "DataImportJob.c"
+#line 1771 "DataImportJob.c"
 }
 
 
 /**
  * A specialized import job implementation for alien databases.
  */
-GType spit_data_imports_data_import_job_get_type (void) {
+GType
+spit_data_imports_data_import_job_get_type (void)
+{
 	static volatile gsize spit_data_imports_data_import_job_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_data_import_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsDataImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_data_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsDataImportJob), 0, (GInstanceInitFunc) spit_data_imports_data_import_job_instance_init, NULL };
@@ -1735,7 +1788,11 @@ GType spit_data_imports_data_import_job_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -1747,7 +1804,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index d3990dc..b4786b1 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.36.6, the Vala compiler
+/* DataImportSource.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImportSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -105,43 +106,65 @@ static gpointer spit_data_imports_data_import_source_parent_class = NULL;
 
 gpointer spit_data_imports_data_import_source_ref (gpointer instance);
 void spit_data_imports_data_import_source_unref (gpointer instance);
-GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object);
-void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object);
+GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
+                                                             const gchar* nick,
+                                                             const gchar* blurb,
+                                                             GType object_type,
+                                                             GParamFlags flags);
+void spit_data_imports_value_set_data_import_source (GValue* value,
+                                                     gpointer v_object);
+void spit_data_imports_value_take_data_import_source (GValue* value,
+                                                      gpointer v_object);
 gpointer spit_data_imports_value_get_data_import_source (const GValue* value);
 GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST;
 gpointer metadata_date_time_ref (gpointer instance);
 void metadata_date_time_unref (gpointer instance);
-GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_metadata_date_time (GValue* value, gpointer v_object);
-void value_take_metadata_date_time (GValue* value, gpointer v_object);
+GParamSpec* param_spec_metadata_date_time (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_metadata_date_time (GValue* value,
+                                   gpointer v_object);
+void value_take_metadata_date_time (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_metadata_date_time (const GValue* value);
 GType metadata_date_time_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSourcePrivate))
-enum  {
-	SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_DUMMY_PROPERTY
-};
 SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo);
-SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo);
+SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type,
+                                                                                 SpitDataImportsImportableMediaItem* db_photo);
 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_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
-void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
+void media_metadata_read_from_file (MediaMetadata* self,
+                                    GFile* file,
+                                    GError** error);
 gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self);
 gchar* media_metadata_get_title (MediaMetadata* self);
 MetadataDateTime* metadata_date_time_new (time_t timestamp);
-MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp);
+MetadataDateTime* metadata_date_time_construct (GType object_type,
+                                                time_t timestamp);
 MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self);
 gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
-guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
-time_t query_file_modified (GFile* file, GError** error);
+guint64 query_total_file_size (GFile* file_or_dir,
+                               GCancellable* cancellable,
+                               GError** error);
+time_t query_file_modified (GFile* file,
+                            GError** error);
 gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self);
 GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self);
 gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self);
@@ -156,183 +179,173 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self);
 guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self);
 SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self);
 gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self);
-gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
+gboolean library_photo_has_nontrash_duplicate (GFile* file,
+                                               const gchar* thumbnail_md5,
+                                               const gchar* full_md5,
+                                               PhotoFileFormat file_format);
 gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self);
 static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj);
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 168 "DataImportSource.c"
+#line 196 "DataImportSource.c"
 }
 
 
-static gpointer _metadata_date_time_ref0 (gpointer self) {
+static gpointer
+_metadata_date_time_ref0 (gpointer self)
+{
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 175 "DataImportSource.c"
+#line 205 "DataImportSource.c"
 }
 
 
-SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo) {
+SpitDataImportsDataImportSource*
+spit_data_imports_data_import_source_construct (GType object_type,
+                                                SpitDataImportsImportableMediaItem* db_photo)
+{
 	SpitDataImportsDataImportSource* self = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
-	SpitDataImportsImportableMediaItem* _tmp1_;
 	gchar* folder_path = NULL;
-	SpitDataImportsImportableMediaItem* _tmp2_;
-	gchar* _tmp3_;
+	gchar* _tmp1_;
 	gchar* filename = NULL;
-	SpitDataImportsImportableMediaItem* _tmp4_;
-	gchar* _tmp5_;
+	gchar* _tmp2_;
 	GFile* photo = NULL;
-	gboolean _tmp6_ = FALSE;
-	const gchar* _tmp7_;
-	gboolean _tmp20_ = FALSE;
-	GFile* _tmp21_;
+	gboolean _tmp3_ = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp14_ = FALSE;
+	GFile* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_MEDIA_ITEM (db_photo), NULL);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self = (SpitDataImportsDataImportSource*) g_type_create_instance (object_type);
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp0_ = db_photo;
-#line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (db_photo);
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_object_unref0 (self->priv->db_photo);
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	self->priv->db_photo = _tmp1_;
+	self->priv->db_photo = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp2_ = db_photo;
+	_tmp1_ = spit_data_imports_importable_media_item_get_folder_path (db_photo);
 #line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp3_ = spit_data_imports_importable_media_item_get_folder_path (_tmp2_);
-#line 31 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	folder_path = _tmp3_;
-#line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp4_ = db_photo;
+	folder_path = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp5_ = spit_data_imports_importable_media_item_get_filename (_tmp4_);
+	_tmp2_ = spit_data_imports_importable_media_item_get_filename (db_photo);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	filename = _tmp5_;
+	filename = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	photo = NULL;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp7_ = folder_path;
+	_tmp4_ = folder_path;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	if (_tmp7_ != NULL) {
-#line 225 "DataImportSource.c"
-		const gchar* _tmp8_;
+	if (_tmp4_ != NULL) {
+#line 249 "DataImportSource.c"
+		const gchar* _tmp5_;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp8_ = filename;
+		_tmp5_ = filename;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp6_ = _tmp8_ != NULL;
-#line 231 "DataImportSource.c"
+		_tmp3_ = _tmp5_ != NULL;
+#line 255 "DataImportSource.c"
 	} else {
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp6_ = FALSE;
-#line 235 "DataImportSource.c"
+		_tmp3_ = FALSE;
+#line 259 "DataImportSource.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	if (_tmp6_) {
-#line 239 "DataImportSource.c"
-		SpitDataImportsImportableMediaItem* _tmp9_;
+	if (_tmp3_) {
+#line 263 "DataImportSource.c"
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
 		GFile* _tmp12_;
 		GFile* _tmp13_;
-		SpitDataImportsImportableMediaItem* _tmp14_;
-		gchar* _tmp15_;
-		gchar* _tmp16_;
-		GFile* _tmp17_;
-		GFile* _tmp18_;
-		gboolean _tmp19_;
-#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp9_ = db_photo;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp10_ = spit_data_imports_importable_media_item_get_folder_path (_tmp9_);
+		_tmp6_ = spit_data_imports_importable_media_item_get_folder_path (db_photo);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp11_ = _tmp10_;
-#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp12_ = g_file_new_for_path (_tmp11_);
+		_tmp7_ = _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp13_ = _tmp12_;
+		_tmp8_ = g_file_new_for_path (_tmp7_);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp14_ = db_photo;
+		_tmp9_ = _tmp8_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp15_ = spit_data_imports_importable_media_item_get_filename (_tmp14_);
+		_tmp10_ = spit_data_imports_importable_media_item_get_filename (db_photo);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp16_ = _tmp15_;
+		_tmp11_ = _tmp10_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp17_ = g_file_get_child (_tmp13_, _tmp16_);
+		_tmp12_ = g_file_get_child (_tmp9_, _tmp11_);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_object_unref0 (photo);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		photo = _tmp17_;
+		photo = _tmp12_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp16_);
+		_g_free0 (_tmp11_);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_object_unref0 (_tmp13_);
+		_g_object_unref0 (_tmp9_);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp11_);
-#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp18_ = photo;
+		_g_free0 (_tmp7_);
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp19_ = g_file_query_exists (_tmp18_, NULL);
+		_tmp13_ = photo;
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		self->priv->backing_file_found = _tmp19_;
-#line 285 "DataImportSource.c"
+		self->priv->backing_file_found = g_file_query_exists (_tmp13_, NULL);
+#line 300 "DataImportSource.c"
 	} else {
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		self->priv->backing_file_found = FALSE;
-#line 289 "DataImportSource.c"
+#line 304 "DataImportSource.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp21_ = photo;
+	_tmp15_ = photo;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	if (_tmp21_ != NULL) {
-#line 295 "DataImportSource.c"
-		gboolean _tmp22_;
+	if (_tmp15_ != NULL) {
+#line 310 "DataImportSource.c"
+		gboolean _tmp16_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp22_ = self->priv->backing_file_found;
+		_tmp16_ = self->priv->backing_file_found;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp20_ = _tmp22_;
-#line 301 "DataImportSource.c"
+		_tmp14_ = _tmp16_;
+#line 316 "DataImportSource.c"
 	} else {
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp20_ = FALSE;
-#line 305 "DataImportSource.c"
+		_tmp14_ = FALSE;
+#line 320 "DataImportSource.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	if (_tmp20_) {
-#line 309 "DataImportSource.c"
+	if (_tmp14_) {
+#line 324 "DataImportSource.c"
 		PhotoMetadata* metadata = NULL;
-		PhotoMetadata* _tmp23_;
-		SpitDataImportsImportableMediaItem* _tmp30_;
-		gchar* _tmp31_;
-		const gchar* _tmp32_;
+		PhotoMetadata* _tmp17_;
+		gchar* _tmp24_;
+		const gchar* _tmp25_;
 		time_t* date_time = NULL;
-		SpitDataImportsImportableMediaItem* _tmp38_;
-		time_t* _tmp39_;
-		time_t* _tmp40_;
-		PhotoMetadata* _tmp48_;
+		time_t* _tmp31_;
+		time_t* _tmp32_;
+		PhotoMetadata* _tmp40_;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp23_ = photo_metadata_new ();
+		_tmp17_ = photo_metadata_new ();
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		metadata = _tmp23_;
-#line 324 "DataImportSource.c"
+		metadata = _tmp17_;
+#line 337 "DataImportSource.c"
 		{
-			PhotoMetadata* _tmp24_;
-			GFile* _tmp25_;
+			PhotoMetadata* _tmp18_;
+			GFile* _tmp19_;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp24_ = metadata;
+			_tmp18_ = metadata;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp25_ = photo;
+			_tmp19_ = photo;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp25_, &_inner_error_);
+			media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp19_, &_inner_error_);
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 336 "DataImportSource.c"
+#line 349 "DataImportSource.c"
 				goto __catch230_g_error;
 			}
 		}
@@ -340,33 +353,33 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		__catch230_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp26_;
-			gchar* _tmp27_;
-			GError* _tmp28_;
-			const gchar* _tmp29_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
+			GError* _tmp22_;
+			const gchar* _tmp23_;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp26_ = spit_data_imports_data_import_source_get_filename (self);
+			_tmp20_ = spit_data_imports_data_import_source_get_filename (self);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp27_ = _tmp26_;
+			_tmp21_ = _tmp20_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp28_ = e;
+			_tmp22_ = e;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp29_ = _tmp28_->message;
+			_tmp23_ = _tmp22_->message;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			g_warning ("DataImportSource.vala:48: Could not get file metadata for %s: %s", _tmp27_, _tmp29_);
+			g_warning ("DataImportSource.vala:48: Could not get file metadata for %s: %s", _tmp21_, _tmp23_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp27_);
+			_g_free0 (_tmp21_);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_media_metadata_unref0 (metadata);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			metadata = NULL;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 370 "DataImportSource.c"
+#line 383 "DataImportSource.c"
 		}
 		__finally230:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -385,179 +398,172 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			g_clear_error (&_inner_error_);
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 389 "DataImportSource.c"
+#line 402 "DataImportSource.c"
 		}
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp30_ = db_photo;
-#line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp31_ = spit_data_imports_importable_media_item_get_title (_tmp30_);
+		_tmp24_ = spit_data_imports_importable_media_item_get_title (db_photo);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (self->priv->title);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		self->priv->title = _tmp31_;
+		self->priv->title = _tmp24_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp32_ = self->priv->title;
+		_tmp25_ = self->priv->title;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		if (_tmp32_ == NULL) {
-#line 403 "DataImportSource.c"
-			gchar* _tmp33_ = NULL;
-			PhotoMetadata* _tmp34_;
-			gchar* _tmp37_;
+		if (_tmp25_ == NULL) {
+#line 414 "DataImportSource.c"
+			gchar* _tmp26_ = NULL;
+			PhotoMetadata* _tmp27_;
+			gchar* _tmp30_;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp34_ = metadata;
+			_tmp27_ = metadata;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			if (_tmp34_ != NULL) {
-#line 411 "DataImportSource.c"
-				PhotoMetadata* _tmp35_;
-				gchar* _tmp36_;
+			if (_tmp27_ != NULL) {
+#line 422 "DataImportSource.c"
+				PhotoMetadata* _tmp28_;
+				gchar* _tmp29_;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp35_ = metadata;
+				_tmp28_ = metadata;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp36_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_METADATA, MediaMetadata));
+				_tmp29_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata));
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (_tmp33_);
+				_g_free0 (_tmp26_);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp33_ = _tmp36_;
-#line 422 "DataImportSource.c"
+				_tmp26_ = _tmp29_;
+#line 433 "DataImportSource.c"
 			} else {
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (_tmp33_);
+				_g_free0 (_tmp26_);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp33_ = NULL;
-#line 428 "DataImportSource.c"
+				_tmp26_ = NULL;
+#line 439 "DataImportSource.c"
 			}
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp37_ = g_strdup (_tmp33_);
+			_tmp30_ = g_strdup (_tmp26_);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (self->priv->title);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->title = _tmp37_;
+			self->priv->title = _tmp30_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp33_);
-#line 438 "DataImportSource.c"
+			_g_free0 (_tmp26_);
+#line 449 "DataImportSource.c"
 		}
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp38_ = db_photo;
-#line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp39_ = spit_data_imports_importable_media_item_get_exposure_time (_tmp38_);
+		_tmp31_ = spit_data_imports_importable_media_item_get_exposure_time (db_photo);
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		date_time = _tmp39_;
+		date_time = _tmp31_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp40_ = date_time;
+		_tmp32_ = date_time;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		if (_tmp40_ != NULL) {
-#line 450 "DataImportSource.c"
-			time_t* _tmp41_;
-			MetadataDateTime* _tmp42_;
+		if (_tmp32_ != NULL) {
+#line 459 "DataImportSource.c"
+			time_t* _tmp33_;
+			MetadataDateTime* _tmp34_;
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp41_ = date_time;
+			_tmp33_ = date_time;
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp42_ = metadata_date_time_new (*_tmp41_);
+			_tmp34_ = metadata_date_time_new (*_tmp33_);
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_metadata_date_time_unref0 (self->priv->exposure_time);
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->exposure_time = _tmp42_;
-#line 461 "DataImportSource.c"
+			self->priv->exposure_time = _tmp34_;
+#line 470 "DataImportSource.c"
 		} else {
-			MetadataDateTime* _tmp43_ = NULL;
-			PhotoMetadata* _tmp44_;
-			MetadataDateTime* _tmp47_;
+			MetadataDateTime* _tmp35_ = NULL;
+			PhotoMetadata* _tmp36_;
+			MetadataDateTime* _tmp39_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp44_ = metadata;
+			_tmp36_ = metadata;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			if (_tmp44_ != NULL) {
-#line 470 "DataImportSource.c"
-				PhotoMetadata* _tmp45_;
-				MetadataDateTime* _tmp46_;
+			if (_tmp36_ != NULL) {
+#line 479 "DataImportSource.c"
+				PhotoMetadata* _tmp37_;
+				MetadataDateTime* _tmp38_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp45_ = metadata;
+				_tmp37_ = metadata;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp46_ = photo_metadata_get_exposure_date_time (_tmp45_);
+				_tmp38_ = photo_metadata_get_exposure_date_time (_tmp37_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_metadata_date_time_unref0 (_tmp43_);
+				_metadata_date_time_unref0 (_tmp35_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp43_ = _tmp46_;
-#line 481 "DataImportSource.c"
+				_tmp35_ = _tmp38_;
+#line 490 "DataImportSource.c"
 			} else {
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_metadata_date_time_unref0 (_tmp43_);
+				_metadata_date_time_unref0 (_tmp35_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp43_ = NULL;
-#line 487 "DataImportSource.c"
+				_tmp35_ = NULL;
+#line 496 "DataImportSource.c"
 			}
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp47_ = _metadata_date_time_ref0 (_tmp43_);
+			_tmp39_ = _metadata_date_time_ref0 (_tmp35_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_metadata_date_time_unref0 (self->priv->exposure_time);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->exposure_time = _tmp47_;
+			self->priv->exposure_time = _tmp39_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_metadata_date_time_unref0 (_tmp43_);
-#line 497 "DataImportSource.c"
+			_metadata_date_time_unref0 (_tmp35_);
+#line 506 "DataImportSource.c"
 		}
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp48_ = metadata;
+		_tmp40_ = metadata;
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		if (_tmp48_ != NULL) {
-#line 503 "DataImportSource.c"
-			PhotoMetadata* _tmp49_;
-			gchar* _tmp50_;
+		if (_tmp40_ != NULL) {
+#line 512 "DataImportSource.c"
+			PhotoMetadata* _tmp41_;
+			gchar* _tmp42_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp49_ = metadata;
+			_tmp41_ = metadata;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp50_ = photo_metadata_thumbnail_hash (_tmp49_);
+			_tmp42_ = photo_metadata_thumbnail_hash (_tmp41_);
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (self->priv->preview_md5);
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->preview_md5 = _tmp50_;
-#line 514 "DataImportSource.c"
+			self->priv->preview_md5 = _tmp42_;
+#line 523 "DataImportSource.c"
 		}
 		{
-			guint64 _tmp51_ = 0ULL;
-			GFile* _tmp52_;
-			guint64 _tmp53_;
-#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp52_ = photo;
+			guint64 _tmp43_ = 0ULL;
+			GFile* _tmp44_;
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp53_ = query_total_file_size (_tmp52_, NULL, &_inner_error_);
+			_tmp44_ = photo;
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp51_ = _tmp53_;
+			_tmp43_ = query_total_file_size (_tmp44_, NULL, &_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 528 "DataImportSource.c"
+#line 534 "DataImportSource.c"
 				goto __catch231_g_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->file_size = _tmp51_;
-#line 533 "DataImportSource.c"
+			self->priv->file_size = _tmp43_;
+#line 539 "DataImportSource.c"
 		}
 		goto __finally231;
 		__catch231_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp54_;
-			gchar* _tmp55_;
-			GError* _tmp56_;
-			const gchar* _tmp57_;
+			gchar* _tmp45_;
+			gchar* _tmp46_;
+			GError* _tmp47_;
+			const gchar* _tmp48_;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_inner_error_ = NULL;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp54_ = spit_data_imports_data_import_source_get_filename (self);
+			_tmp45_ = spit_data_imports_data_import_source_get_filename (self);
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp55_ = _tmp54_;
+			_tmp46_ = _tmp45_;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp56_ = e;
+			_tmp47_ = e;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp57_ = _tmp56_->message;
+			_tmp48_ = _tmp47_->message;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp55_, _tmp57_);
+			g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp46_, _tmp48_);
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp55_);
+			_g_free0 (_tmp46_);
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 561 "DataImportSource.c"
+#line 567 "DataImportSource.c"
 		}
 		__finally231:
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -578,54 +584,51 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			g_clear_error (&_inner_error_);
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 582 "DataImportSource.c"
+#line 588 "DataImportSource.c"
 		}
 		{
-			time_t _tmp58_ = 0;
-			GFile* _tmp59_;
-			time_t _tmp60_;
+			time_t _tmp49_ = 0;
+			GFile* _tmp50_;
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp59_ = photo;
+			_tmp50_ = photo;
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp60_ = query_file_modified (_tmp59_, &_inner_error_);
-#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp58_ = _tmp60_;
+			_tmp49_ = query_file_modified (_tmp50_, &_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 596 "DataImportSource.c"
+#line 599 "DataImportSource.c"
 				goto __catch232_g_error;
 			}
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->modification_time = _tmp58_;
-#line 601 "DataImportSource.c"
+			self->priv->modification_time = _tmp49_;
+#line 604 "DataImportSource.c"
 		}
 		goto __finally232;
 		__catch232_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp61_;
-			gchar* _tmp62_;
-			GError* _tmp63_;
-			const gchar* _tmp64_;
+			gchar* _tmp51_;
+			gchar* _tmp52_;
+			GError* _tmp53_;
+			const gchar* _tmp54_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_inner_error_ = NULL;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp61_ = spit_data_imports_data_import_source_get_filename (self);
+			_tmp51_ = spit_data_imports_data_import_source_get_filename (self);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp62_ = _tmp61_;
+			_tmp52_ = _tmp51_;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp63_ = e;
+			_tmp53_ = e;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp64_ = _tmp63_->message;
+			_tmp54_ = _tmp53_->message;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp62_, _tmp64_);
+			g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp52_, _tmp54_);
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp62_);
+			_g_free0 (_tmp52_);
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 629 "DataImportSource.c"
+#line 632 "DataImportSource.c"
 		}
 		__finally232:
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -646,36 +649,36 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			g_clear_error (&_inner_error_);
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 650 "DataImportSource.c"
+#line 653 "DataImportSource.c"
 		}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (date_time);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_media_metadata_unref0 (metadata);
-#line 656 "DataImportSource.c"
+#line 659 "DataImportSource.c"
 	} else {
-		GFile* _tmp65_;
-		gchar* _tmp66_;
-		gchar* _tmp67_;
-		gchar* _tmp68_;
-		gchar* _tmp69_;
+		GFile* _tmp55_;
+		gchar* _tmp56_;
+		gchar* _tmp57_;
+		gchar* _tmp58_;
+		gchar* _tmp59_;
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp65_ = photo;
+		_tmp55_ = photo;
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp66_ = g_file_get_path (_tmp65_);
+		_tmp56_ = g_file_get_path (_tmp55_);
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp67_ = _tmp66_;
+		_tmp57_ = _tmp56_;
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp68_ = g_strdup_printf ("Photo file %s not found", _tmp67_);
+		_tmp58_ = g_strdup_printf ("Photo file %s not found", _tmp57_);
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp69_ = _tmp68_;
+		_tmp59_ = _tmp58_;
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		g_debug ("DataImportSource.vala:81: %s", _tmp69_);
+		g_debug ("DataImportSource.vala:81: %s", _tmp59_);
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp69_);
+		_g_free0 (_tmp59_);
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp67_);
-#line 679 "DataImportSource.c"
+		_g_free0 (_tmp57_);
+#line 682 "DataImportSource.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_object_unref0 (photo);
@@ -685,18 +688,22 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 	_g_free0 (folder_path);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self;
-#line 689 "DataImportSource.c"
+#line 692 "DataImportSource.c"
 }
 
 
-SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) {
+SpitDataImportsDataImportSource*
+spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo)
+{
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return spit_data_imports_data_import_source_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, db_photo);
-#line 696 "DataImportSource.c"
+#line 701 "DataImportSource.c"
 }
 
 
-gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self) {
+gchar*
+spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self)
+{
 	gchar* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	gchar* _tmp1_;
@@ -710,11 +717,13 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp
 	result = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 714 "DataImportSource.c"
+#line 721 "DataImportSource.c"
 }
 
 
-gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self) {
+gchar*
+spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self)
+{
 	gchar* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	gchar* _tmp1_;
@@ -728,11 +737,13 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo
 	result = _tmp1_;
 #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 732 "DataImportSource.c"
+#line 741 "DataImportSource.c"
 }
 
 
-GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self) {
+GFile*
+spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportSource* self)
+{
 	GFile* result = NULL;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -770,54 +781,55 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS
 	result = _tmp7_;
 #line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 774 "DataImportSource.c"
+#line 785 "DataImportSource.c"
 }
 
 
-gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self) {
+gchar*
+spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportSource* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_;
-	gboolean _tmp2_;
 #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = self->priv->title;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp2_ = is_string_empty (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	if (!_tmp2_) {
-#line 791 "DataImportSource.c"
-		const gchar* _tmp3_;
-		gchar* _tmp4_;
+	if (!is_string_empty (_tmp1_)) {
+#line 801 "DataImportSource.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp3_ = self->priv->title;
+		_tmp2_ = self->priv->title;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp4_ = g_strdup (_tmp3_);
+		_tmp3_ = g_strdup (_tmp2_);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (_tmp0_);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp0_ = _tmp4_;
-#line 802 "DataImportSource.c"
+		_tmp0_ = _tmp3_;
+#line 812 "DataImportSource.c"
 	} else {
-		gchar* _tmp5_;
+		gchar* _tmp4_;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp5_ = spit_data_imports_data_import_source_get_filename (self);
+		_tmp4_ = spit_data_imports_data_import_source_get_filename (self);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (_tmp0_);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp0_ = _tmp5_;
-#line 811 "DataImportSource.c"
+		_tmp0_ = _tmp4_;
+#line 821 "DataImportSource.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 817 "DataImportSource.c"
+#line 827 "DataImportSource.c"
 }
 
 
-gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self) {
+gchar*
+spit_data_imports_data_import_source_get_title (SpitDataImportsDataImportSource* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -831,16 +843,17 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport
 	result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 835 "DataImportSource.c"
+#line 847 "DataImportSource.c"
 }
 
 
-PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self) {
+PhotoFileFormat
+spit_data_imports_data_import_source_get_file_format (SpitDataImportsDataImportSource* self)
+{
 	PhotoFileFormat result = 0;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	PhotoFileFormat _tmp2_;
-	PhotoFileFormat _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -850,18 +863,18 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	_tmp3_ = _tmp2_;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_free0 (_tmp1_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 861 "DataImportSource.c"
+#line 872 "DataImportSource.c"
 }
 
 
-gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) {
+gchar*
+spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -872,11 +885,13 @@ gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImport
 	result = _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 876 "DataImportSource.c"
+#line 889 "DataImportSource.c"
 }
 
 
-time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self) {
+time_t
+spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDataImportSource* self)
+{
 	time_t result = 0;
 	time_t _tmp0_ = 0;
 	MetadataDateTime* _tmp1_;
@@ -886,33 +901,32 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
 	_tmp1_ = self->priv->exposure_time;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
-#line 890 "DataImportSource.c"
+#line 905 "DataImportSource.c"
 		MetadataDateTime* _tmp2_;
-		time_t _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->exposure_time;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp3_ = metadata_date_time_get_timestamp (_tmp2_);
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp0_ = _tmp3_;
-#line 899 "DataImportSource.c"
+		_tmp0_ = metadata_date_time_get_timestamp (_tmp2_);
+#line 911 "DataImportSource.c"
 	} else {
-		time_t _tmp4_;
+		time_t _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp4_ = self->priv->modification_time;
+		_tmp3_ = self->priv->modification_time;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp0_ = _tmp4_;
-#line 906 "DataImportSource.c"
+		_tmp0_ = _tmp3_;
+#line 918 "DataImportSource.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 912 "DataImportSource.c"
+#line 924 "DataImportSource.c"
 }
 
 
-guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) {
+guint64
+spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self)
+{
 	guint64 result = 0ULL;
 	guint64 _tmp0_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -923,11 +937,13 @@ guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataIm
 	result = _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 927 "DataImportSource.c"
+#line 941 "DataImportSource.c"
 }
 
 
-SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self) {
+SpitDataImportsImportableMediaItem*
+spit_data_imports_data_import_source_get_photo (SpitDataImportsDataImportSource* self)
+{
 	SpitDataImportsImportableMediaItem* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	SpitDataImportsImportableMediaItem* _tmp1_;
@@ -941,11 +957,13 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 945 "DataImportSource.c"
+#line 961 "DataImportSource.c"
 }
 
 
-gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self) {
+gboolean
+spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_;
@@ -955,33 +973,29 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
 	_tmp1_ = self->priv->preview_md5;
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
-#line 959 "DataImportSource.c"
+#line 977 "DataImportSource.c"
 		const gchar* _tmp2_;
-		PhotoFileFormat _tmp3_;
-		gboolean _tmp4_;
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->preview_md5;
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp3_ = spit_data_imports_data_import_source_get_file_format (self);
-#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp4_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, _tmp3_);
-#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp0_ = _tmp4_;
-#line 971 "DataImportSource.c"
+		_tmp0_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, spit_data_imports_data_import_source_get_file_format (self));
+#line 983 "DataImportSource.c"
 	} else {
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = FALSE;
-#line 975 "DataImportSource.c"
+#line 987 "DataImportSource.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 981 "DataImportSource.c"
+#line 993 "DataImportSource.c"
 }
 
 
-gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) {
+gboolean
+spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -992,108 +1006,133 @@ gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataIm
 	result = _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 996 "DataImportSource.c"
+#line 1010 "DataImportSource.c"
 }
 
 
-static void spit_data_imports_value_data_import_source_init (GValue* value) {
+static void
+spit_data_imports_value_data_import_source_init (GValue* value)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	value->data[0].v_pointer = NULL;
-#line 1003 "DataImportSource.c"
+#line 1019 "DataImportSource.c"
 }
 
 
-static void spit_data_imports_value_data_import_source_free_value (GValue* value) {
+static void
+spit_data_imports_value_data_import_source_free_value (GValue* value)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (value->data[0].v_pointer);
-#line 1012 "DataImportSource.c"
+#line 1030 "DataImportSource.c"
 	}
 }
 
 
-static void spit_data_imports_value_data_import_source_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+spit_data_imports_value_data_import_source_copy_value (const GValue* src_value,
+                                                       GValue* dest_value)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (src_value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		dest_value->data[0].v_pointer = spit_data_imports_data_import_source_ref (src_value->data[0].v_pointer);
-#line 1022 "DataImportSource.c"
+#line 1043 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1026 "DataImportSource.c"
+#line 1047 "DataImportSource.c"
 	}
 }
 
 
-static gpointer spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) {
+static gpointer
+spit_data_imports_value_data_import_source_peek_pointer (const GValue* value)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return value->data[0].v_pointer;
-#line 1034 "DataImportSource.c"
+#line 1057 "DataImportSource.c"
 }
 
 
-static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+spit_data_imports_value_data_import_source_collect_value (GValue* value,
+                                                          guint n_collect_values,
+                                                          GTypeCValue* collect_values,
+                                                          guint collect_flags)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (collect_values[0].v_pointer) {
-#line 1041 "DataImportSource.c"
+#line 1069 "DataImportSource.c"
 		SpitDataImportsDataImportSource * object;
 		object = collect_values[0].v_pointer;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1048 "DataImportSource.c"
+#line 1076 "DataImportSource.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.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 1052 "DataImportSource.c"
+#line 1080 "DataImportSource.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = spit_data_imports_data_import_source_ref (object);
-#line 1056 "DataImportSource.c"
+#line 1084 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1060 "DataImportSource.c"
+#line 1088 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return NULL;
-#line 1064 "DataImportSource.c"
+#line 1092 "DataImportSource.c"
 }
 
 
-static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+spit_data_imports_value_data_import_source_lcopy_value (const GValue* value,
+                                                        guint n_collect_values,
+                                                        GTypeCValue* collect_values,
+                                                        guint collect_flags)
+{
 	SpitDataImportsDataImportSource ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!object_p) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1075 "DataImportSource.c"
+#line 1108 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = NULL;
-#line 1081 "DataImportSource.c"
+#line 1114 "DataImportSource.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1085 "DataImportSource.c"
+#line 1118 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1089 "DataImportSource.c"
+#line 1122 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return NULL;
-#line 1093 "DataImportSource.c"
+#line 1126 "DataImportSource.c"
 }
 
 
-GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+spit_data_imports_param_spec_data_import_source (const gchar* name,
+                                                 const gchar* nick,
+                                                 const gchar* blurb,
+                                                 GType object_type,
+                                                 GParamFlags flags)
+{
 	SpitDataImportsParamSpecDataImportSource* spec;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL);
@@ -1103,20 +1142,25 @@ GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return G_PARAM_SPEC (spec);
-#line 1107 "DataImportSource.c"
+#line 1146 "DataImportSource.c"
 }
 
 
-gpointer spit_data_imports_value_get_data_import_source (const GValue* value) {
+gpointer
+spit_data_imports_value_get_data_import_source (const GValue* value)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return value->data[0].v_pointer;
-#line 1116 "DataImportSource.c"
+#line 1157 "DataImportSource.c"
 }
 
 
-void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object) {
+void
+spit_data_imports_value_set_data_import_source (GValue* value,
+                                                gpointer v_object)
+{
 	SpitDataImportsDataImportSource * old;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
@@ -1132,22 +1176,25 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1136 "DataImportSource.c"
+#line 1180 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1140 "DataImportSource.c"
+#line 1184 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (old) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (old);
-#line 1146 "DataImportSource.c"
+#line 1190 "DataImportSource.c"
 	}
 }
 
 
-void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object) {
+void
+spit_data_imports_value_take_data_import_source (GValue* value,
+                                                 gpointer v_object)
+{
 	SpitDataImportsDataImportSource * old;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE));
@@ -1161,33 +1208,37 @@ void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = v_object;
-#line 1165 "DataImportSource.c"
+#line 1212 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1169 "DataImportSource.c"
+#line 1216 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (old) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (old);
-#line 1175 "DataImportSource.c"
+#line 1222 "DataImportSource.c"
 	}
 }
 
 
-static void spit_data_imports_data_import_source_class_init (SpitDataImportsDataImportSourceClass * klass) {
+static void
+spit_data_imports_data_import_source_class_init (SpitDataImportsDataImportSourceClass * klass)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	spit_data_imports_data_import_source_parent_class = g_type_class_peek_parent (klass);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	((SpitDataImportsDataImportSourceClass *) klass)->finalize = spit_data_imports_data_import_source_finalize;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportSourcePrivate));
-#line 1187 "DataImportSource.c"
+#line 1236 "DataImportSource.c"
 }
 
 
-static void spit_data_imports_data_import_source_instance_init (SpitDataImportsDataImportSource * self) {
+static void
+spit_data_imports_data_import_source_instance_init (SpitDataImportsDataImportSource * self)
+{
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self->priv = SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_PRIVATE (self);
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1196,11 +1247,13 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD
 	self->priv->preview_md5 = NULL;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self->ref_count = 1;
-#line 1200 "DataImportSource.c"
+#line 1251 "DataImportSource.c"
 }
 
 
-static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj) {
+static void
+spit_data_imports_data_import_source_finalize (SpitDataImportsDataImportSource * obj)
+{
 	SpitDataImportsDataImportSource * self;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, SpitDataImportsDataImportSource);
@@ -1214,7 +1267,7 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
 	_g_free0 (self->priv->preview_md5);
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_metadata_date_time_unref0 (self->priv->exposure_time);
-#line 1218 "DataImportSource.c"
+#line 1271 "DataImportSource.c"
 }
 
 
@@ -1226,7 +1279,9 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
  * This class does not extend PhotoSource in order to minimise the API to the
  * absolute minimum required to run the import job.
  */
-GType spit_data_imports_data_import_source_get_type (void) {
+GType
+spit_data_imports_data_import_source_get_type (void)
+{
 	static volatile gsize spit_data_imports_data_import_source_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_data_import_source_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { spit_data_imports_value_data_import_source_init, spit_data_imports_value_data_import_source_free_value, spit_data_imports_value_data_import_source_copy_value, spit_data_imports_value_data_import_source_peek_pointer, "p", spit_data_imports_value_data_import_source_collect_value, "p", spit_data_imports_value_data_import_source_lcopy_value };
@@ -1240,18 +1295,22 @@ GType spit_data_imports_data_import_source_get_type (void) {
 }
 
 
-gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
+gpointer
+spit_data_imports_data_import_source_ref (gpointer instance)
+{
 	SpitDataImportsDataImportSource * self;
 	self = instance;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return instance;
-#line 1251 "DataImportSource.c"
+#line 1308 "DataImportSource.c"
 }
 
 
-void spit_data_imports_data_import_source_unref (gpointer instance) {
+void
+spit_data_imports_data_import_source_unref (gpointer instance)
+{
 	SpitDataImportsDataImportSource * self;
 	self = instance;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -1260,7 +1319,7 @@ void spit_data_imports_data_import_source_unref (gpointer instance) {
 		SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_CLASS (self)->finalize (self);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1264 "DataImportSource.c"
+#line 1323 "DataImportSource.c"
 	}
 }
 
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 47b2e0a..e7ae485 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.36.6, the Vala compiler
+/* DataImports.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -26,32 +27,50 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value);
-void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
+static void _vala_array_add71 (gchar** * array,
+                        int* length,
+                        int* size,
+                        gchar* value);
+void plugins_register_extension_point (GType type,
+                                       const gchar* name,
+                                       const gchar* icon_name,
+                                       gchar** core_ids,
+                                       int core_ids_length1);
 #define RESOURCES_IMPORT "import"
 void data_imports_terminate (void);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
+
+
+static void
+_vala_array_add71 (gchar** * array,
+                   int* length,
+                   int* size,
+                   gchar* value)
+{
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 45 "DataImports.c"
+#line 62 "DataImports.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	(*array)[(*length)++] = value;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	(*array)[*length] = NULL;
-#line 51 "DataImports.c"
+#line 68 "DataImports.c"
 }
 
 
-void data_imports_init (GError** error) {
+void
+data_imports_init (GError** error)
+{
 	gchar** core_ids = NULL;
 	gchar** _tmp0_;
 	gint core_ids_length1;
@@ -85,15 +104,21 @@ void data_imports_init (GError** error) {
 	plugins_register_extension_point (SPIT_DATA_IMPORTS_TYPE_SERVICE, _ ("Data Imports"), RESOURCES_IMPORT, _tmp3_, _tmp3__length1);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 89 "DataImports.c"
+#line 108 "DataImports.c"
 }
 
 
-void data_imports_terminate (void) {
+void
+data_imports_terminate (void)
+{
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -105,7 +130,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index d07da46..6b42fc1 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.36.6, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImportsPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include "shotwell-plugin-dev-1.0.h"
@@ -190,6 +191,11 @@ typedef struct _DataImportsUIConcreteDialogPaneClass DataImportsUIConcreteDialog
 
 typedef struct _DataImportsUIProgressPane DataImportsUIProgressPane;
 typedef struct _DataImportsUIProgressPaneClass DataImportsUIProgressPaneClass;
+enum  {
+	SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_0_PROPERTY,
+	SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_NUM_PROPERTIES
+};
+static GParamSpec* spit_data_imports_concrete_data_imports_host_properties[SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_NUM_PROPERTIES];
 #define _spit_data_imports_core_importer_unref0(var) ((var == NULL) ? NULL : (var = (spit_data_imports_core_importer_unref (var), NULL)))
 
 #define DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE (data_imports_ui_static_message_pane_get_type ())
@@ -232,6 +238,11 @@ typedef struct _SpitDataImportsWelcomeDataImportsHostPrivate SpitDataImportsWelc
 
 typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost;
 typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass;
+enum  {
+	SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_0_PROPERTY,
+	SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_NUM_PROPERTIES
+};
+static GParamSpec* spit_data_imports_welcome_data_imports_host_properties[SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_NUM_PROPERTIES];
 
 #define TYPE_WELCOME_SERVICE_ENTRY (welcome_service_entry_get_type ())
 #define WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry))
@@ -251,6 +262,11 @@ typedef struct _WelcomeServiceEntryIface WelcomeServiceEntryIface;
 typedef struct _SpitDataImportsWelcomeImportServiceEntry SpitDataImportsWelcomeImportServiceEntry;
 typedef struct _SpitDataImportsWelcomeImportServiceEntryClass SpitDataImportsWelcomeImportServiceEntryClass;
 typedef struct _SpitDataImportsWelcomeImportServiceEntryPrivate SpitDataImportsWelcomeImportServiceEntryPrivate;
+enum  {
+	SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_0_PROPERTY,
+	SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* spit_data_imports_welcome_import_service_entry_properties[SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_NUM_PROPERTIES];
 typedef struct _SpitDataImportsWelcomeImportMetaHostPrivate SpitDataImportsWelcomeImportMetaHostPrivate;
 
 #define TYPE_WELCOME_DIALOG (welcome_dialog_get_type ())
@@ -262,6 +278,11 @@ typedef struct _SpitDataImportsWelcomeImportMetaHostPrivate SpitDataImportsWelco
 
 typedef struct _WelcomeDialog WelcomeDialog;
 typedef struct _WelcomeDialogClass WelcomeDialogClass;
+enum  {
+	SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_0_PROPERTY,
+	SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_NUM_PROPERTIES
+};
+static GParamSpec* spit_data_imports_welcome_import_meta_host_properties[SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_NUM_PROPERTIES];
 typedef struct _ImportManifestPrivate ImportManifestPrivate;
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -464,71 +485,140 @@ ImportManifest* spit_data_imports_meta_manifest = NULL;
 
 gpointer spit_data_imports_core_importer_ref (gpointer instance);
 void spit_data_imports_core_importer_unref (gpointer instance);
-GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object);
-void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object);
+GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name,
+                                                        const gchar* nick,
+                                                        const gchar* blurb,
+                                                        GType object_type,
+                                                        GParamFlags flags);
+void spit_data_imports_value_set_core_importer (GValue* value,
+                                                gpointer v_object);
+void spit_data_imports_value_take_core_importer (GValue* value,
+                                                 gpointer v_object);
 gpointer spit_data_imports_value_get_core_importer (const GValue* value);
 GType spit_data_imports_core_importer_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;
 #define SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporterPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_CORE_IMPORTER_DUMMY_PROPERTY
-};
 SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host);
-SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host);
-void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
+SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type,
+                                                                        SpitDataImportsPluginHost* host);
+void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self,
+                                                                     SpitDataImportsImportableMediaItem** items,
+                                                                     int items_length1,
+                                                                     gdouble progress,
+                                                                     gdouble host_progress_delta,
+                                                                     const gchar* progress_message);
 GType sorted_list_get_type (void) G_GNUC_CONST;
 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 spit_data_imports_data_import_job_get_type (void) G_GNUC_CONST;
-gint64 spit_data_imports_import_job_comparator (void* a, void* b);
-static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void* b, gpointer self);
-SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
-SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
+gint64 spit_data_imports_import_job_comparator (void* a,
+                                                void* b);
+static gint64 _spit_data_imports_import_job_comparator_comparator (void* a,
+                                                            void* b,
+                                                            gpointer self);
+SortedList* sorted_list_new (GType g_type,
+                             GBoxedCopyFunc g_dup_func,
+                             GDestroyNotify g_destroy_func,
+                             Comparator cmp,
+                             void* cmp_target);
+SortedList* sorted_list_construct (GType object_type,
+                                   GType g_type,
+                                   GBoxedCopyFunc g_dup_func,
+                                   GDestroyNotify g_destroy_func,
+                                   Comparator cmp,
+                                   void* cmp_target);
 gpointer spit_data_imports_data_import_source_ref (gpointer instance);
 void spit_data_imports_data_import_source_unref (gpointer instance);
-GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_object);
-void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_object);
+GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
+                                                             const gchar* nick,
+                                                             const gchar* blurb,
+                                                             GType object_type,
+                                                             GParamFlags flags);
+void spit_data_imports_value_set_data_import_source (GValue* value,
+                                                     gpointer v_object);
+void spit_data_imports_value_take_data_import_source (GValue* value,
+                                                      gpointer v_object);
 gpointer spit_data_imports_value_get_data_import_source (const GValue* value);
 GType spit_data_imports_data_import_source_get_type (void) G_GNUC_CONST;
 SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo);
-SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type, SpitDataImportsImportableMediaItem* db_photo);
+SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct (GType object_type,
+                                                                                 SpitDataImportsImportableMediaItem* db_photo);
 gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self);
 gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImportSource* self);
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source);
-SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type, SpitDataImportsDataImportSource* import_source);
+SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType object_type,
+                                                                           SpitDataImportsDataImportSource* import_source);
 gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImportsDataImportSource* self);
 BatchImportRoll* batch_import_roll_new (void);
 BatchImportRoll* batch_import_roll_construct (GType object_type);
 GType batch_import_get_type (void) G_GNUC_CONST;
 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;
-void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll);
-static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
-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);
+void spit_data_imports_data_import_reporter (ImportManifest* manifest,
+                                             BatchImportRoll* import_roll);
+static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+                                                                           BatchImportRoll* import_roll,
+                                                                           gpointer self);
+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);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void library_window_enqueue_batch_import (LibraryWindow* self,
+                                          BatchImport* batch_import,
+                                          gboolean allow_user_cancel);
 void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self);
 static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj);
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
@@ -537,526 +627,610 @@ GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
 GType data_imports_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST;
 GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHostPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_DUMMY_PROPERTY
-};
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog);
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog);
-PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain);
-PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain);
+SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service,
+                                                                                          DataImportsUIDataImportsDialog* dialog);
+SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type,
+                                                                                                SpitDataImportsService* service,
+                                                                                                DataImportsUIDataImportsDialog* dialog);
+PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable,
+                                                                   const gchar* config_domain);
+PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type,
+                                                                         SpitPluggable* pluggable,
+                                                                         const gchar* config_domain);
 static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base);
 static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base);
 static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base);
 static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self);
-void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode);
+void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self,
+                                                                   SpitDataImportsPluginHostButtonMode mode);
 void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self);
 void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self);
-static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err);
-static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message);
-void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane);
+static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base,
+                                                                   GError* err);
+static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base,
+                                                                           const gchar* message);
+void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self,
+                                                       SpitDataImportsDialogPane* pane);
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg);
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg);
+DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type,
+                                                                                          const gchar* msg);
 GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST;
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self);
-static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode);
-static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode);
-static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
+static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base,
+                                                                            SpitDataImportsDialogPane* pane,
+                                                                            SpitDataImportsPluginHostButtonMode button_mode);
+static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base,
+                                                                                    const gchar* message,
+                                                                                    SpitDataImportsPluginHostButtonMode button_mode);
+static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base,
+                                                                                       const gchar* welcome_message,
+                                                                                       SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                       int discovered_libraries_length1,
+                                                                                       const gchar* file_select_label);
+DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host,
+                                                                               const gchar* welcome_message,
+                                                                               SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                               int discovered_libraries_length1,
+                                                                               const gchar* file_select_label);
+DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type,
+                                                                                     SpitDataImportsPluginHost* host,
+                                                                                     const gchar* welcome_message,
+                                                                                     SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                     int discovered_libraries_length1,
+                                                                                     const gchar* file_select_label);
 GType data_imports_ui_library_selection_pane_get_type (void) G_GNUC_CONST;
-static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message);
+static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                                     const gchar* message);
 DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message);
-DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message);
-static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message);
-void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message);
-static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
-static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
+DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type,
+                                                                    const gchar* message);
+static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                                    gdouble progress,
+                                                                                    const gchar* progress_message);
+void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self,
+                                                    gdouble progress,
+                                                    const gchar* progress_message);
+static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base,
+                                                                                       SpitDataImportsImportableMediaItem** items,
+                                                                                       int items_length1,
+                                                                                       gdouble progress,
+                                                                                       gdouble host_progress_delta,
+                                                                                       const gchar* progress_message);
+static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base,
+                                                                        SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                                                        void* report_imported_items_count_target,
+                                                                        const gchar* finalize_message);
 void library_window_switch_to_import_queue_page (LibraryWindow* self);
 static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj);
 GType spit_data_imports_welcome_data_imports_host_get_type (void) G_GNUC_CONST;
 GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHostPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_DUMMY_PROPERTY
-};
-SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host);
-SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host);
+SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service,
+                                                                                        SpitDataImportsWelcomeImportMetaHost* meta_host);
+SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type,
+                                                                                              SpitDataImportsService* service,
+                                                                                              SpitDataImportsWelcomeImportMetaHost* meta_host);
 static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base);
 static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base);
 static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base);
 static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self);
-static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err);
-static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message);
-static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode);
-static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode);
-static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
+static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base,
+                                                                  GError* err);
+static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base,
+                                                                          const gchar* message);
+static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base,
+                                                                           SpitDataImportsDialogPane* pane,
+                                                                           SpitDataImportsPluginHostButtonMode button_mode);
+static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base,
+                                                                                   const gchar* message,
+                                                                                   SpitDataImportsPluginHostButtonMode button_mode);
+static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base,
+                                                                                      const gchar* welcome_message,
+                                                                                      SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                      int discovered_libraries_length1,
+                                                                                      const gchar* file_select_label);
 GType welcome_service_entry_get_type (void) G_GNUC_CONST;
-void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry);
-SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1);
-SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1);
+void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self,
+                                                                       WelcomeServiceEntry* entry);
+SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host,
+                                                                                              const gchar* pluggable_name,
+                                                                                              SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                              int discovered_libraries_length1);
+SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type,
+                                                                                                    SpitDataImportsPluginHost* host,
+                                                                                                    const gchar* pluggable_name,
+                                                                                                    SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                                    int discovered_libraries_length1);
 GType spit_data_imports_welcome_import_service_entry_get_type (void) G_GNUC_CONST;
-static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message);
-static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message);
-static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message);
-static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message);
-void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host);
+static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                                    const gchar* message);
+static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                                   gdouble progress,
+                                                                                   const gchar* progress_message);
+static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base,
+                                                                                      SpitDataImportsImportableMediaItem** items,
+                                                                                      int items_length1,
+                                                                                      gdouble progress,
+                                                                                      gdouble host_progress_delta,
+                                                                                      const gchar* progress_message);
+static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base,
+                                                                       SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                                                       void* report_imported_items_count_target,
+                                                                       const gchar* finalize_message);
+void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self,
+                                                                 SpitDataImportsWelcomeDataImportsHost* host);
 static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj);
 #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntryPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY
-};
-static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length);
+static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self,
+                                                      int length);
 static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base);
 static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base);
 static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj);
 GType welcome_dialog_get_type (void) G_GNUC_CONST;
 #define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostPrivate))
-enum  {
-	SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_DUMMY_PROPERTY
-};
 SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog);
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog);
+SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type,
+                                                                                            WelcomeDialog* dialog);
 void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
 SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1);
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self);
-void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
+void welcome_dialog_install_service_entry (WelcomeDialog* self,
+                                           WelcomeServiceEntry* entry);
 static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj);
-SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
-GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
+SpitDataImportsService** spit_data_imports_load_services (gboolean load_all,
+                                                          int* result_length1);
+GeeCollection* plugins_get_pluggables_for_type (GType type,
+                                                GCompareDataFunc compare_func,
+                                                void* compare_func_target,
+                                                GDestroyNotify compare_func_target_destroy_notify,
+                                                gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
-static gint __lambda25_ (void* a, void* b);
-gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda25____compar_fn_t (void* key1, void* key2);
+static void _vala_array_add72 (SpitDataImportsService** * array,
+                        int* length,
+                        int* size,
+                        SpitDataImportsService* value);
+static gint __lambda25_ (void* a,
+                  void* b);
+gint utf8_cs_compare (void* a,
+                      void* b);
+static gint ___lambda25____compar_fn_t (void* key1,
+                                 void* key2);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 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;
-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);
 void data_imports_ui_data_imports_dialog_terminate_instance (void);
 gpointer import_ui_question_params_ref (gpointer instance);
 void import_ui_question_params_unref (gpointer instance);
-GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void import_ui_value_set_question_params (GValue* value, gpointer v_object);
-void import_ui_value_take_question_params (GValue* value, gpointer v_object);
+GParamSpec* import_ui_param_spec_question_params (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void import_ui_value_set_question_params (GValue* value,
+                                          gpointer v_object);
+void import_ui_value_take_question_params (GValue* value,
+                                           gpointer v_object);
 gpointer import_ui_value_get_question_params (const GValue* value);
 GType import_ui_question_params_get_type (void) G_GNUC_CONST;
-gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
+gboolean import_ui_report_manifest (ImportManifest* manifest,
+                                    gboolean show_dest_id,
+                                    ImportUIQuestionParams* question);
 time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataImportJob* self);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-
-SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType object_type, SpitDataImportsPluginHost* host) {
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
+
+
+SpitDataImportsCoreImporter*
+spit_data_imports_core_importer_construct (GType object_type,
+                                           SpitDataImportsPluginHost* host)
+{
 	SpitDataImportsCoreImporter* self = NULL;
-	SpitDataImportsPluginHost* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = (SpitDataImportsCoreImporter*) g_type_create_instance (object_type);
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = host;
-#line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->host = _tmp0_;
+	self->priv->host = host;
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 673 "DataImportsPluginHost.c"
+#line 862 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host) {
+SpitDataImportsCoreImporter*
+spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host)
+{
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_core_importer_construct (SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, host);
-#line 680 "DataImportsPluginHost.c"
+#line 871 "DataImportsPluginHost.c"
 }
 
 
-static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_spit_data_imports_import_job_comparator_comparator (void* a,
+                                                     void* b,
+                                                     gpointer self)
+{
 	gint64 result;
 	result = spit_data_imports_import_job_comparator (a, b);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 689 "DataImportsPluginHost.c"
+#line 884 "DataImportsPluginHost.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 696 "DataImportsPluginHost.c"
+#line 893 "DataImportsPluginHost.c"
 }
 
 
-static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+                                                                      BatchImportRoll* import_roll,
+                                                                      gpointer self)
+{
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_data_import_reporter (manifest, import_roll);
-#line 703 "DataImportsPluginHost.c"
+#line 904 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
+void
+spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImportsCoreImporter* self,
+                                                                SpitDataImportsImportableMediaItem** items,
+                                                                int items_length1,
+                                                                gdouble progress,
+                                                                gdouble host_progress_delta,
+                                                                const gchar* progress_message)
+{
 	SpitDataImportsPluginHost* _tmp0_;
-	gdouble _tmp1_;
-	const gchar* _tmp2_;
 	SortedList* jobs = NULL;
-	SortedList* _tmp3_;
+	SortedList* _tmp1_;
 	GeeArrayList* already_imported = NULL;
-	GeeArrayList* _tmp4_;
+	GeeArrayList* _tmp2_;
 	GeeArrayList* failed = NULL;
-	GeeArrayList* _tmp5_;
+	GeeArrayList* _tmp3_;
 	gint item_idx = 0;
 	gdouble item_progress_delta = 0.0;
-	gdouble _tmp6_;
-	SpitDataImportsImportableMediaItem** _tmp7_;
-	gint _tmp7__length1;
-	SpitDataImportsImportableMediaItem** _tmp8_;
-	gint _tmp8__length1;
-	SortedList* _tmp39_;
-	gint _tmp40_;
-	gint _tmp41_;
-	SpitDataImportsPluginHost* _tmp65_;
-	gdouble _tmp66_;
-	gdouble _tmp67_;
+	SortedList* _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	SpitDataImportsPluginHost* _tmp57_;
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CORE_IMPORTER (self));
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = self->priv->host;
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = progress;
-#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = progress_message;
-#line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, _tmp1_, _tmp2_);
+	spit_data_imports_plugin_host_update_import_progress_pane (_tmp0_, progress, progress_message);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL);
+	_tmp1_ = sorted_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _spit_data_imports_import_job_comparator_comparator, NULL);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	jobs = _tmp3_;
+	jobs = _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	already_imported = _tmp4_;
+	already_imported = _tmp2_;
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp3_ = gee_array_list_new (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	failed = _tmp5_;
+	failed = _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	item_idx = 0;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = host_progress_delta;
-#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = items;
-#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7__length1 = items_length1;
-#line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	item_progress_delta = _tmp6_ / _tmp7__length1;
-#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = items;
-#line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8__length1 = items_length1;
-#line 766 "DataImportsPluginHost.c"
+	item_progress_delta = host_progress_delta / items_length1;
+#line 951 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsImportableMediaItem** src_item_collection = NULL;
 		gint src_item_collection_length1 = 0;
 		gint _src_item_collection_size_ = 0;
 		gint src_item_it = 0;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		src_item_collection = _tmp8_;
+		src_item_collection = items;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		src_item_collection_length1 = _tmp8__length1;
+		src_item_collection_length1 = items_length1;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) {
-#line 778 "DataImportsPluginHost.c"
-			SpitDataImportsImportableMediaItem* _tmp9_;
+		for (src_item_it = 0; src_item_it < items_length1; src_item_it = src_item_it + 1) {
+#line 963 "DataImportsPluginHost.c"
+			SpitDataImportsImportableMediaItem* _tmp4_;
 			SpitDataImportsImportableMediaItem* src_item = NULL;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]);
+			_tmp4_ = _g_object_ref0 (src_item_collection[src_item_it]);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			src_item = _tmp9_;
-#line 785 "DataImportsPluginHost.c"
+			src_item = _tmp4_;
+#line 970 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsDataImportSource* import_source = NULL;
-				SpitDataImportsImportableMediaItem* _tmp10_;
-				SpitDataImportsDataImportSource* _tmp11_;
-				SpitDataImportsDataImportSource* _tmp12_;
-				gboolean _tmp13_;
-				SpitDataImportsDataImportSource* _tmp21_;
-				gboolean _tmp22_;
-				SortedList* _tmp30_;
-				SpitDataImportsDataImportSource* _tmp31_;
-				SpitDataImportsDataImportJob* _tmp32_;
-				SpitDataImportsDataImportJob* _tmp33_;
-				gint _tmp34_;
-				SpitDataImportsPluginHost* _tmp35_;
-				gdouble _tmp36_;
-				gint _tmp37_;
-				gdouble _tmp38_;
+				SpitDataImportsImportableMediaItem* _tmp5_;
+				SpitDataImportsDataImportSource* _tmp6_;
+				SpitDataImportsDataImportSource* _tmp7_;
+				SpitDataImportsDataImportSource* _tmp15_;
+				SortedList* _tmp23_;
+				SpitDataImportsDataImportSource* _tmp24_;
+				SpitDataImportsDataImportJob* _tmp25_;
+				SpitDataImportsDataImportJob* _tmp26_;
+				gint _tmp27_;
+				SpitDataImportsPluginHost* _tmp28_;
+				gint _tmp29_;
+				gdouble _tmp30_;
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp10_ = src_item;
+				_tmp5_ = src_item;
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp11_ = spit_data_imports_data_import_source_new (_tmp10_);
+				_tmp6_ = spit_data_imports_data_import_source_new (_tmp5_);
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				import_source = _tmp11_;
-#line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp12_ = import_source;
+				import_source = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp13_ = spit_data_imports_data_import_source_was_backing_file_found (_tmp12_);
+				_tmp7_ = import_source;
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				if (!_tmp13_) {
-#line 815 "DataImportsPluginHost.c"
-					SpitDataImportsDataImportSource* _tmp14_;
-					gchar* _tmp15_;
-					gchar* _tmp16_;
-					GeeArrayList* _tmp17_;
-					SpitDataImportsDataImportSource* _tmp18_;
-					SpitDataImportsDataImportJob* _tmp19_;
-					SpitDataImportsDataImportJob* _tmp20_;
+				if (!spit_data_imports_data_import_source_was_backing_file_found (_tmp7_)) {
+#line 995 "DataImportsPluginHost.c"
+					SpitDataImportsDataImportSource* _tmp8_;
+					gchar* _tmp9_;
+					gchar* _tmp10_;
+					GeeArrayList* _tmp11_;
+					SpitDataImportsDataImportSource* _tmp12_;
+					SpitDataImportsDataImportJob* _tmp13_;
+					SpitDataImportsDataImportJob* _tmp14_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp14_ = import_source;
+					_tmp8_ = import_source;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp15_ = spit_data_imports_data_import_source_get_filename (_tmp14_);
+					_tmp9_ = spit_data_imports_data_import_source_get_filename (_tmp8_);
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp16_ = _tmp15_;
+					_tmp10_ = _tmp9_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					g_message ("DataImportsPluginHost.vala:39: Skipping import of %s: backing file not" \
-" found", _tmp16_);
+" found", _tmp10_);
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_g_free0 (_tmp16_);
+					_g_free0 (_tmp10_);
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp17_ = failed;
+					_tmp11_ = failed;
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp18_ = import_source;
+					_tmp12_ = import_source;
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp19_ = spit_data_imports_data_import_job_new (_tmp18_);
+					_tmp13_ = spit_data_imports_data_import_job_new (_tmp12_);
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp20_ = _tmp19_;
+					_tmp14_ = _tmp13_;
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_batch_import_job_unref0 (_tmp20_);
+					_batch_import_job_unref0 (_tmp14_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_spit_data_imports_data_import_source_unref0 (import_source);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_g_object_unref0 (src_item);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					continue;
-#line 851 "DataImportsPluginHost.c"
+#line 1031 "DataImportsPluginHost.c"
 				}
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp21_ = import_source;
+				_tmp15_ = import_source;
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp22_ = spit_data_imports_data_import_source_is_already_imported (_tmp21_);
-#line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				if (_tmp22_) {
-#line 859 "DataImportsPluginHost.c"
-					SpitDataImportsDataImportSource* _tmp23_;
-					gchar* _tmp24_;
-					gchar* _tmp25_;
-					GeeArrayList* _tmp26_;
-					SpitDataImportsDataImportSource* _tmp27_;
-					SpitDataImportsDataImportJob* _tmp28_;
-					SpitDataImportsDataImportJob* _tmp29_;
+				if (spit_data_imports_data_import_source_is_already_imported (_tmp15_)) {
+#line 1037 "DataImportsPluginHost.c"
+					SpitDataImportsDataImportSource* _tmp16_;
+					gchar* _tmp17_;
+					gchar* _tmp18_;
+					GeeArrayList* _tmp19_;
+					SpitDataImportsDataImportSource* _tmp20_;
+					SpitDataImportsDataImportJob* _tmp21_;
+					SpitDataImportsDataImportJob* _tmp22_;
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp23_ = import_source;
+					_tmp16_ = import_source;
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp24_ = spit_data_imports_data_import_source_get_filename (_tmp23_);
+					_tmp17_ = spit_data_imports_data_import_source_get_filename (_tmp16_);
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp25_ = _tmp24_;
+					_tmp18_ = _tmp17_;
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					g_message ("DataImportsPluginHost.vala:47: Skipping import of %s: checksum detecte" \
-"d in library", _tmp25_);
+"d in library", _tmp18_);
 #line 47 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_g_free0 (_tmp25_);
+					_g_free0 (_tmp18_);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp26_ = already_imported;
+					_tmp19_ = already_imported;
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp27_ = import_source;
+					_tmp20_ = import_source;
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp28_ = spit_data_imports_data_import_job_new (_tmp27_);
+					_tmp21_ = spit_data_imports_data_import_job_new (_tmp20_);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_tmp29_ = _tmp28_;
+					_tmp22_ = _tmp21_;
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-					_batch_import_job_unref0 (_tmp29_);
+					_batch_import_job_unref0 (_tmp22_);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_spit_data_imports_data_import_source_unref0 (import_source);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					_g_object_unref0 (src_item);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					continue;
-#line 895 "DataImportsPluginHost.c"
+#line 1073 "DataImportsPluginHost.c"
 				}
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp30_ = jobs;
+				_tmp23_ = jobs;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp31_ = import_source;
+				_tmp24_ = import_source;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp32_ = spit_data_imports_data_import_job_new (_tmp31_);
+				_tmp25_ = spit_data_imports_data_import_job_new (_tmp24_);
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp33_ = _tmp32_;
+				_tmp26_ = _tmp25_;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_);
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_batch_import_job_unref0 (_tmp33_);
+				_batch_import_job_unref0 (_tmp26_);
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp34_ = item_idx;
+				_tmp27_ = item_idx;
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				item_idx = _tmp34_ + 1;
-#line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp35_ = self->priv->host;
+				item_idx = _tmp27_ + 1;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp36_ = progress;
+				_tmp28_ = self->priv->host;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp37_ = item_idx;
+				_tmp29_ = item_idx;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp38_ = item_progress_delta;
+				_tmp30_ = item_progress_delta;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				spit_data_imports_plugin_host_update_import_progress_pane (_tmp35_, _tmp36_ + (_tmp37_ * _tmp38_), NULL);
+				spit_data_imports_plugin_host_update_import_progress_pane (_tmp28_, progress + (_tmp29_ * _tmp30_), NULL);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_spit_data_imports_data_import_source_unref0 (import_source);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (src_item);
-#line 927 "DataImportsPluginHost.c"
+#line 1103 "DataImportsPluginHost.c"
 			}
 		}
 	}
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp39_ = jobs;
+	_tmp31_ = jobs;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp40_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp41_ = _tmp40_;
+	_tmp33_ = _tmp32_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp41_ > 0) {
-#line 939 "DataImportsPluginHost.c"
-		BatchImportRoll* _tmp42_;
+	if (_tmp33_ > 0) {
+#line 1115 "DataImportsPluginHost.c"
+		BatchImportRoll* _tmp34_;
 		gchar* db_name = NULL;
-		SpitDataImportsPluginHost* _tmp44_;
-		SpitDataImportsDataImporter* _tmp45_;
-		SpitDataImportsDataImporter* _tmp46_;
-		SpitDataImportsService* _tmp47_;
-		SpitDataImportsService* _tmp48_;
-		const gchar* _tmp49_;
-		gchar* _tmp50_;
-		gchar* _tmp51_;
+		SpitDataImportsPluginHost* _tmp36_;
+		SpitDataImportsDataImporter* _tmp37_;
+		SpitDataImportsDataImporter* _tmp38_;
+		SpitDataImportsService* _tmp39_;
+		SpitDataImportsService* _tmp40_;
+		const gchar* _tmp41_;
+		gchar* _tmp42_;
+		gchar* _tmp43_;
 		BatchImport* batch_import = NULL;
-		SortedList* _tmp52_;
-		const gchar* _tmp53_;
-		GeeArrayList* _tmp54_;
-		GeeArrayList* _tmp55_;
-		BatchImportRoll* _tmp56_;
-		BatchImport* _tmp57_;
-		LibraryWindow* _tmp58_;
-		LibraryWindow* _tmp59_;
-		BatchImport* _tmp60_;
-		gint _tmp61_;
-		SortedList* _tmp62_;
-		gint _tmp63_;
-		gint _tmp64_;
+		SortedList* _tmp44_;
+		const gchar* _tmp45_;
+		GeeArrayList* _tmp46_;
+		GeeArrayList* _tmp47_;
+		BatchImportRoll* _tmp48_;
+		BatchImport* _tmp49_;
+		LibraryWindow* _tmp50_;
+		LibraryWindow* _tmp51_;
+		BatchImport* _tmp52_;
+		gint _tmp53_;
+		SortedList* _tmp54_;
+		gint _tmp55_;
+		gint _tmp56_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp42_ = self->current_import_roll;
+		_tmp34_ = self->current_import_roll;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		if (_tmp42_ == NULL) {
-#line 968 "DataImportsPluginHost.c"
-			BatchImportRoll* _tmp43_;
+		if (_tmp34_ == NULL) {
+#line 1144 "DataImportsPluginHost.c"
+			BatchImportRoll* _tmp35_;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp43_ = batch_import_roll_new ();
+			_tmp35_ = batch_import_roll_new ();
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_batch_import_roll_unref0 (self->current_import_roll);
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			self->current_import_roll = _tmp43_;
-#line 976 "DataImportsPluginHost.c"
+			self->current_import_roll = _tmp35_;
+#line 1152 "DataImportsPluginHost.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp44_ = self->priv->host;
+		_tmp36_ = self->priv->host;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp45_ = spit_data_imports_plugin_host_get_data_importer (_tmp44_);
+		_tmp37_ = spit_data_imports_plugin_host_get_data_importer (_tmp36_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp46_ = _tmp45_;
+		_tmp38_ = _tmp37_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp47_ = spit_data_imports_data_importer_get_service (_tmp46_);
+		_tmp39_ = spit_data_imports_data_importer_get_service (_tmp38_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp48_ = _tmp47_;
+		_tmp40_ = _tmp39_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp49_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+		_tmp41_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp50_ = g_strdup_printf (_ ("%s Database"), _tmp49_);
+		_tmp42_ = g_strdup_printf (_ ("%s Database"), _tmp41_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp51_ = _tmp50_;
+		_tmp43_ = _tmp42_;
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp48_);
+		_g_object_unref0 (_tmp40_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp46_);
+		_g_object_unref0 (_tmp38_);
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		db_name = _tmp51_;
+		db_name = _tmp43_;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp52_ = jobs;
+		_tmp44_ = jobs;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp53_ = db_name;
+		_tmp45_ = db_name;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp54_ = failed;
+		_tmp46_ = failed;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp55_ = already_imported;
+		_tmp47_ = already_imported;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp56_ = self->current_import_roll;
+		_tmp48_ = self->current_import_roll;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp57_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable), _tmp53_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp54_, _tmp55_, NULL, _tmp56_, NULL);
+		_tmp49_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ITERABLE, GeeIterable), _tmp45_, _spit_data_imports_data_import_reporter_batch_import_import_reporter, NULL, _tmp46_, _tmp47_, NULL, _tmp48_, NULL);
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		batch_import = _tmp57_;
+		batch_import = _tmp49_;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp58_ = library_window_get_app ();
+		_tmp50_ = library_window_get_app ();
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp59_ = _tmp58_;
+		_tmp51_ = _tmp50_;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp60_ = batch_import;
+		_tmp52_ = batch_import;
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		library_window_enqueue_batch_import (_tmp59_, _tmp60_, TRUE);
+		library_window_enqueue_batch_import (_tmp51_, _tmp52_, TRUE);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp59_);
+		_g_object_unref0 (_tmp51_);
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp61_ = self->imported_items_count;
+		_tmp53_ = self->imported_items_count;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp62_ = jobs;
+		_tmp54_ = jobs;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp64_ = _tmp63_;
+		_tmp56_ = _tmp55_;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		self->imported_items_count = _tmp61_ + _tmp64_;
+		self->imported_items_count = _tmp53_ + _tmp56_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (batch_import);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_free0 (db_name);
-#line 1038 "DataImportsPluginHost.c"
+#line 1214 "DataImportsPluginHost.c"
 	}
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp65_ = self->priv->host;
-#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp66_ = progress;
-#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp67_ = host_progress_delta;
+	_tmp57_ = self->priv->host;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_update_import_progress_pane (_tmp65_, _tmp66_ + _tmp67_, NULL);
+	spit_data_imports_plugin_host_update_import_progress_pane (_tmp57_, progress + host_progress_delta, NULL);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (failed);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (already_imported);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (jobs);
-#line 1054 "DataImportsPluginHost.c"
+#line 1226 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self) {
+void
+spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporter* self)
+{
 	gchar* db_name = NULL;
 	SpitDataImportsPluginHost* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
@@ -1128,108 +1302,133 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte
 	_g_object_unref0 (batch_import);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (db_name);
-#line 1130 "DataImportsPluginHost.c"
+#line 1304 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_value_core_importer_init (GValue* value) {
+static void
+spit_data_imports_value_core_importer_init (GValue* value)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	value->data[0].v_pointer = NULL;
-#line 1137 "DataImportsPluginHost.c"
+#line 1313 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_value_core_importer_free_value (GValue* value) {
+static void
+spit_data_imports_value_core_importer_free_value (GValue* value)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (value->data[0].v_pointer);
-#line 1146 "DataImportsPluginHost.c"
+#line 1324 "DataImportsPluginHost.c"
 	}
 }
 
 
-static void spit_data_imports_value_core_importer_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+spit_data_imports_value_core_importer_copy_value (const GValue* src_value,
+                                                  GValue* dest_value)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (src_value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer);
-#line 1156 "DataImportsPluginHost.c"
+#line 1337 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1160 "DataImportsPluginHost.c"
+#line 1341 "DataImportsPluginHost.c"
 	}
 }
 
 
-static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) {
+static gpointer
+spit_data_imports_value_core_importer_peek_pointer (const GValue* value)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1168 "DataImportsPluginHost.c"
+#line 1351 "DataImportsPluginHost.c"
 }
 
 
-static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+spit_data_imports_value_core_importer_collect_value (GValue* value,
+                                                     guint n_collect_values,
+                                                     GTypeCValue* collect_values,
+                                                     guint collect_flags)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (collect_values[0].v_pointer) {
-#line 1175 "DataImportsPluginHost.c"
+#line 1363 "DataImportsPluginHost.c"
 		SpitDataImportsCoreImporter * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1182 "DataImportsPluginHost.c"
+#line 1370 "DataImportsPluginHost.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.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 1186 "DataImportsPluginHost.c"
+#line 1374 "DataImportsPluginHost.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = spit_data_imports_core_importer_ref (object);
-#line 1190 "DataImportsPluginHost.c"
+#line 1378 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1194 "DataImportsPluginHost.c"
+#line 1382 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1198 "DataImportsPluginHost.c"
+#line 1386 "DataImportsPluginHost.c"
 }
 
 
-static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+spit_data_imports_value_core_importer_lcopy_value (const GValue* value,
+                                                   guint n_collect_values,
+                                                   GTypeCValue* collect_values,
+                                                   guint collect_flags)
+{
 	SpitDataImportsCoreImporter ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (!object_p) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1209 "DataImportsPluginHost.c"
+#line 1402 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (!value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = NULL;
-#line 1215 "DataImportsPluginHost.c"
+#line 1408 "DataImportsPluginHost.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1219 "DataImportsPluginHost.c"
+#line 1412 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1223 "DataImportsPluginHost.c"
+#line 1416 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1227 "DataImportsPluginHost.c"
+#line 1420 "DataImportsPluginHost.c"
 }
 
 
-GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+spit_data_imports_param_spec_core_importer (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags)
+{
 	SpitDataImportsParamSpecCoreImporter* spec;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL);
@@ -1239,20 +1438,25 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return G_PARAM_SPEC (spec);
-#line 1241 "DataImportsPluginHost.c"
+#line 1440 "DataImportsPluginHost.c"
 }
 
 
-gpointer spit_data_imports_value_get_core_importer (const GValue* value) {
+gpointer
+spit_data_imports_value_get_core_importer (const GValue* value)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1250 "DataImportsPluginHost.c"
+#line 1451 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object) {
+void
+spit_data_imports_value_set_core_importer (GValue* value,
+                                           gpointer v_object)
+{
 	SpitDataImportsCoreImporter * old;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
@@ -1268,22 +1472,25 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1270 "DataImportsPluginHost.c"
+#line 1474 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1274 "DataImportsPluginHost.c"
+#line 1478 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1280 "DataImportsPluginHost.c"
+#line 1484 "DataImportsPluginHost.c"
 	}
 }
 
 
-void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_object) {
+void
+spit_data_imports_value_take_core_importer (GValue* value,
+                                            gpointer v_object)
+{
 	SpitDataImportsCoreImporter * old;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER));
@@ -1297,33 +1504,37 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = v_object;
-#line 1299 "DataImportsPluginHost.c"
+#line 1506 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1303 "DataImportsPluginHost.c"
+#line 1510 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1309 "DataImportsPluginHost.c"
+#line 1516 "DataImportsPluginHost.c"
 	}
 }
 
 
-static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImporterClass * klass) {
+static void
+spit_data_imports_core_importer_class_init (SpitDataImportsCoreImporterClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate));
-#line 1321 "DataImportsPluginHost.c"
+#line 1530 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreImporter * self) {
+static void
+spit_data_imports_core_importer_instance_init (SpitDataImportsCoreImporter * self)
+{
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_PRIVATE (self);
 #line 11 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1332,11 +1543,13 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm
 	self->current_import_roll = NULL;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->ref_count = 1;
-#line 1334 "DataImportsPluginHost.c"
+#line 1545 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj) {
+static void
+spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporter * obj)
+{
 	SpitDataImportsCoreImporter * self;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, SpitDataImportsCoreImporter);
@@ -1344,11 +1557,13 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte
 	g_signal_handlers_destroy (self);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_batch_import_roll_unref0 (self->current_import_roll);
-#line 1346 "DataImportsPluginHost.c"
+#line 1559 "DataImportsPluginHost.c"
 }
 
 
-GType spit_data_imports_core_importer_get_type (void) {
+GType
+spit_data_imports_core_importer_get_type (void)
+{
 	static volatile gsize spit_data_imports_core_importer_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_core_importer_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { spit_data_imports_value_core_importer_init, spit_data_imports_value_core_importer_free_value, spit_data_imports_value_core_importer_copy_value, spit_data_imports_value_core_importer_peek_pointer, "p", spit_data_imports_value_core_importer_collect_value, "p", spit_data_imports_value_core_importer_lcopy_value };
@@ -1362,18 +1577,22 @@ GType spit_data_imports_core_importer_get_type (void) {
 }
 
 
-gpointer spit_data_imports_core_importer_ref (gpointer instance) {
+gpointer
+spit_data_imports_core_importer_ref (gpointer instance)
+{
 	SpitDataImportsCoreImporter * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return instance;
-#line 1371 "DataImportsPluginHost.c"
+#line 1588 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_core_importer_unref (gpointer instance) {
+void
+spit_data_imports_core_importer_unref (gpointer instance)
+{
 	SpitDataImportsCoreImporter * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1382,58 +1601,58 @@ void spit_data_imports_core_importer_unref (gpointer instance) {
 		SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1384 "DataImportsPluginHost.c"
+#line 1603 "DataImportsPluginHost.c"
 	}
 }
 
 
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
+SpitDataImportsConcreteDataImportsHost*
+spit_data_imports_concrete_data_imports_host_construct (GType object_type,
+                                                        SpitDataImportsService* service,
+                                                        DataImportsUIDataImportsDialog* dialog)
+{
 	SpitDataImportsConcreteDataImportsHost * self = NULL;
-	SpitDataImportsService* _tmp0_;
-	DataImportsUIDataImportsDialog* _tmp1_;
-	SpitDataImportsService* _tmp2_;
-	SpitDataImportsDataImporter* _tmp3_;
-	SpitDataImportsCoreImporter* _tmp4_;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsCoreImporter* _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (dialog), NULL);
 #line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = service;
-#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self = (SpitDataImportsConcreteDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports");
+	self = (SpitDataImportsConcreteDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports");
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = dialog;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->dialog = _tmp1_;
-#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = service;
+	self->priv->dialog = dialog;
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = spit_data_imports_service_create_data_importer (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp0_ = spit_data_imports_service_create_data_importer (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->active_importer);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->active_importer = _tmp3_;
+	self->priv->active_importer = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp1_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->core_importer = _tmp4_;
+	self->priv->core_importer = _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 1424 "DataImportsPluginHost.c"
+#line 1638 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
+SpitDataImportsConcreteDataImportsHost*
+spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service,
+                                                  DataImportsUIDataImportsDialog* dialog)
+{
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog);
-#line 1431 "DataImportsPluginHost.c"
+#line 1648 "DataImportsPluginHost.c"
 }
 
 
-static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
+static SpitDataImportsDataImporter*
+spit_data_imports_concrete_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	SpitDataImportsDataImporter* result = NULL;
 	SpitDataImportsDataImporter* _tmp0_;
@@ -1448,18 +1667,19 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host
 	result = _tmp1_;
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 1450 "DataImportsPluginHost.c"
+#line 1669 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
+static void
+spit_data_imports_concrete_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	SpitDataImportsDataImporter* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
+	SpitDataImportsDataImporter* _tmp3_;
 	SpitDataImportsDataImporter* _tmp4_;
-	SpitDataImportsDataImporter* _tmp5_;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1469,36 +1689,35 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
-#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp1_);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1478 "DataImportsPluginHost.c"
+#line 1696 "DataImportsPluginHost.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \
 "g( ): invoked.");
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_data_importer_start (_tmp5_);
+	spit_data_imports_data_importer_start (_tmp4_);
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp5_);
-#line 1490 "DataImportsPluginHost.c"
+	_g_object_unref0 (_tmp4_);
+#line 1708 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
+static void
+spit_data_imports_concrete_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	SpitDataImportsDataImporter* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1511,98 +1730,98 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
-#line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp1_);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp3_) {
-#line 1516 "DataImportsPluginHost.c"
+	if (_tmp2_) {
+#line 1733 "DataImportsPluginHost.c"
+		SpitDataImportsDataImporter* _tmp3_;
 		SpitDataImportsDataImporter* _tmp4_;
-		SpitDataImportsDataImporter* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+		_tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		spit_data_imports_data_importer_stop (_tmp5_);
+		spit_data_imports_data_importer_stop (_tmp4_);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp5_);
-#line 1527 "DataImportsPluginHost.c"
+		_g_object_unref0 (_tmp4_);
+#line 1744 "DataImportsPluginHost.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 1533 "DataImportsPluginHost.c"
+#line 1750 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self) {
+static void
+spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImportsConcreteDataImportsHost* self)
+{
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self));
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->progress_pane);
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->progress_pane = NULL;
-#line 1544 "DataImportsPluginHost.c"
+#line 1763 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self, SpitDataImportsPluginHostButtonMode mode) {
-	SpitDataImportsPluginHostButtonMode _tmp0_;
+void
+spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImportsConcreteDataImportsHost* self,
+                                                              SpitDataImportsPluginHostButtonMode mode)
+{
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_CONCRETE_DATA_IMPORTS_HOST (self));
 #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = mode;
-#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 1556 "DataImportsPluginHost.c"
-		DataImportsUIDataImportsDialog* _tmp1_;
+	if (mode == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
+#line 1775 "DataImportsPluginHost.c"
+		DataImportsUIDataImportsDialog* _tmp0_;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp1_ = self->priv->dialog;
+		_tmp0_ = self->priv->dialog;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_);
-#line 1562 "DataImportsPluginHost.c"
+		data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp0_);
+#line 1781 "DataImportsPluginHost.c"
 	} else {
-		SpitDataImportsPluginHostButtonMode _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp2_ = mode;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1569 "DataImportsPluginHost.c"
-			DataImportsUIDataImportsDialog* _tmp3_;
+		if (mode == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
+#line 1785 "DataImportsPluginHost.c"
+			DataImportsUIDataImportsDialog* _tmp1_;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp3_ = self->priv->dialog;
+			_tmp1_ = self->priv->dialog;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_);
-#line 1575 "DataImportsPluginHost.c"
+			data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp1_);
+#line 1791 "DataImportsPluginHost.c"
 		} else {
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \
 "alue");
-#line 1579 "DataImportsPluginHost.c"
+#line 1795 "DataImportsPluginHost.c"
 		}
 	}
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
+static void
+spit_data_imports_concrete_data_imports_host_real_post_error (SpitDataImportsPluginHost* base,
+                                                              GError* err)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
-	GError* _tmp0_;
-	const gchar* _tmp1_;
+	const gchar* _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = err;
-#line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = _tmp0_->message;
+	_tmp0_ = err->message;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 1597 "DataImportsPluginHost.c"
+	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp0_);
+#line 1813 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
+static void
+spit_data_imports_concrete_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base,
+                                                                      const gchar* message)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	gchar* msg = NULL;
 	SpitDataImportsDataImporter* _tmp0_;
@@ -1612,20 +1831,19 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message
 	gchar* _tmp4_;
 	gchar* _tmp5_;
 	const gchar* _tmp6_;
-	const gchar* _tmp7_;
+	gchar* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-	gchar* _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	DataImportsUIDataImportsDialog* _tmp13_;
-	const gchar* _tmp14_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	DataImportsUIDataImportsDialog* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsUIStaticMessagePane* _tmp14_;
 	DataImportsUIStaticMessagePane* _tmp15_;
-	DataImportsUIStaticMessagePane* _tmp16_;
+	DataImportsUIDataImportsDialog* _tmp16_;
 	DataImportsUIDataImportsDialog* _tmp17_;
-	DataImportsUIDataImportsDialog* _tmp18_;
+	SpitDataImportsDataImporter* _tmp18_;
 	SpitDataImportsDataImporter* _tmp19_;
-	SpitDataImportsDataImporter* _tmp20_;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1649,72 +1867,72 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp6_ = msg;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = message;
-#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp7_);
+	_tmp7_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", message);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
+	_tmp9_ = g_strconcat (_tmp6_, _tmp8_, NULL);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp10_;
+	msg = _tmp9_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp8_);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp11_ = msg;
+	_tmp10_ = msg;
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp12_ = g_strconcat (_tmp11_, _ ("To try importing from another service, select one from the above menu."), NULL);
+	_tmp11_ = g_strconcat (_tmp10_, _ ("To try importing from another service, select one from the above menu."), NULL);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
 #line 151 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	msg = _tmp12_;
+	msg = _tmp11_;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp13_ = self->priv->dialog;
+	_tmp12_ = self->priv->dialog;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp14_ = msg;
+	_tmp13_ = msg;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp15_ = data_imports_ui_static_message_pane_new_with_pango (_tmp14_);
+	_tmp14_ = data_imports_ui_static_message_pane_new_with_pango (_tmp13_);
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_install_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	data_imports_ui_data_imports_dialog_install_pane (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 153 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp16_);
+	_g_object_unref0 (_tmp15_);
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp17_ = self->priv->dialog;
+	_tmp16_ = self->priv->dialog;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp17_);
+	data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp16_);
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp18_ = self->priv->dialog;
+	_tmp17_ = self->priv->dialog;
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_unlock_service (_tmp18_);
+	data_imports_ui_data_imports_dialog_unlock_service (_tmp17_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp19_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp18_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_data_importer_stop (_tmp20_);
+	spit_data_imports_data_importer_stop (_tmp19_);
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp19_);
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 1701 "DataImportsPluginHost.c"
+#line 1917 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) {
+static void
+spit_data_imports_concrete_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base,
+                                                                       SpitDataImportsDialogPane* pane,
+                                                                       SpitDataImportsPluginHostButtonMode button_mode)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	gboolean _tmp0_ = FALSE;
 	SpitDataImportsDataImporter* _tmp1_;
 	SpitDataImportsDataImporter* _tmp2_;
 	gboolean _tmp3_;
-	DataImportsUIDataImportsDialog* _tmp7_;
-	SpitDataImportsDialogPane* _tmp8_;
-	SpitDataImportsPluginHostButtonMode _tmp9_;
+	DataImportsUIDataImportsDialog* _tmp6_;
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1734,183 +1952,162 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 	if (_tmp3_) {
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = TRUE;
-#line 1732 "DataImportsPluginHost.c"
+#line 1950 "DataImportsPluginHost.c"
 	} else {
 		SpitDataImportsDataImporter* _tmp4_;
 		SpitDataImportsDataImporter* _tmp5_;
-		gboolean _tmp6_;
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp5_ = _tmp4_;
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp6_ = spit_data_imports_data_importer_is_running (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp0_ = !_tmp6_;
+		_tmp0_ = !spit_data_imports_data_importer_is_running (_tmp5_);
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1747 "DataImportsPluginHost.c"
+#line 1962 "DataImportsPluginHost.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1753 "DataImportsPluginHost.c"
+#line 1968 "DataImportsPluginHost.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = self->priv->dialog;
+	_tmp6_ = self->priv->dialog;
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp8_ = pane;
-#line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_install_pane (_tmp7_, _tmp8_);
-#line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp9_ = button_mode;
+	data_imports_ui_data_imports_dialog_install_pane (_tmp6_, pane);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_);
-#line 1765 "DataImportsPluginHost.c"
+	spit_data_imports_concrete_data_imports_host_set_button_mode (self, button_mode);
+#line 1976 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) {
+static void
+spit_data_imports_concrete_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base,
+                                                                               const gchar* message,
+                                                                               SpitDataImportsPluginHostButtonMode button_mode)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
-	SpitDataImportsPluginHostButtonMode _tmp0_;
-	DataImportsUIDataImportsDialog* _tmp1_;
-	const gchar* _tmp2_;
-	DataImportsUIStaticMessagePane* _tmp3_;
-	DataImportsUIStaticMessagePane* _tmp4_;
+	DataImportsUIDataImportsDialog* _tmp0_;
+	DataImportsUIStaticMessagePane* _tmp1_;
+	DataImportsUIStaticMessagePane* _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = button_mode;
-#line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp0_);
+	spit_data_imports_concrete_data_imports_host_set_button_mode (self, button_mode);
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = self->priv->dialog;
-#line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = message;
+	_tmp0_ = self->priv->dialog;
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = data_imports_ui_static_message_pane_new_with_pango (_tmp2_);
+	_tmp1_ = data_imports_ui_static_message_pane_new_with_pango (message);
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	data_imports_ui_data_imports_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1796 "DataImportsPluginHost.c"
+	_g_object_unref0 (_tmp2_);
+#line 2005 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
+static void
+spit_data_imports_concrete_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base,
+                                                                                  const gchar* welcome_message,
+                                                                                  SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                  int discovered_libraries_length1,
+                                                                                  const gchar* file_select_label)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsImportableLibrary** _tmp1_;
-	gint _tmp1__length1;
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (welcome_message != NULL);
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = discovered_libraries;
-#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1__length1 = discovered_libraries_length1;
+	if (discovered_libraries_length1 == 0) {
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp1__length1 == 0) {
-#line 1815 "DataImportsPluginHost.c"
-		const gchar* _tmp2_;
-#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp2_ = file_select_label;
-#line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp0_ = _tmp2_ == NULL;
-#line 1821 "DataImportsPluginHost.c"
+		_tmp0_ = file_select_label == NULL;
+#line 2026 "DataImportsPluginHost.c"
 	} else {
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = FALSE;
-#line 1825 "DataImportsPluginHost.c"
+#line 2030 "DataImportsPluginHost.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed");
-#line 1831 "DataImportsPluginHost.c"
+#line 2036 "DataImportsPluginHost.c"
 	} else {
-		DataImportsUIDataImportsDialog* _tmp3_;
-		const gchar* _tmp4_;
-		SpitDataImportsImportableLibrary** _tmp5_;
-		gint _tmp5__length1;
-		const gchar* _tmp6_;
-		DataImportsUILibrarySelectionPane* _tmp7_;
-		DataImportsUILibrarySelectionPane* _tmp8_;
-#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp3_ = self->priv->dialog;
-#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp4_ = welcome_message;
-#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp5_ = discovered_libraries;
-#line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp5__length1 = discovered_libraries_length1;
+		DataImportsUIDataImportsDialog* _tmp1_;
+		DataImportsUILibrarySelectionPane* _tmp2_;
+		DataImportsUILibrarySelectionPane* _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp6_ = file_select_label;
+		_tmp1_ = self->priv->dialog;
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp7_ = data_imports_ui_library_selection_pane_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp4_, _tmp5_, _tmp5__length1, _tmp6_);
+		_tmp2_ = data_imports_ui_library_selection_pane_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp8_ = _tmp7_;
+		_tmp3_ = _tmp2_;
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+		data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp8_);
-#line 1858 "DataImportsPluginHost.c"
+		_g_object_unref0 (_tmp3_);
+#line 2051 "DataImportsPluginHost.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 1862 "DataImportsPluginHost.c"
+#line 2055 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) {
+static void
+spit_data_imports_concrete_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                                const gchar* message)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
-	const gchar* _tmp0_;
-	DataImportsUIProgressPane* _tmp1_;
-	DataImportsUIDataImportsDialog* _tmp2_;
-	DataImportsUIProgressPane* _tmp3_;
+	DataImportsUIProgressPane* _tmp0_;
+	DataImportsUIDataImportsDialog* _tmp1_;
+	DataImportsUIProgressPane* _tmp2_;
+	SpitDataImportsCoreImporter* _tmp3_;
 	SpitDataImportsCoreImporter* _tmp4_;
-	SpitDataImportsCoreImporter* _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 202 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = message;
-#line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = data_imports_ui_progress_pane_new (_tmp0_);
+	_tmp0_ = data_imports_ui_progress_pane_new (message);
 #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->progress_pane);
 #line 205 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->progress_pane = _tmp1_;
+	self->priv->progress_pane = _tmp0_;
 #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = self->priv->dialog;
+	_tmp1_ = self->priv->dialog;
 #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = self->priv->progress_pane;
+	_tmp2_ = self->priv->progress_pane;
 #line 206 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	data_imports_ui_data_imports_dialog_install_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 207 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 209 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = self->priv->core_importer;
+	_tmp3_ = self->priv->core_importer;
 #line 209 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_->imported_items_count = 0;
+	_tmp3_->imported_items_count = 0;
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = self->priv->core_importer;
+	_tmp4_ = self->priv->core_importer;
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_batch_import_roll_unref0 (_tmp5_->current_import_roll);
+	_batch_import_roll_unref0 (_tmp4_->current_import_roll);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_->current_import_roll = NULL;
-#line 1904 "DataImportsPluginHost.c"
+	_tmp4_->current_import_roll = NULL;
+#line 2097 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) {
+static void
+spit_data_imports_concrete_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                               gdouble progress,
+                                                                               const gchar* progress_message)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	DataImportsUIProgressPane* _tmp0_;
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1919,117 +2116,103 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
 	_tmp0_ = self->priv->progress_pane;
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_ != NULL) {
-#line 1917 "DataImportsPluginHost.c"
+#line 2114 "DataImportsPluginHost.c"
 		DataImportsUIProgressPane* _tmp1_;
-		gdouble _tmp2_;
-		const gchar* _tmp3_;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp1_ = self->priv->progress_pane;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp2_ = progress;
-#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp3_ = progress_message;
-#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_);
-#line 1929 "DataImportsPluginHost.c"
+		data_imports_ui_progress_pane_update_progress (_tmp1_, progress, progress_message);
+#line 2120 "DataImportsPluginHost.c"
 	}
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
+static void
+spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base,
+                                                                                  SpitDataImportsImportableMediaItem** items,
+                                                                                  int items_length1,
+                                                                                  gdouble progress,
+                                                                                  gdouble host_progress_delta,
+                                                                                  const gchar* progress_message)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 	SpitDataImportsCoreImporter* _tmp0_;
-	SpitDataImportsImportableMediaItem** _tmp1_;
-	gint _tmp1__length1;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
-	const gchar* _tmp4_;
 #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = self->priv->core_importer;
 #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = items;
-#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1__length1 = items_length1;
-#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = progress;
-#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = host_progress_delta;
-#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = progress_message;
-#line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 1958 "DataImportsPluginHost.c"
+	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, items, items_length1, progress, host_progress_delta, progress_message);
+#line 2141 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
+static void
+spit_data_imports_concrete_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base,
+                                                                   SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                                                   void* report_imported_items_count_target,
+                                                                   const gchar* finalize_message)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
-	const gchar* _tmp0_;
+	SpitDataImportsCoreImporter* _tmp0_;
 	SpitDataImportsCoreImporter* _tmp1_;
-	SpitDataImportsImportedItemsCountCallback _tmp2_;
-	void* _tmp2__target;
+	gint _tmp2_;
 	SpitDataImportsCoreImporter* _tmp3_;
 	gint _tmp4_;
-	SpitDataImportsCoreImporter* _tmp5_;
-	gint _tmp6_;
 #line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
 #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = finalize_message;
-#line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_update_import_progress_pane (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), 1.0, _tmp0_);
+	spit_data_imports_plugin_host_update_import_progress_pane (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), 1.0, finalize_message);
 #line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = self->priv->core_importer;
+	_tmp0_ = self->priv->core_importer;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_core_importer_finalize_import (_tmp1_);
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = report_imported_items_count;
+	spit_data_imports_core_importer_finalize_import (_tmp0_);
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2__target = report_imported_items_count_target;
+	_tmp1_ = self->priv->core_importer;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = self->priv->core_importer;
+	_tmp2_ = _tmp1_->imported_items_count;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = _tmp3_->imported_items_count;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ (_tmp4_, _tmp2__target);
+	report_imported_items_count (_tmp2_, report_imported_items_count_target);
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = self->priv->core_importer;
+	_tmp3_ = self->priv->core_importer;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = _tmp5_->imported_items_count;
+	_tmp4_ = _tmp3_->imported_items_count;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp6_ > 0) {
-#line 2000 "DataImportsPluginHost.c"
-		LibraryWindow* _tmp7_;
-		LibraryWindow* _tmp8_;
+	if (_tmp4_ > 0) {
+#line 2179 "DataImportsPluginHost.c"
+		LibraryWindow* _tmp5_;
+		LibraryWindow* _tmp6_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp7_ = library_window_get_app ();
+		_tmp5_ = library_window_get_app ();
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		library_window_switch_to_import_queue_page (_tmp8_);
+		library_window_switch_to_import_queue_page (_tmp6_);
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp8_);
-#line 2011 "DataImportsPluginHost.c"
+		_g_object_unref0 (_tmp6_);
+#line 2190 "DataImportsPluginHost.c"
 	}
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImportsConcreteDataImportsHostClass * klass) {
+static void
+spit_data_imports_concrete_data_imports_host_class_init (SpitDataImportsConcreteDataImportsHostClass * klass)
+{
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate));
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize;
-#line 2023 "DataImportsPluginHost.c"
+#line 2204 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) {
+static void
+spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface)
+{
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2056,11 +2239,13 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi
 	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
-#line 2054 "DataImportsPluginHost.c"
+#line 2237 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_instance_init (SpitDataImportsConcreteDataImportsHost * self) {
+static void
+spit_data_imports_concrete_data_imports_host_instance_init (SpitDataImportsConcreteDataImportsHost * self)
+{
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_CONCRETE_DATA_IMPORTS_HOST_GET_PRIVATE (self);
 #line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2071,11 +2256,13 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData
 	self->priv->progress_pane = NULL;
 #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2069 "DataImportsPluginHost.c"
+#line 2254 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj) {
+static void
+spit_data_imports_concrete_data_imports_host_finalize (GObject * obj)
+{
 	SpitDataImportsConcreteDataImportsHost * self;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, SpitDataImportsConcreteDataImportsHost);
@@ -2087,11 +2274,13 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj);
-#line 2085 "DataImportsPluginHost.c"
+#line 2272 "DataImportsPluginHost.c"
 }
 
 
-GType spit_data_imports_concrete_data_imports_host_get_type (void) {
+GType
+spit_data_imports_concrete_data_imports_host_get_type (void)
+{
 	static volatile gsize spit_data_imports_concrete_data_imports_host_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_concrete_data_imports_host_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsConcreteDataImportsHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_concrete_data_imports_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsConcreteDataImportsHost), 0, (GInstanceInitFunc) spit_data_imports_concrete_data_imports_host_instance_init, NULL };
@@ -2105,53 +2294,53 @@ GType spit_data_imports_concrete_data_imports_host_get_type (void) {
 }
 
 
-SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
+SpitDataImportsWelcomeDataImportsHost*
+spit_data_imports_welcome_data_imports_host_construct (GType object_type,
+                                                       SpitDataImportsService* service,
+                                                       SpitDataImportsWelcomeImportMetaHost* meta_host)
+{
 	SpitDataImportsWelcomeDataImportsHost * self = NULL;
-	SpitDataImportsService* _tmp0_;
-	SpitDataImportsService* _tmp1_;
-	SpitDataImportsDataImporter* _tmp2_;
-	SpitDataImportsCoreImporter* _tmp3_;
-	SpitDataImportsWelcomeImportMetaHost* _tmp4_;
+	SpitDataImportsDataImporter* _tmp0_;
+	SpitDataImportsCoreImporter* _tmp1_;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (meta_host), NULL);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = service;
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self = (SpitDataImportsWelcomeDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports");
-#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = service;
+	self = (SpitDataImportsWelcomeDataImportsHost*) plugins_standard_host_interface_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (service, SPIT_TYPE_PLUGGABLE, SpitPluggable), "data_imports");
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = spit_data_imports_service_create_data_importer (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp0_ = spit_data_imports_service_create_data_importer (service, G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->active_importer);
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->active_importer = _tmp2_;
+	self->priv->active_importer = _tmp0_;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp1_ = spit_data_imports_core_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->core_importer = _tmp3_;
+	self->priv->core_importer = _tmp1_;
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = meta_host;
-#line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->meta_host = _tmp4_;
+	self->priv->meta_host = meta_host;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2138 "DataImportsPluginHost.c"
+#line 2322 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
+SpitDataImportsWelcomeDataImportsHost*
+spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service,
+                                                 SpitDataImportsWelcomeImportMetaHost* meta_host)
+{
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host);
-#line 2145 "DataImportsPluginHost.c"
+#line 2332 "DataImportsPluginHost.c"
 }
 
 
-static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base) {
+static SpitDataImportsDataImporter*
+spit_data_imports_welcome_data_imports_host_real_get_data_importer (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsDataImporter* result = NULL;
 	SpitDataImportsDataImporter* _tmp0_;
@@ -2166,18 +2355,19 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_
 	result = _tmp1_;
 #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2164 "DataImportsPluginHost.c"
+#line 2353 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base) {
+static void
+spit_data_imports_welcome_data_imports_host_real_start_importing (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsDataImporter* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
+	SpitDataImportsDataImporter* _tmp3_;
 	SpitDataImportsDataImporter* _tmp4_;
-	SpitDataImportsDataImporter* _tmp5_;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2187,36 +2377,35 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
-#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 2192 "DataImportsPluginHost.c"
+#line 2380 "DataImportsPluginHost.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \
 "( ): invoked.");
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+	_tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_data_importer_start (_tmp5_);
+	spit_data_imports_data_importer_start (_tmp4_);
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_object_unref0 (_tmp5_);
-#line 2204 "DataImportsPluginHost.c"
+	_g_object_unref0 (_tmp4_);
+#line 2392 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base) {
+static void
+spit_data_imports_welcome_data_imports_host_real_stop_importing (SpitDataImportsPluginHost* base)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsDataImporter* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2229,56 +2418,59 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2_ = spit_data_imports_data_importer_is_running (_tmp1_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
-#line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp1_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp3_) {
-#line 2230 "DataImportsPluginHost.c"
+	if (_tmp2_) {
+#line 2417 "DataImportsPluginHost.c"
+		SpitDataImportsDataImporter* _tmp3_;
 		SpitDataImportsDataImporter* _tmp4_;
-		SpitDataImportsDataImporter* _tmp5_;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp4_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+		_tmp3_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		spit_data_imports_data_importer_stop (_tmp5_);
+		spit_data_imports_data_importer_stop (_tmp4_);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp5_);
-#line 2241 "DataImportsPluginHost.c"
+		_g_object_unref0 (_tmp4_);
+#line 2428 "DataImportsPluginHost.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 2247 "DataImportsPluginHost.c"
+#line 2434 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) {
+static void
+spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self)
+{
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self));
-#line 2254 "DataImportsPluginHost.c"
+#line 2443 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base, GError* err) {
+static void
+spit_data_imports_welcome_data_imports_host_real_post_error (SpitDataImportsPluginHost* base,
+                                                             GError* err)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
-	GError* _tmp0_;
-	const gchar* _tmp1_;
+	const gchar* _tmp0_;
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = err;
-#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = _tmp0_->message;
+	_tmp0_ = err->message;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 2270 "DataImportsPluginHost.c"
+	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp0_);
+#line 2459 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base, const gchar* message) {
+static void
+spit_data_imports_welcome_data_imports_host_real_post_error_message (SpitDataImportsPluginHost* base,
+                                                                     const gchar* message)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	gchar* msg = NULL;
 	SpitDataImportsDataImporter* _tmp0_;
@@ -2323,31 +2515,45 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 2319 "DataImportsPluginHost.c"
+#line 2511 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base, SpitDataImportsDialogPane* pane, SpitDataImportsPluginHostButtonMode button_mode) {
+static void
+spit_data_imports_welcome_data_imports_host_real_install_dialog_pane (SpitDataImportsPluginHost* base,
+                                                                      SpitDataImportsDialogPane* pane,
+                                                                      SpitDataImportsPluginHostButtonMode button_mode)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 2329 "DataImportsPluginHost.c"
+#line 2525 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base, const gchar* message, SpitDataImportsPluginHostButtonMode button_mode) {
+static void
+spit_data_imports_welcome_data_imports_host_real_install_static_message_pane (SpitDataImportsPluginHost* base,
+                                                                              const gchar* message,
+                                                                              SpitDataImportsPluginHostButtonMode button_mode)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2339 "DataImportsPluginHost.c"
+#line 2539 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
+static void
+spit_data_imports_welcome_data_imports_host_real_install_library_selection_pane (SpitDataImportsPluginHost* base,
+                                                                                 const gchar* welcome_message,
+                                                                                 SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                 int discovered_libraries_length1,
+                                                                                 const gchar* file_select_label)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsDataImporter* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
@@ -2356,8 +2562,6 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 	const gchar* _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-	SpitDataImportsImportableLibrary** _tmp7_;
-	gint _tmp7__length1;
 #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2385,109 +2589,101 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 #line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp1_);
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7_ = discovered_libraries;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp7__length1 = discovered_libraries_length1;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp7__length1 > 0) {
-#line 2386 "DataImportsPluginHost.c"
-		SpitDataImportsWelcomeImportMetaHost* _tmp8_;
+	if (discovered_libraries_length1 > 0) {
+#line 2586 "DataImportsPluginHost.c"
+		SpitDataImportsWelcomeImportMetaHost* _tmp7_;
+		SpitDataImportsDataImporter* _tmp8_;
 		SpitDataImportsDataImporter* _tmp9_;
-		SpitDataImportsDataImporter* _tmp10_;
+		SpitDataImportsService* _tmp10_;
 		SpitDataImportsService* _tmp11_;
-		SpitDataImportsService* _tmp12_;
-		const gchar* _tmp13_;
-		SpitDataImportsImportableLibrary** _tmp14_;
-		gint _tmp14__length1;
-		SpitDataImportsWelcomeImportServiceEntry* _tmp15_;
-		SpitDataImportsWelcomeImportServiceEntry* _tmp16_;
+		const gchar* _tmp12_;
+		SpitDataImportsWelcomeImportServiceEntry* _tmp13_;
+		SpitDataImportsWelcomeImportServiceEntry* _tmp14_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp8_ = self->priv->meta_host;
+		_tmp7_ = self->priv->meta_host;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp9_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+		_tmp8_ = spit_data_imports_plugin_host_get_data_importer (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp11_ = spit_data_imports_data_importer_get_service (_tmp10_);
+		_tmp10_ = spit_data_imports_data_importer_get_service (_tmp9_);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp13_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+		_tmp12_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp14_ = discovered_libraries;
+		_tmp13_ = spit_data_imports_welcome_import_service_entry_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp12_, discovered_libraries, discovered_libraries_length1);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp14__length1 = discovered_libraries_length1;
+		_tmp14_ = _tmp13_;
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp15_ = spit_data_imports_welcome_import_service_entry_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp13_, _tmp14_, _tmp14__length1);
+		spit_data_imports_welcome_import_meta_host_install_service_entry (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry));
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp16_ = _tmp15_;
+		_g_object_unref0 (_tmp14_);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		spit_data_imports_welcome_import_meta_host_install_service_entry (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry));
+		_g_object_unref0 (_tmp11_);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp16_);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp12_);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_g_object_unref0 (_tmp10_);
-#line 2425 "DataImportsPluginHost.c"
+		_g_object_unref0 (_tmp9_);
+#line 2619 "DataImportsPluginHost.c"
 	}
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base, const gchar* message) {
+static void
+spit_data_imports_welcome_data_imports_host_real_install_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                               const gchar* message)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2436 "DataImportsPluginHost.c"
+#line 2633 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base, gdouble progress, const gchar* progress_message) {
+static void
+spit_data_imports_welcome_data_imports_host_real_update_import_progress_pane (SpitDataImportsPluginHost* base,
+                                                                              gdouble progress,
+                                                                              const gchar* progress_message)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
-#line 2444 "DataImportsPluginHost.c"
+#line 2645 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base, SpitDataImportsImportableMediaItem** items, int items_length1, gdouble progress, gdouble host_progress_delta, const gchar* progress_message) {
+static void
+spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import (SpitDataImportsPluginHost* base,
+                                                                                 SpitDataImportsImportableMediaItem** items,
+                                                                                 int items_length1,
+                                                                                 gdouble progress,
+                                                                                 gdouble host_progress_delta,
+                                                                                 const gchar* progress_message)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsCoreImporter* _tmp0_;
-	SpitDataImportsImportableMediaItem** _tmp1_;
-	gint _tmp1__length1;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
-	const gchar* _tmp4_;
 #line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = self->priv->core_importer;
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = items;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1__length1 = items_length1;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = progress;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = host_progress_delta;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = progress_message;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 2472 "DataImportsPluginHost.c"
+	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, items, items_length1, progress, host_progress_delta, progress_message);
+#line 2665 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base, SpitDataImportsImportedItemsCountCallback report_imported_items_count, void* report_imported_items_count_target, const gchar* finalize_message) {
+static void
+spit_data_imports_welcome_data_imports_host_real_finalize_import (SpitDataImportsPluginHost* base,
+                                                                  SpitDataImportsImportedItemsCountCallback report_imported_items_count,
+                                                                  void* report_imported_items_count_target,
+                                                                  const gchar* finalize_message)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 	SpitDataImportsCoreImporter* _tmp0_;
-	SpitDataImportsImportedItemsCountCallback _tmp1_;
-	void* _tmp1__target;
-	SpitDataImportsCoreImporter* _tmp2_;
-	gint _tmp3_;
-	SpitDataImportsWelcomeImportMetaHost* _tmp4_;
+	SpitDataImportsCoreImporter* _tmp1_;
+	gint _tmp2_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp3_;
 #line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2495,35 +2691,35 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp
 #line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_finalize_import (_tmp0_);
 #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = report_imported_items_count;
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1__target = report_imported_items_count_target;
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = self->priv->core_importer;
+	_tmp1_ = self->priv->core_importer;
 #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_->imported_items_count;
+	_tmp2_ = _tmp1_->imported_items_count;
 #line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ (_tmp3_, _tmp1__target);
+	report_imported_items_count (_tmp2_, report_imported_items_count_target);
 #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = self->priv->meta_host;
+	_tmp3_ = self->priv->meta_host;
 #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self);
-#line 2504 "DataImportsPluginHost.c"
+	spit_data_imports_welcome_import_meta_host_finalize_import (_tmp3_, self);
+#line 2696 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImportsWelcomeDataImportsHostClass * klass) {
+static void
+spit_data_imports_welcome_data_imports_host_class_init (SpitDataImportsWelcomeDataImportsHostClass * klass)
+{
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_parent_class = g_type_class_peek_parent (klass);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate));
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize;
-#line 2515 "DataImportsPluginHost.c"
+#line 2709 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface) {
+static void
+spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_interface_init (SpitDataImportsPluginHostIface * iface)
+{
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2550,22 +2746,26 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin
 	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
-#line 2546 "DataImportsPluginHost.c"
+#line 2742 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataImportsWelcomeDataImportsHost * self) {
+static void
+spit_data_imports_welcome_data_imports_host_instance_init (SpitDataImportsWelcomeDataImportsHost * self)
+{
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_DATA_IMPORTS_HOST_GET_PRIVATE (self);
 #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->active_importer = NULL;
 #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2557 "DataImportsPluginHost.c"
+#line 2755 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj) {
+static void
+spit_data_imports_welcome_data_imports_host_finalize (GObject * obj)
+{
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
@@ -2575,11 +2775,13 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj)
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj);
-#line 2571 "DataImportsPluginHost.c"
+#line 2771 "DataImportsPluginHost.c"
 }
 
 
-GType spit_data_imports_welcome_data_imports_host_get_type (void) {
+GType
+spit_data_imports_welcome_data_imports_host_get_type (void)
+{
 	static volatile gsize spit_data_imports_welcome_data_imports_host_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_welcome_data_imports_host_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeDataImportsHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_data_imports_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeDataImportsHost), 0, (GInstanceInitFunc) spit_data_imports_welcome_data_imports_host_instance_init, NULL };
@@ -2593,37 +2795,42 @@ GType spit_data_imports_welcome_data_imports_host_get_type (void) {
 }
 
 
-static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length) {
+static SpitDataImportsImportableLibrary**
+_vala_array_dup21 (SpitDataImportsImportableLibrary** self,
+                   int length)
+{
 	SpitDataImportsImportableLibrary** result;
 	int i;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = g_new0 (SpitDataImportsImportableLibrary*, length + 1);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	for (i = 0; i < length; i++) {
-#line 2596 "DataImportsPluginHost.c"
+#line 2801 "DataImportsPluginHost.c"
 		SpitDataImportsImportableLibrary* _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		result[i] = _tmp0_;
-#line 2602 "DataImportsPluginHost.c"
+#line 2807 "DataImportsPluginHost.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2606 "DataImportsPluginHost.c"
+#line 2811 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
+SpitDataImportsWelcomeImportServiceEntry*
+spit_data_imports_welcome_import_service_entry_construct (GType object_type,
+                                                          SpitDataImportsPluginHost* host,
+                                                          const gchar* pluggable_name,
+                                                          SpitDataImportsImportableLibrary** discovered_libraries,
+                                                          int discovered_libraries_length1)
+{
 	SpitDataImportsWelcomeImportServiceEntry * self = NULL;
 	SpitDataImportsPluginHost* _tmp0_;
-	SpitDataImportsPluginHost* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	SpitDataImportsImportableLibrary** _tmp4_;
-	gint _tmp4__length1;
-	SpitDataImportsImportableLibrary** _tmp5_;
-	gint _tmp5__length1;
+	gchar* _tmp1_;
+	SpitDataImportsImportableLibrary** _tmp2_;
+	gint _tmp2__length1;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2631,51 +2838,50 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = (SpitDataImportsWelcomeImportServiceEntry*) g_object_new (object_type, NULL);
 #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = host;
-#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (host);
 #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->host);
 #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->host = _tmp1_;
-#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = pluggable_name;
+	self->priv->host = _tmp0_;
 #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = g_strdup (_tmp2_);
+	_tmp1_ = g_strdup (pluggable_name);
 #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (self->priv->pluggable_name);
 #line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->pluggable_name = _tmp3_;
+	self->priv->pluggable_name = _tmp1_;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = discovered_libraries;
+	_tmp2_ = (discovered_libraries != NULL) ? _vala_array_dup21 (discovered_libraries, discovered_libraries_length1) : ((gpointer) discovered_libraries);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4__length1 = discovered_libraries_length1;
-#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup21 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
-#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5__length1 = _tmp4__length1;
+	_tmp2__length1 = discovered_libraries_length1;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->discovered_libraries = (_vala_array_free (self->priv->discovered_libraries, self->priv->discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->discovered_libraries = _tmp5_;
+	self->priv->discovered_libraries = _tmp2_;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->discovered_libraries_length1 = _tmp5__length1;
+	self->priv->discovered_libraries_length1 = _tmp2__length1;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2660 "DataImportsPluginHost.c"
+#line 2859 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
+SpitDataImportsWelcomeImportServiceEntry*
+spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host,
+                                                    const gchar* pluggable_name,
+                                                    SpitDataImportsImportableLibrary** discovered_libraries,
+                                                    int discovered_libraries_length1)
+{
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1);
-#line 2667 "DataImportsPluginHost.c"
+#line 2871 "DataImportsPluginHost.c"
 }
 
 
-static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base) {
+static gchar*
+spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base)
+{
 	SpitDataImportsWelcomeImportServiceEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -2690,11 +2896,13 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na
 	result = _tmp1_;
 #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2686 "DataImportsPluginHost.c"
+#line 2892 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base) {
+static void
+spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base)
+{
 	SpitDataImportsWelcomeImportServiceEntry * self;
 	SpitDataImportsImportableLibrary** _tmp0_;
 	gint _tmp0__length1;
@@ -2704,7 +2912,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 	_tmp0_ = self->priv->discovered_libraries;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0__length1 = self->priv->discovered_libraries_length1;
-#line 2700 "DataImportsPluginHost.c"
+#line 2908 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsImportableLibrary** library_collection = NULL;
 		gint library_collection_length1 = 0;
@@ -2716,14 +2924,14 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 		library_collection_length1 = _tmp0__length1;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) {
-#line 2712 "DataImportsPluginHost.c"
+#line 2920 "DataImportsPluginHost.c"
 			SpitDataImportsImportableLibrary* _tmp1_;
 			SpitDataImportsImportableLibrary* library = NULL;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp1_ = _g_object_ref0 (library_collection[library_it]);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			library = _tmp1_;
-#line 2719 "DataImportsPluginHost.c"
+#line 2927 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsPluginHost* _tmp2_;
 				SpitDataImportsDataImporter* _tmp3_;
@@ -2743,43 +2951,51 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 				_g_object_unref0 (_tmp4_);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (library);
-#line 2739 "DataImportsPluginHost.c"
+#line 2947 "DataImportsPluginHost.c"
 			}
 		}
 	}
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataImportsWelcomeImportServiceEntryClass * klass) {
+static void
+spit_data_imports_welcome_import_service_entry_class_init (SpitDataImportsWelcomeImportServiceEntryClass * klass)
+{
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_service_entry_parent_class = g_type_class_peek_parent (klass);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate));
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize;
-#line 2753 "DataImportsPluginHost.c"
+#line 2963 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_welcome_service_entry_interface_init (WelcomeServiceEntryIface * iface) {
+static void
+spit_data_imports_welcome_import_service_entry_welcome_service_entry_interface_init (WelcomeServiceEntryIface * iface)
+{
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_service_entry_welcome_service_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute;
-#line 2764 "DataImportsPluginHost.c"
+#line 2976 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) {
+static void
+spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self)
+{
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self);
-#line 2771 "DataImportsPluginHost.c"
+#line 2985 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj) {
+static void
+spit_data_imports_welcome_import_service_entry_finalize (GObject * obj)
+{
 	SpitDataImportsWelcomeImportServiceEntry * self;
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, SpitDataImportsWelcomeImportServiceEntry);
@@ -2791,11 +3007,13 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject * o
 	_g_object_unref0 (self->priv->host);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj);
-#line 2787 "DataImportsPluginHost.c"
+#line 3003 "DataImportsPluginHost.c"
 }
 
 
-GType spit_data_imports_welcome_import_service_entry_get_type (void) {
+GType
+spit_data_imports_welcome_import_service_entry_get_type (void)
+{
 	static volatile gsize spit_data_imports_welcome_import_service_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_welcome_import_service_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeImportServiceEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_import_service_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeImportServiceEntry), 0, (GInstanceInitFunc) spit_data_imports_welcome_import_service_entry_instance_init, NULL };
@@ -2809,36 +3027,40 @@ GType spit_data_imports_welcome_import_service_entry_get_type (void) {
 }
 
 
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog) {
+SpitDataImportsWelcomeImportMetaHost*
+spit_data_imports_welcome_import_meta_host_construct (GType object_type,
+                                                      WelcomeDialog* dialog)
+{
 	SpitDataImportsWelcomeImportMetaHost * self = NULL;
 	WelcomeDialog* _tmp0_;
-	WelcomeDialog* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (dialog), NULL);
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = (SpitDataImportsWelcomeImportMetaHost*) g_object_new (object_type, NULL);
 #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = dialog;
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (dialog);
 #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (self->priv->dialog);
 #line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	self->priv->dialog = _tmp1_;
+	self->priv->dialog = _tmp0_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2823 "DataImportsPluginHost.c"
+#line 3041 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) {
+SpitDataImportsWelcomeImportMetaHost*
+spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog)
+{
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog);
-#line 2830 "DataImportsPluginHost.c"
+#line 3050 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self) {
+void
+spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self)
+{
 	SpitDataImportsService** services = NULL;
 	gint _tmp0_;
 	SpitDataImportsService** _tmp1_;
@@ -2860,7 +3082,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 	_tmp2_ = services;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2__length1 = services_length1;
-#line 2856 "DataImportsPluginHost.c"
+#line 3078 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2872,14 +3094,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 		service_collection_length1 = _tmp2__length1;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) {
-#line 2868 "DataImportsPluginHost.c"
+#line 3090 "DataImportsPluginHost.c"
 			SpitDataImportsService* _tmp3_;
 			SpitDataImportsService* service = NULL;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp3_ = _g_object_ref0 (service_collection[service_it]);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			service = _tmp3_;
-#line 2875 "DataImportsPluginHost.c"
+#line 3097 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsWelcomeDataImportsHost* host = NULL;
 				SpitDataImportsService* _tmp4_;
@@ -2899,87 +3121,90 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 				_g_object_unref0 (host);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (service);
-#line 2895 "DataImportsPluginHost.c"
+#line 3117 "DataImportsPluginHost.c"
 			}
 		}
 	}
 #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2901 "DataImportsPluginHost.c"
+#line 3123 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self, SpitDataImportsWelcomeDataImportsHost* host) {
-	SpitDataImportsWelcomeDataImportsHost* _tmp0_;
+void
+spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImportsWelcomeImportMetaHost* self,
+                                                            SpitDataImportsWelcomeDataImportsHost* host)
+{
 #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
 #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (host));
 #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = host;
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 2915 "DataImportsPluginHost.c"
+	spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (host, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
+#line 3137 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self, WelcomeServiceEntry* entry) {
-	WelcomeServiceEntry* _tmp0_;
+void
+spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataImportsWelcomeImportMetaHost* self,
+                                                                  WelcomeServiceEntry* entry)
+{
+	gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	WelcomeDialog* _tmp5_;
-	WelcomeServiceEntry* _tmp6_;
+	WelcomeDialog* _tmp4_;
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST (self));
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = entry;
+	_tmp0_ = welcome_service_entry_get_service_name (entry);
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = g_strdup_printf ("WelcomeImportMetaHost: Installing service entry for %s", _tmp2_);
+	_tmp2_ = g_strdup_printf ("WelcomeImportMetaHost: Installing service entry for %s", _tmp1_);
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	g_debug ("DataImportsPluginHost.vala:412: %s", _tmp4_);
+	g_debug ("DataImportsPluginHost.vala:412: %s", _tmp3_);
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = self->priv->dialog;
+	_tmp4_ = self->priv->dialog;
 #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp6_ = entry;
-#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	welcome_dialog_install_service_entry (_tmp5_, _tmp6_);
-#line 2953 "DataImportsPluginHost.c"
+	welcome_dialog_install_service_entry (_tmp4_, entry);
+#line 3172 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImportsWelcomeImportMetaHostClass * klass) {
+static void
+spit_data_imports_welcome_import_meta_host_class_init (SpitDataImportsWelcomeImportMetaHostClass * klass)
+{
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_meta_host_parent_class = g_type_class_peek_parent (klass);
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate));
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize;
-#line 2964 "DataImportsPluginHost.c"
+#line 3185 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) {
+static void
+spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self)
+{
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self);
-#line 2971 "DataImportsPluginHost.c"
+#line 3194 "DataImportsPluginHost.c"
 }
 
 
-static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj) {
+static void
+spit_data_imports_welcome_import_meta_host_finalize (GObject * obj)
+{
 	SpitDataImportsWelcomeImportMetaHost * self;
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost);
@@ -2987,11 +3212,13 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj)
 	_g_object_unref0 (self->priv->dialog);
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj);
-#line 2983 "DataImportsPluginHost.c"
+#line 3208 "DataImportsPluginHost.c"
 }
 
 
-GType spit_data_imports_welcome_import_meta_host_get_type (void) {
+GType
+spit_data_imports_welcome_import_meta_host_get_type (void)
+{
 	static volatile gsize spit_data_imports_welcome_import_meta_host_type_id__volatile = 0;
 	if (g_once_init_enter (&spit_data_imports_welcome_import_meta_host_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SpitDataImportsWelcomeImportMetaHostClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) spit_data_imports_welcome_import_meta_host_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SpitDataImportsWelcomeImportMetaHost), 0, (GInstanceInitFunc) spit_data_imports_welcome_import_meta_host_instance_init, NULL };
@@ -3003,7 +3230,9 @@ GType spit_data_imports_welcome_import_meta_host_get_type (void) {
 }
 
 
-SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1) {
+SpitDataImportsService**
+spit_data_imports_load_all_services (int* result_length1)
+{
 	SpitDataImportsService** result = NULL;
 	gint _tmp0_;
 	SpitDataImportsService** _tmp1_;
@@ -3019,85 +3248,89 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length
 	if (result_length1) {
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*result_length1 = _tmp2__length1;
-#line 3015 "DataImportsPluginHost.c"
+#line 3244 "DataImportsPluginHost.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3021 "DataImportsPluginHost.c"
+#line 3250 "DataImportsPluginHost.c"
 }
 
 
-static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
+static void
+_vala_array_add72 (SpitDataImportsService** * array,
+                   int* length,
+                   int* size,
+                   SpitDataImportsService* value)
+{
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if ((*length) == (*size)) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*array = g_renew (SpitDataImportsService*, *array, (*size) + 1);
-#line 3032 "DataImportsPluginHost.c"
+#line 3266 "DataImportsPluginHost.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[(*length)++] = value;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[*length] = NULL;
-#line 3038 "DataImportsPluginHost.c"
+#line 3272 "DataImportsPluginHost.c"
 }
 
 
-static gint __lambda25_ (void* a, void* b) {
+static gint
+__lambda25_ (void* a,
+             void* b)
+{
 	gint result = 0;
-	void* _tmp0_;
+	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	void* _tmp2_;
-	const gchar* _tmp3_;
-	gint _tmp4_;
-#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = a;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp0_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) a), SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = b;
+	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) b), SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitDataImportsService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	result = _tmp4_;
+	result = utf8_cs_compare (_tmp0_, _tmp1_);
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3063 "DataImportsPluginHost.c"
+#line 3291 "DataImportsPluginHost.c"
 }
 
 
-static gint ___lambda25____compar_fn_t (void* key1, void* key2) {
+static gint
+___lambda25____compar_fn_t (void* key1,
+                            void* key2)
+{
 	gint result;
 	result = __lambda25_ (key1, key2);
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3072 "DataImportsPluginHost.c"
+#line 3303 "DataImportsPluginHost.c"
 }
 
 
-SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1) {
+SpitDataImportsService**
+spit_data_imports_load_services (gboolean load_all,
+                                 int* result_length1)
+{
 	SpitDataImportsService** result = NULL;
 	SpitDataImportsService** loaded_services = NULL;
 	SpitDataImportsService** _tmp0_;
 	gint loaded_services_length1;
 	gint _loaded_services_size_;
 	GeeCollection* pluggables = NULL;
-	gboolean _tmp1_;
+	GeeCollection* _tmp1_;
 	GeeCollection* _tmp2_;
-	GeeCollection* _tmp3_;
+	gint _tmp3_;
 	gint _tmp4_;
-	gint _tmp5_;
-	SpitDataImportsService** _tmp26_;
-	gint _tmp26__length1;
-	SpitDataImportsService** _tmp27_;
-	gint _tmp27__length1;
-	SpitDataImportsService** _tmp28_;
-	gint _tmp28__length1;
+	SpitDataImportsService** _tmp23_;
+	gint _tmp23__length1;
+	SpitDataImportsService** _tmp24_;
+	gint _tmp24__length1;
+	SpitDataImportsService** _tmp25_;
+	gint _tmp25__length1;
 #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0_ = g_new0 (SpitDataImportsService*, 0 + 1);
 #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3107,316 +3340,300 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_loaded_services_size_ = loaded_services_length1;
 #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = load_all;
-#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = plugins_get_pluggables_for_type (SPIT_DATA_IMPORTS_TYPE_SERVICE, NULL, NULL, NULL, _tmp1_);
+	_tmp1_ = plugins_get_pluggables_for_type (SPIT_DATA_IMPORTS_TYPE_SERVICE, NULL, NULL, NULL, load_all);
 #line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	pluggables = _tmp2_;
+	pluggables = _tmp1_;
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = pluggables;
+	_tmp2_ = pluggables;
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp4_ = gee_collection_get_size (_tmp3_);
+	_tmp3_ = gee_collection_get_size (_tmp2_);
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \
-"able data import services.", _tmp5_);
-#line 3116 "DataImportsPluginHost.c"
+"able data import services.", _tmp4_);
+#line 3347 "DataImportsPluginHost.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
-		GeeCollection* _tmp6_;
-		GeeIterator* _tmp7_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp6_ = pluggables;
+		_tmp5_ = pluggables;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_pluggable_it = _tmp7_;
+		_pluggable_it = _tmp6_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		while (TRUE) {
-#line 3129 "DataImportsPluginHost.c"
-			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
+#line 3360 "DataImportsPluginHost.c"
+			GeeIterator* _tmp7_;
 			SpitPluggable* pluggable = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			gint pluggable_interface = 0;
-			SpitPluggable* _tmp12_;
-			gint _tmp13_;
-			gint _tmp14_;
+			SpitPluggable* _tmp10_;
+			gint _tmp11_;
 			SpitDataImportsService* service = NULL;
-			SpitPluggable* _tmp19_;
-			SpitDataImportsService* _tmp20_;
+			SpitPluggable* _tmp16_;
+			SpitDataImportsService* _tmp17_;
+			SpitDataImportsService* _tmp18_;
+			const gchar* _tmp19_;
+			SpitDataImportsService** _tmp20_;
+			gint _tmp20__length1;
 			SpitDataImportsService* _tmp21_;
-			const gchar* _tmp22_;
-			SpitDataImportsService** _tmp23_;
-			gint _tmp23__length1;
-			SpitDataImportsService* _tmp24_;
-			SpitDataImportsService* _tmp25_;
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp8_ = _pluggable_it;
+			SpitDataImportsService* _tmp22_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
+			_tmp7_ = _pluggable_it;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			if (!_tmp9_) {
+			if (!gee_iterator_next (_tmp7_)) {
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				break;
-#line 3156 "DataImportsPluginHost.c"
+#line 3383 "DataImportsPluginHost.c"
 			}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp10_ = _pluggable_it;
+			_tmp8_ = _pluggable_it;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp9_ = gee_iterator_get (_tmp8_);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			pluggable = (SpitPluggable*) _tmp11_;
+			pluggable = (SpitPluggable*) _tmp9_;
 #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp12_ = pluggable;
+			_tmp10_ = pluggable;
 #line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp13_ = spit_pluggable_get_pluggable_interface (_tmp12_, SPIT_DATA_IMPORTS_CURRENT_INTERFACE, SPIT_DATA_IMPORTS_CURRENT_INTERFACE);
-#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			pluggable_interface = _tmp13_;
+			pluggable_interface = spit_pluggable_get_pluggable_interface (_tmp10_, SPIT_DATA_IMPORTS_CURRENT_INTERFACE, SPIT_DATA_IMPORTS_CURRENT_INTERFACE);
 #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp14_ = pluggable_interface;
+			_tmp11_ = pluggable_interface;
 #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) {
-#line 3174 "DataImportsPluginHost.c"
-				SpitPluggable* _tmp15_;
-				gchar* _tmp16_;
-				gchar* _tmp17_;
-				gint _tmp18_;
+			if (_tmp11_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) {
+#line 3399 "DataImportsPluginHost.c"
+				SpitPluggable* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				gint _tmp15_;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp15_ = pluggable;
+				_tmp12_ = pluggable;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp16_ = plugins_get_pluggable_module_id (_tmp15_);
+				_tmp13_ = plugins_get_pluggable_module_id (_tmp12_);
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp17_ = _tmp16_;
+				_tmp14_ = _tmp13_;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp18_ = pluggable_interface;
+				_tmp15_ = pluggable_interface;
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				g_warning ("DataImportsPluginHost.vala:435: Unable to load data import plugin %s: " \
-"reported interface %d.", _tmp17_, _tmp18_);
+"reported interface %d.", _tmp14_, _tmp15_);
 #line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_g_free0 (_tmp17_);
+				_g_free0 (_tmp14_);
 #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (pluggable);
 #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				continue;
-#line 3195 "DataImportsPluginHost.c"
+#line 3420 "DataImportsPluginHost.c"
 			}
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp19_ = pluggable;
+			_tmp16_ = pluggable;
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_DATA_IMPORTS_TYPE_SERVICE, SpitDataImportsService));
+			_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_DATA_IMPORTS_TYPE_SERVICE, SpitDataImportsService));
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			service = _tmp20_;
+			service = _tmp17_;
 #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp21_ = service;
+			_tmp18_ = service;
 #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp22_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+			_tmp19_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			g_debug ("DataImportsPluginHost.vala:444: DataImportsDialog: discovered pluggabl" \
-"e data import service '%s'.", _tmp22_);
+"e data import service '%s'.", _tmp19_);
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp23_ = loaded_services;
+			_tmp20_ = loaded_services;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp23__length1 = loaded_services_length1;
+			_tmp20__length1 = loaded_services_length1;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp24_ = service;
+			_tmp21_ = service;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp25_ = _g_object_ref0 (_tmp24_);
+			_tmp22_ = _g_object_ref0 (_tmp21_);
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
+			_vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (service);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (pluggable);
-#line 3223 "DataImportsPluginHost.c"
+#line 3448 "DataImportsPluginHost.c"
 		}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 3227 "DataImportsPluginHost.c"
+#line 3452 "DataImportsPluginHost.c"
 	}
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp26_ = loaded_services;
+	_tmp23_ = loaded_services;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp26__length1 = loaded_services_length1;
+	_tmp23__length1 = loaded_services_length1;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp27_ = loaded_services;
+	_tmp24_ = loaded_services;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp27__length1 = loaded_services_length1;
+	_tmp24__length1 = loaded_services_length1;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____compar_fn_t);
+	qsort (_tmp23_, (gsize) _tmp24__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____compar_fn_t);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp28_ = loaded_services;
+	_tmp25_ = loaded_services;
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp28__length1 = loaded_services_length1;
+	_tmp25__length1 = loaded_services_length1;
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (result_length1) {
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		*result_length1 = _tmp28__length1;
-#line 3247 "DataImportsPluginHost.c"
+		*result_length1 = _tmp25__length1;
+#line 3472 "DataImportsPluginHost.c"
 	}
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	result = _tmp28_;
+	result = _tmp25_;
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (pluggables);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3255 "DataImportsPluginHost.c"
+#line 3480 "DataImportsPluginHost.c"
 }
 
 
-void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll) {
-	ImportManifest* _tmp0_;
-	GeeList* _tmp1_;
+void
+spit_data_imports_data_import_reporter (ImportManifest* manifest,
+                                        BatchImportRoll* import_roll)
+{
+	GeeList* _tmp0_;
+	gint _tmp1_;
 	gint _tmp2_;
-	gint _tmp3_;
 #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
 #line 462 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = manifest;
-#line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = _tmp0_->all;
+	_tmp0_ = manifest->all;
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	if (_tmp3_ > 0) {
-#line 3278 "DataImportsPluginHost.c"
-		ImportManifest* _tmp4_;
+	if (_tmp2_ > 0) {
+#line 3503 "DataImportsPluginHost.c"
+		ImportManifest* _tmp3_;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp4_ = spit_data_imports_meta_manifest;
+		_tmp3_ = spit_data_imports_meta_manifest;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		if (_tmp4_ == NULL) {
-#line 3284 "DataImportsPluginHost.c"
-			ImportManifest* _tmp5_;
+		if (_tmp3_ == NULL) {
+#line 3509 "DataImportsPluginHost.c"
+			ImportManifest* _tmp4_;
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp5_ = import_manifest_new (NULL, NULL);
+			_tmp4_ = import_manifest_new (NULL, NULL);
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			spit_data_imports_meta_manifest = _tmp5_;
-#line 3292 "DataImportsPluginHost.c"
+			spit_data_imports_meta_manifest = _tmp4_;
+#line 3517 "DataImportsPluginHost.c"
 		}
 		{
 			GeeList* _result_list = NULL;
-			ImportManifest* _tmp6_;
-			GeeList* _tmp7_;
-			GeeList* _tmp8_;
+			GeeList* _tmp5_;
+			GeeList* _tmp6_;
 			gint _result_size = 0;
-			GeeList* _tmp9_;
-			gint _tmp10_;
-			gint _tmp11_;
+			GeeList* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
 			gint _result_index = 0;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp6_ = manifest;
+			_tmp5_ = manifest->all;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp7_ = _tmp6_->all;
+			_tmp6_ = _g_object_ref0 (_tmp5_);
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp8_ = _g_object_ref0 (_tmp7_);
+			_result_list = _tmp6_;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_result_list = _tmp8_;
+			_tmp7_ = _result_list;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp9_ = _result_list;
+			_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp9_ = _tmp8_;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_tmp11_ = _tmp10_;
-#line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_result_size = _tmp11_;
+			_result_size = _tmp9_;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_result_index = -1;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			while (TRUE) {
-#line 3324 "DataImportsPluginHost.c"
+#line 3546 "DataImportsPluginHost.c"
+				gint _tmp10_;
+				gint _tmp11_;
 				gint _tmp12_;
-				gint _tmp13_;
-				gint _tmp14_;
 				BatchImportResult* _result_ = NULL;
-				GeeList* _tmp15_;
-				gint _tmp16_;
-				gpointer _tmp17_;
-				ImportManifest* _tmp18_;
-				BatchImportResult* _tmp19_;
+				GeeList* _tmp13_;
+				gint _tmp14_;
+				gpointer _tmp15_;
+				ImportManifest* _tmp16_;
+				BatchImportResult* _tmp17_;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp12_ = _result_index;
+				_tmp10_ = _result_index;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_result_index = _tmp12_ + 1;
+				_result_index = _tmp10_ + 1;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp13_ = _result_index;
+				_tmp11_ = _result_index;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp14_ = _result_size;
+				_tmp12_ = _result_size;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				if (!(_tmp13_ < _tmp14_)) {
+				if (!(_tmp11_ < _tmp12_)) {
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					break;
-#line 3346 "DataImportsPluginHost.c"
+#line 3568 "DataImportsPluginHost.c"
 				}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp15_ = _result_list;
+				_tmp13_ = _result_list;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp16_ = _result_index;
+				_tmp14_ = _result_index;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
+				_tmp15_ = gee_list_get (_tmp13_, _tmp14_);
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_result_ = (BatchImportResult*) _tmp17_;
+				_result_ = (BatchImportResult*) _tmp15_;
 #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp18_ = spit_data_imports_meta_manifest;
+				_tmp16_ = spit_data_imports_meta_manifest;
 #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				_tmp19_ = _result_;
+				_tmp17_ = _result_;
 #line 467 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-				import_manifest_add_result (_tmp18_, _tmp19_);
+				import_manifest_add_result (_tmp16_, _tmp17_);
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_batch_import_result_unref0 (_result_);
-#line 3364 "DataImportsPluginHost.c"
+#line 3586 "DataImportsPluginHost.c"
 			}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (_result_list);
-#line 3368 "DataImportsPluginHost.c"
+#line 3590 "DataImportsPluginHost.c"
 		}
 	} else {
-		ImportManifest* _tmp20_;
+		ImportManifest* _tmp18_;
 #line 470 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_data_imports_dialog_terminate_instance ();
 #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		_tmp20_ = spit_data_imports_meta_manifest;
+		_tmp18_ = spit_data_imports_meta_manifest;
 #line 471 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-		import_ui_report_manifest (_tmp20_, TRUE, NULL);
+		import_ui_report_manifest (_tmp18_, TRUE, NULL);
 #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_meta_manifest = NULL;
-#line 3382 "DataImportsPluginHost.c"
+#line 3604 "DataImportsPluginHost.c"
 	}
 }
 
 
-gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
+gint64
+spit_data_imports_import_job_comparator (void* a,
+                                         void* b)
+{
 	gint64 result = 0LL;
-	void* _tmp0_;
-	time_t _tmp1_;
-	void* _tmp2_;
-	time_t _tmp3_;
-#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = a;
-#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp1_ = spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) _tmp0_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob));
-#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp2_ = b;
-#line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp3_ = spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) _tmp2_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob));
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	result = (gint64) (_tmp1_ - _tmp3_);
+	result = (gint64) (spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) a, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob)) - spit_data_imports_data_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((SpitDataImportsDataImportJob*) b, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, SpitDataImportsDataImportJob)));
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3405 "DataImportsPluginHost.c"
+#line 3618 "DataImportsPluginHost.c"
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -3428,7 +3645,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index b350abf..6a5ebdf 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.36.6, the Vala compiler
+/* DataImportsUI.c generated by valac 0.40.4, the Vala compiler
  * generated from DataImportsUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -30,6 +31,11 @@
 typedef struct _DataImportsUIConcreteDialogPane DataImportsUIConcreteDialogPane;
 typedef struct _DataImportsUIConcreteDialogPaneClass DataImportsUIConcreteDialogPaneClass;
 typedef struct _DataImportsUIConcreteDialogPanePrivate DataImportsUIConcreteDialogPanePrivate;
+enum  {
+	DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_0_PROPERTY,
+	DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES
+};
+static GParamSpec* data_imports_ui_concrete_dialog_pane_properties[DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE (data_imports_ui_static_message_pane_get_type ())
@@ -42,6 +48,11 @@ typedef struct _DataImportsUIConcreteDialogPanePrivate DataImportsUIConcreteDial
 typedef struct _DataImportsUIStaticMessagePane DataImportsUIStaticMessagePane;
 typedef struct _DataImportsUIStaticMessagePaneClass DataImportsUIStaticMessagePaneClass;
 typedef struct _DataImportsUIStaticMessagePanePrivate DataImportsUIStaticMessagePanePrivate;
+enum  {
+	DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_0_PROPERTY,
+	DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES
+};
+static GParamSpec* data_imports_ui_static_message_pane_properties[DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_NUM_PROPERTIES];
 
 #define DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE (data_imports_ui_library_selection_pane_get_type ())
 #define DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane))
@@ -53,6 +64,11 @@ typedef struct _DataImportsUIStaticMessagePanePrivate DataImportsUIStaticMessage
 typedef struct _DataImportsUILibrarySelectionPane DataImportsUILibrarySelectionPane;
 typedef struct _DataImportsUILibrarySelectionPaneClass DataImportsUILibrarySelectionPaneClass;
 typedef struct _DataImportsUILibrarySelectionPanePrivate DataImportsUILibrarySelectionPanePrivate;
+enum  {
+	DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_0_PROPERTY,
+	DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_NUM_PROPERTIES
+};
+static GParamSpec* data_imports_ui_library_selection_pane_properties[DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _Block11Data Block11Data;
 typedef struct _Block12Data Block12Data;
@@ -67,6 +83,11 @@ typedef struct _Block12Data Block12Data;
 typedef struct _DataImportsUIProgressPane DataImportsUIProgressPane;
 typedef struct _DataImportsUIProgressPaneClass DataImportsUIProgressPaneClass;
 typedef struct _DataImportsUIProgressPanePrivate DataImportsUIProgressPanePrivate;
+enum  {
+	DATA_IMPORTS_UI_PROGRESS_PANE_0_PROPERTY,
+	DATA_IMPORTS_UI_PROGRESS_PANE_NUM_PROPERTIES
+};
+static GParamSpec* data_imports_ui_progress_pane_properties[DATA_IMPORTS_UI_PROGRESS_PANE_NUM_PROPERTIES];
 
 #define DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG (data_imports_ui_data_imports_dialog_get_type ())
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog))
@@ -98,6 +119,11 @@ typedef struct _PluginsStandardHostInterfaceClass PluginsStandardHostInterfaceCl
 
 typedef struct _SpitDataImportsConcreteDataImportsHost SpitDataImportsConcreteDataImportsHost;
 typedef struct _SpitDataImportsConcreteDataImportsHostClass SpitDataImportsConcreteDataImportsHostClass;
+enum  {
+	DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_0_PROPERTY,
+	DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* data_imports_ui_data_imports_dialog_properties[DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_NUM_PROPERTIES];
 
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
@@ -224,9 +250,6 @@ static DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_insta
 " in the Preferences dialog.")
 GType data_imports_ui_concrete_dialog_pane_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPanePrivate))
-enum  {
-	DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_DUMMY_PROPERTY
-};
 DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void);
 DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type);
 static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base);
@@ -235,52 +258,65 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDat
 static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base);
 static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj);
 GType data_imports_ui_static_message_pane_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_UI_STATIC_MESSAGE_PANE_DUMMY_PROPERTY
-};
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string);
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string);
+DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type,
+                                                                               const gchar* message_string);
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg);
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg);
+DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type,
+                                                                                          const gchar* msg);
 GType data_imports_ui_library_selection_pane_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPanePrivate))
-enum  {
-	DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_DUMMY_PROPERTY
-};
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
-static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file);
-static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right);
+DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host,
+                                                                               const gchar* welcome_message,
+                                                                               SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                               int discovered_libraries_length1,
+                                                                               const gchar* file_select_label);
+DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type,
+                                                                                     SpitDataImportsPluginHost* host,
+                                                                                     const gchar* welcome_message,
+                                                                                     SpitDataImportsImportableLibrary** discovered_libraries,
+                                                                                     int discovered_libraries_length1,
+                                                                                     const gchar* file_select_label);
+static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self,
+                                                              GFile* file);
+static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self,
+                                                                            GtkBox* box,
+                                                                            GtkRadioButton* group,
+                                                                            SpitDataImportsImportableLibrary* library,
+                                                                            const gchar* label,
+                                                                            gint margin_left,
+                                                                            gint margin_right);
 static Block11Data* block11_data_ref (Block11Data* _data11_);
 static void block11_data_unref (void * _userdata_);
 static void ___lambda23_ (Block11Data* _data11_);
 static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender,
+                                                       gpointer self);
 static void __lambda24_ (DataImportsUILibrarySelectionPane* self);
-static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self,
+                                                                 SpitDataImportsImportableLibrary* library);
+static void ___lambda24__gtk_button_clicked (GtkButton* _sender,
+                                      gpointer self);
 static Block12Data* block12_data_ref (Block12Data* _data12_);
 static void block12_data_unref (void * _userdata_);
 static void __lambda22_ (Block12Data* _data12_);
-static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender,
+                                             gpointer self);
 static void data_imports_ui_library_selection_pane_finalize (GObject * obj);
 GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate))
-enum  {
-	DATA_IMPORTS_UI_PROGRESS_PANE_DUMMY_PROPERTY
-};
 DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message);
-DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message);
-void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message);
+DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type,
+                                                                    const gchar* message);
+void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self,
+                                                    gdouble progress,
+                                                    const gchar* progress_message);
 void spin_event_loop (void);
 static void data_imports_ui_progress_pane_finalize (GObject * obj);
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 GType spit_data_imports_concrete_data_imports_host_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialogPrivate))
-enum  {
-	DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_DUMMY_PROPERTY
-};
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH 860
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT 688
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH 1024
@@ -294,27 +330,38 @@ enum  {
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void);
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type);
 gint resources_use_header_bar (void);
-static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt);
-static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
+static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self,
+                                                              GdkEventAny* evt);
+static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender,
+                                                                                       GdkEventAny* event,
+                                                                                       gpointer self);
+SpitDataImportsService** spit_data_imports_load_services (gboolean load_all,
+                                                          int* result_length1);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self);
 static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self);
-static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                    gpointer self);
 static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self);
-static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                      gpointer self);
 static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self);
-void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane);
+void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self,
+                                                       SpitDataImportsDialogPane* pane);
 void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self);
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void);
 void data_imports_ui_data_imports_dialog_terminate_instance (void);
 static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self);
 SpitDataImportsService** spit_data_imports_load_all_services (int* result_length1);
-void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name);
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog);
-SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type, SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog);
+void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self,
+                                                             const gchar* service_name);
+SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service,
+                                                                                          DataImportsUIDataImportsDialog* dialog);
+SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_construct (GType object_type,
+                                                                                                SpitDataImportsService* service,
+                                                                                                DataImportsUIDataImportsDialog* dialog);
 static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self);
 static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self);
 static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self);
@@ -324,11 +371,17 @@ void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDa
 void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self);
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self);
 static void data_imports_ui_data_imports_dialog_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 
 
-DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct (GType object_type) {
+DataImportsUIConcreteDialogPane*
+data_imports_ui_concrete_dialog_pane_construct (GType object_type)
+{
 	DataImportsUIConcreteDialogPane * self = NULL;
 	GtkBox* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -343,25 +396,31 @@ DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct
 	self->priv->pane_widget = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 343 "DataImportsUI.c"
+#line 396 "DataImportsUI.c"
 }
 
 
-DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void) {
+DataImportsUIConcreteDialogPane*
+data_imports_ui_concrete_dialog_pane_new (void)
+{
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_concrete_dialog_pane_construct (DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 350 "DataImportsUI.c"
+#line 405 "DataImportsUI.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 357 "DataImportsUI.c"
+#line 414 "DataImportsUI.c"
 }
 
 
-static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base) {
+static GtkWidget*
+data_imports_ui_concrete_dialog_pane_real_get_widget (SpitDataImportsDialogPane* base)
+{
 	DataImportsUIConcreteDialogPane * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -376,11 +435,13 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData
 	result = _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 376 "DataImportsUI.c"
+#line 435 "DataImportsUI.c"
 }
 
 
-static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base) {
+static SpitDataImportsDialogPaneGeometryOptions
+data_imports_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitDataImportsDialogPane* base)
+{
 	DataImportsUIConcreteDialogPane * self;
 	SpitDataImportsDialogPaneGeometryOptions result = 0;
 #line 23 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -389,38 +450,46 @@ static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_
 	result = SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 389 "DataImportsUI.c"
+#line 450 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base) {
+static void
+data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDataImportsDialogPane* base)
+{
 	DataImportsUIConcreteDialogPane * self;
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
-#line 397 "DataImportsUI.c"
+#line 460 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base) {
+static void
+data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitDataImportsDialogPane* base)
+{
 	DataImportsUIConcreteDialogPane * self;
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
-#line 405 "DataImportsUI.c"
+#line 470 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcreteDialogPaneClass * klass) {
+static void
+data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcreteDialogPaneClass * klass)
+{
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_type_class_add_private (klass, sizeof (DataImportsUIConcreteDialogPanePrivate));
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_concrete_dialog_pane_finalize;
-#line 416 "DataImportsUI.c"
+#line 483 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_interface_init (SpitDataImportsDialogPaneIface * iface) {
+static void
+data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_interface_init (SpitDataImportsDialogPaneIface * iface)
+{
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -431,18 +500,22 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i
 	iface->on_pane_installed = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 431 "DataImportsUI.c"
+#line 500 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self) {
+static void
+data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self)
+{
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE (self);
-#line 438 "DataImportsUI.c"
+#line 509 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
+static void
+data_imports_ui_concrete_dialog_pane_finalize (GObject * obj)
+{
 	DataImportsUIConcreteDialogPane * self;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
@@ -450,11 +523,13 @@ static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->pane_widget);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 450 "DataImportsUI.c"
+#line 523 "DataImportsUI.c"
 }
 
 
-GType data_imports_ui_concrete_dialog_pane_get_type (void) {
+GType
+data_imports_ui_concrete_dialog_pane_get_type (void)
+{
 	static volatile gsize data_imports_ui_concrete_dialog_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&data_imports_ui_concrete_dialog_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIConcreteDialogPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_concrete_dialog_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIConcreteDialogPane), 0, (GInstanceInitFunc) data_imports_ui_concrete_dialog_pane_instance_init, NULL };
@@ -468,65 +543,69 @@ GType data_imports_ui_concrete_dialog_pane_get_type (void) {
 }
 
 
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (GType object_type, const gchar* message_string) {
+DataImportsUIStaticMessagePane*
+data_imports_ui_static_message_pane_construct (GType object_type,
+                                               const gchar* message_string)
+{
 	DataImportsUIStaticMessagePane * self = NULL;
 	GtkLabel* message_label = NULL;
-	const gchar* _tmp0_;
-	GtkLabel* _tmp1_;
-	GtkWidget* _tmp2_;
+	GtkLabel* _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkBox* _tmp2_;
 	GtkBox* _tmp3_;
-	GtkBox* _tmp4_;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (message_string != NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = (DataImportsUIStaticMessagePane*) data_imports_ui_concrete_dialog_pane_construct (object_type);
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp0_ = message_string;
-#line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_);
+	_tmp0_ = (GtkLabel*) gtk_label_new (message_string);
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 36 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	message_label = _tmp1_;
+	message_label = _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	_tmp1_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_box_get_type ()) ? ((GtkBox*) _tmp1_) : NULL;
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp2_);
-#line 496 "DataImportsUI.c"
+		_g_object_unref0 (_tmp1_);
+#line 571 "DataImportsUI.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (message_label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (message_label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (message_label);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 508 "DataImportsUI.c"
+#line 583 "DataImportsUI.c"
 }
 
 
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string) {
+DataImportsUIStaticMessagePane*
+data_imports_ui_static_message_pane_new (const gchar* message_string)
+{
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_static_message_pane_construct (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, message_string);
-#line 515 "DataImportsUI.c"
+#line 592 "DataImportsUI.c"
 }
 
 
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_with_pango (GType object_type, const gchar* msg) {
+DataImportsUIStaticMessagePane*
+data_imports_ui_static_message_pane_construct_with_pango (GType object_type,
+                                                          const gchar* msg)
+{
 	DataImportsUIStaticMessagePane * self = NULL;
 	GtkLabel* label = NULL;
 	GtkLabel* _tmp0_;
-	const gchar* _tmp1_;
-	GtkWidget* _tmp2_;
+	GtkWidget* _tmp1_;
+	GtkBox* _tmp2_;
 	GtkBox* _tmp3_;
-	GtkBox* _tmp4_;
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (msg != NULL, NULL);
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -538,54 +617,60 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi
 #line 41 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	label = _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = msg;
-#line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_label_set_markup (label, _tmp1_);
+	gtk_label_set_markup (label, msg);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_label_set_line_wrap (label, TRUE);
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	_tmp1_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_box_get_type ()) ? ((GtkBox*) _tmp1_) : NULL;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp2_);
-#line 551 "DataImportsUI.c"
+		_g_object_unref0 (_tmp1_);
+#line 628 "DataImportsUI.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (label, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (label);
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 563 "DataImportsUI.c"
+#line 640 "DataImportsUI.c"
 }
 
 
-DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg) {
+DataImportsUIStaticMessagePane*
+data_imports_ui_static_message_pane_new_with_pango (const gchar* msg)
+{
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_static_message_pane_construct_with_pango (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, msg);
-#line 570 "DataImportsUI.c"
+#line 649 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass) {
+static void
+data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass)
+{
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass);
-#line 577 "DataImportsUI.c"
+#line 658 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_static_message_pane_instance_init (DataImportsUIStaticMessagePane * self) {
+static void
+data_imports_ui_static_message_pane_instance_init (DataImportsUIStaticMessagePane * self)
+{
 }
 
 
-GType data_imports_ui_static_message_pane_get_type (void) {
+GType
+data_imports_ui_static_message_pane_get_type (void)
+{
 	static volatile gsize data_imports_ui_static_message_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&data_imports_ui_static_message_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIStaticMessagePaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_static_message_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIStaticMessagePane), 0, (GInstanceInitFunc) data_imports_ui_static_message_pane_instance_init, NULL };
@@ -597,21 +682,25 @@ GType data_imports_ui_static_message_pane_get_type (void) {
 }
 
 
-static Block11Data* block11_data_ref (Block11Data* _data11_) {
+static Block11Data*
+block11_data_ref (Block11Data* _data11_)
+{
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_atomic_int_inc (&_data11_->_ref_count_);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return _data11_;
-#line 602 "DataImportsUI.c"
+#line 689 "DataImportsUI.c"
 }
 
 
-static void block11_data_unref (void * _userdata_) {
+static void
+block11_data_unref (void * _userdata_)
+{
 	Block11Data* _data11_;
 	_data11_ = (Block11Data*) _userdata_;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) {
-#line 611 "DataImportsUI.c"
+#line 700 "DataImportsUI.c"
 		DataImportsUILibrarySelectionPane* self;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self = _data11_->self;
@@ -621,12 +710,14 @@ static void block11_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_slice_free (Block11Data, _data11_);
-#line 621 "DataImportsUI.c"
+#line 710 "DataImportsUI.c"
 	}
 }
 
 
-static void ___lambda23_ (Block11Data* _data11_) {
+static void
+___lambda23_ (Block11Data* _data11_)
+{
 	DataImportsUILibrarySelectionPane* self;
 	GtkFileChooserButton* _tmp0_;
 	GFile* _tmp1_;
@@ -636,7 +727,7 @@ static void ___lambda23_ (Block11Data* _data11_) {
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = _data11_->file_chooser;
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+	_tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_file_chooser_get_type (), GtkFileChooser));
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->selected_file);
 #line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -645,108 +736,116 @@ static void ___lambda23_ (Block11Data* _data11_) {
 	_tmp2_ = self->priv->file_radio;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_ != NULL) {
-#line 645 "DataImportsUI.c"
+#line 736 "DataImportsUI.c"
 		GtkRadioButton* _tmp3_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->file_radio;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 651 "DataImportsUI.c"
+#line 742 "DataImportsUI.c"
 	}
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 655 "DataImportsUI.c"
+#line 746 "DataImportsUI.c"
 }
 
 
-static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void
+____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender,
+                                                  gpointer self)
+{
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	___lambda23_ (self);
-#line 662 "DataImportsUI.c"
+#line 756 "DataImportsUI.c"
 }
 
 
-static void __lambda24_ (DataImportsUILibrarySelectionPane* self) {
+static void
+__lambda24_ (DataImportsUILibrarySelectionPane* self)
+{
 	SpitDataImportsImportableLibrary* _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->selected_library;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 672 "DataImportsUI.c"
+#line 768 "DataImportsUI.c"
 		SpitDataImportsImportableLibrary* _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->selected_library;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_on_library_selected (self, _tmp1_);
-#line 678 "DataImportsUI.c"
+#line 774 "DataImportsUI.c"
 	} else {
 		GFile* _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if (_tmp2_ != NULL) {
-#line 685 "DataImportsUI.c"
+#line 781 "DataImportsUI.c"
 			GFile* _tmp3_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp3_ = self->priv->selected_file;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_library_selection_pane_on_file_selected (self, _tmp3_);
-#line 691 "DataImportsUI.c"
+#line 787 "DataImportsUI.c"
 		} else {
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			g_debug ("DataImportsUI.vala:119: LibrarySelectionPane: Library or file should b" \
 "e selected.");
-#line 695 "DataImportsUI.c"
+#line 791 "DataImportsUI.c"
 		}
 	}
 }
 
 
-static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+___lambda24__gtk_button_clicked (GtkButton* _sender,
+                                 gpointer self)
+{
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	__lambda24_ ((DataImportsUILibrarySelectionPane*) self);
-#line 704 "DataImportsUI.c"
+#line 803 "DataImportsUI.c"
 }
 
 
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
+DataImportsUILibrarySelectionPane*
+data_imports_ui_library_selection_pane_construct (GType object_type,
+                                                  SpitDataImportsPluginHost* host,
+                                                  const gchar* welcome_message,
+                                                  SpitDataImportsImportableLibrary** discovered_libraries,
+                                                  int discovered_libraries_length1,
+                                                  const gchar* file_select_label)
+{
 	DataImportsUILibrarySelectionPane * self = NULL;
 	gboolean _tmp0_ = FALSE;
-	SpitDataImportsImportableLibrary** _tmp1_;
-	gint _tmp1__length1;
-	SpitDataImportsPluginHost* _tmp2_;
 	GtkBox* content_box = NULL;
+	GtkBox* _tmp1_;
+	GtkBox* _tmp2_;
 	GtkBox* _tmp3_;
-	GtkBox* _tmp4_;
-	GtkBox* _tmp5_;
 	GtkLabel* welcome_label = NULL;
+	GtkLabel* _tmp4_;
+	GtkLabel* _tmp5_;
 	GtkLabel* _tmp6_;
 	GtkLabel* _tmp7_;
-	const gchar* _tmp8_;
+	GtkBox* _tmp8_;
 	GtkLabel* _tmp9_;
-	GtkLabel* _tmp10_;
-	GtkBox* _tmp11_;
-	GtkLabel* _tmp12_;
 	gint radio_margin_left = 0;
 	gint radio_margin_right = 0;
 	gint chooser_margin_left = 0;
-	gint _tmp13_;
+	gint _tmp10_;
 	gint chooser_margin_right = 0;
-	gint _tmp14_;
+	gint _tmp11_;
 	GtkRadioButton* lib_radio = NULL;
-	SpitDataImportsImportableLibrary** _tmp15_;
-	gint _tmp15__length1;
-	const gchar* _tmp37_;
-	GtkButton* _tmp46_;
-	GtkButton* _tmp47_;
+	GtkButton* _tmp38_;
+	GtkButton* _tmp39_;
 	GtkButtonBox* button_box = NULL;
-	GtkButtonBox* _tmp48_;
-	GtkButton* _tmp49_;
-	GtkBox* _tmp50_;
-	GtkWidget* _tmp51_;
-	GtkBox* _tmp52_;
-	GtkBox* _tmp53_;
-	GtkBox* _tmp54_;
+	GtkButtonBox* _tmp40_;
+	GtkButton* _tmp41_;
+	GtkBox* _tmp42_;
+	GtkWidget* _tmp43_;
+	GtkBox* _tmp44_;
+	GtkBox* _tmp45_;
+	GtkBox* _tmp46_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -754,215 +853,189 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = (DataImportsUILibrarySelectionPane*) data_imports_ui_concrete_dialog_pane_construct (object_type);
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = discovered_libraries;
-#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1__length1 = discovered_libraries_length1;
-#line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp1__length1 > 0) {
+	if (discovered_libraries_length1 > 0) {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 760 "DataImportsUI.c"
+#line 855 "DataImportsUI.c"
 	} else {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = data_imports_ui_library_selection_pane_on_file_selected != NULL;
-#line 764 "DataImportsUI.c"
+#line 859 "DataImportsUI.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null");
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = host;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->host = _tmp2_;
+	self->priv->host = host;
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp1_);
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	content_box = _tmp3_;
+	content_box = _tmp1_;
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = content_box;
+	_tmp2_ = content_box;
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 30);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), 30);
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = content_box;
+	_tmp3_ = content_box;
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 30);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 30);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp6_ = (GtkLabel*) gtk_label_new (NULL);
+	_tmp4_ = (GtkLabel*) gtk_label_new (NULL);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp4_);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	welcome_label = _tmp6_;
-#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp7_ = welcome_label;
+	welcome_label = _tmp4_;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp8_ = welcome_message;
+	_tmp5_ = welcome_label;
 #line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_label_set_markup (_tmp7_, _tmp8_);
+	gtk_label_set_markup (_tmp5_, welcome_message);
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = welcome_label;
+	_tmp6_ = welcome_label;
 #line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_label_set_line_wrap (_tmp9_, TRUE);
+	gtk_label_set_line_wrap (_tmp6_, TRUE);
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10_ = welcome_label;
+	_tmp7_ = welcome_label;
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp11_ = content_box;
+	_tmp8_ = content_box;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp12_ = welcome_label;
+	_tmp9_ = welcome_label;
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6);
+	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	radio_margin_left = 20;
 #line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	radio_margin_right = 20;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp13_ = radio_margin_left;
+	_tmp10_ = radio_margin_left;
 #line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	chooser_margin_left = _tmp13_;
+	chooser_margin_left = _tmp10_;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp14_ = radio_margin_right;
+	_tmp11_ = radio_margin_right;
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	chooser_margin_right = _tmp14_;
+	chooser_margin_right = _tmp11_;
 #line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	lib_radio = NULL;
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp15_ = discovered_libraries;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp15__length1 = discovered_libraries_length1;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp15__length1 > 0) {
-#line 832 "DataImportsUI.c"
-		gint _tmp16_;
-		SpitDataImportsImportableLibrary** _tmp17_;
-		gint _tmp17__length1;
-		const gchar* _tmp28_;
+	if (discovered_libraries_length1 > 0) {
+#line 919 "DataImportsUI.c"
+		gint _tmp12_;
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp16_ = radio_margin_left;
+		_tmp12_ = radio_margin_left;
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		chooser_margin_left = _tmp16_ + 20;
-#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp17_ = discovered_libraries;
-#line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp17__length1 = discovered_libraries_length1;
-#line 845 "DataImportsUI.c"
+		chooser_margin_left = _tmp12_ + 20;
+#line 925 "DataImportsUI.c"
 		{
 			SpitDataImportsImportableLibrary** library_collection = NULL;
 			gint library_collection_length1 = 0;
 			gint _library_collection_size_ = 0;
 			gint library_it = 0;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			library_collection = _tmp17_;
+			library_collection = discovered_libraries;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			library_collection_length1 = _tmp17__length1;
+			library_collection_length1 = discovered_libraries_length1;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			for (library_it = 0; library_it < _tmp17__length1; library_it = library_it + 1) {
-#line 857 "DataImportsUI.c"
-				SpitDataImportsImportableLibrary* _tmp18_;
+			for (library_it = 0; library_it < discovered_libraries_length1; library_it = library_it + 1) {
+#line 937 "DataImportsUI.c"
+				SpitDataImportsImportableLibrary* _tmp13_;
 				SpitDataImportsImportableLibrary* library = NULL;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				_tmp18_ = _g_object_ref0 (library_collection[library_it]);
+				_tmp13_ = _g_object_ref0 (library_collection[library_it]);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				library = _tmp18_;
-#line 864 "DataImportsUI.c"
+				library = _tmp13_;
+#line 944 "DataImportsUI.c"
 				{
 					gchar* lib_radio_label = NULL;
-					SpitDataImportsImportableLibrary* _tmp19_;
-					gchar* _tmp20_;
-					GtkBox* _tmp21_;
+					SpitDataImportsImportableLibrary* _tmp14_;
+					gchar* _tmp15_;
+					GtkBox* _tmp16_;
+					GtkRadioButton* _tmp17_;
+					SpitDataImportsImportableLibrary* _tmp18_;
+					const gchar* _tmp19_;
+					gint _tmp20_;
+					gint _tmp21_;
 					GtkRadioButton* _tmp22_;
-					SpitDataImportsImportableLibrary* _tmp23_;
-					const gchar* _tmp24_;
-					gint _tmp25_;
-					gint _tmp26_;
-					GtkRadioButton* _tmp27_;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp19_ = library;
+					_tmp14_ = library;
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp20_ = spit_data_imports_importable_library_get_display_name (_tmp19_);
+					_tmp15_ = spit_data_imports_importable_library_get_display_name (_tmp14_);
 #line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					lib_radio_label = _tmp20_;
+					lib_radio_label = _tmp15_;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp21_ = content_box;
+					_tmp16_ = content_box;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp22_ = lib_radio;
+					_tmp17_ = lib_radio;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp23_ = library;
+					_tmp18_ = library;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp24_ = lib_radio_label;
+					_tmp19_ = lib_radio_label;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp25_ = radio_margin_left;
+					_tmp20_ = radio_margin_left;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp26_ = radio_margin_right;
+					_tmp21_ = radio_margin_right;
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp27_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp21_, _tmp22_, _tmp23_, _tmp24_, _tmp25_, _tmp26_);
+					_tmp22_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp16_, _tmp17_, _tmp18_, _tmp19_, _tmp20_, _tmp21_);
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (lib_radio);
 #line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					lib_radio = _tmp27_;
+					lib_radio = _tmp22_;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_free0 (lib_radio_label);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (library);
-#line 904 "DataImportsUI.c"
+#line 984 "DataImportsUI.c"
 				}
 			}
 		}
 #line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp28_ = file_select_label;
-#line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp28_ != NULL) {
-#line 912 "DataImportsUI.c"
-			GtkBox* _tmp29_;
-			GtkRadioButton* _tmp30_;
-			const gchar* _tmp31_;
-			gint _tmp32_;
-			gint _tmp33_;
-			GtkRadioButton* _tmp34_;
-			GtkRadioButton* _tmp35_;
-			GtkRadioButton* _tmp36_;
-#line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp29_ = content_box;
+		if (file_select_label != NULL) {
+#line 990 "DataImportsUI.c"
+			GtkBox* _tmp23_;
+			GtkRadioButton* _tmp24_;
+			gint _tmp25_;
+			gint _tmp26_;
+			GtkRadioButton* _tmp27_;
+			GtkRadioButton* _tmp28_;
+			GtkRadioButton* _tmp29_;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp30_ = lib_radio;
+			_tmp23_ = content_box;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp31_ = file_select_label;
+			_tmp24_ = lib_radio;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp32_ = radio_margin_left;
+			_tmp25_ = radio_margin_left;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp33_ = radio_margin_right;
+			_tmp26_ = radio_margin_right;
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp34_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp29_, _tmp30_, NULL, _tmp31_, _tmp32_, _tmp33_);
+			_tmp27_ = data_imports_ui_library_selection_pane_create_radio_button (self, _tmp23_, _tmp24_, NULL, file_select_label, _tmp25_, _tmp26_);
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (lib_radio);
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			lib_radio = _tmp34_;
+			lib_radio = _tmp27_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp35_ = lib_radio;
+			_tmp28_ = lib_radio;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp36_ = _g_object_ref0 (_tmp35_);
+			_tmp29_ = _g_object_ref0 (_tmp28_);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (self->priv->file_radio);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			self->priv->file_radio = _tmp36_;
-#line 945 "DataImportsUI.c"
+			self->priv->file_radio = _tmp29_;
+#line 1020 "DataImportsUI.c"
 		}
 	}
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp37_ = file_select_label;
-#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp37_ != NULL) {
-#line 952 "DataImportsUI.c"
+	if (file_select_label != NULL) {
+#line 1025 "DataImportsUI.c"
 		Block11Data* _data11_;
-		GtkFileChooserButton* _tmp38_;
-		GtkFileChooserButton* _tmp39_;
-		GtkFileChooserButton* _tmp40_;
-		gint _tmp41_;
-		GtkFileChooserButton* _tmp42_;
-		gint _tmp43_;
-		GtkBox* _tmp44_;
-		GtkFileChooserButton* _tmp45_;
+		GtkFileChooserButton* _tmp30_;
+		GtkFileChooserButton* _tmp31_;
+		GtkFileChooserButton* _tmp32_;
+		gint _tmp33_;
+		GtkFileChooserButton* _tmp34_;
+		gint _tmp35_;
+		GtkBox* _tmp36_;
+		GtkFileChooserButton* _tmp37_;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_ = g_slice_new0 (Block11Data);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -970,85 +1043,85 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_->self = g_object_ref (self);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp38_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN);
+		_tmp30_ = (GtkFileChooserButton*) gtk_file_chooser_button_new (_ ("Database file:"), GTK_FILE_CHOOSER_ACTION_OPEN);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp38_);
+		g_object_ref_sink (_tmp30_);
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_data11_->file_chooser = _tmp38_;
+		_data11_->file_chooser = _tmp30_;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp39_ = _data11_->file_chooser;
+		_tmp31_ = _data11_->file_chooser;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda23__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
+		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_file_chooser_get_type (), GtkFileChooser), "selection-changed", (GCallback) ____lambda23__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp40_ = _data11_->file_chooser;
+		_tmp32_ = _data11_->file_chooser;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp41_ = chooser_margin_left;
+		_tmp33_ = chooser_margin_left;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp41_);
+		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), _tmp33_);
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp42_ = _data11_->file_chooser;
+		_tmp34_ = _data11_->file_chooser;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp43_ = chooser_margin_right;
+		_tmp35_ = chooser_margin_right;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp43_);
+		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), _tmp35_);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp44_ = content_box;
+		_tmp36_ = content_box;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp45_ = _data11_->file_chooser;
+		_tmp37_ = _data11_->file_chooser;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+		gtk_box_pack_start (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		block11_data_unref (_data11_);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_ = NULL;
-#line 1000 "DataImportsUI.c"
+#line 1073 "DataImportsUI.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
+	_tmp38_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp46_);
+	g_object_ref_sink (_tmp38_);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->import_button);
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->import_button = _tmp46_;
+	self->priv->import_button = _tmp38_;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp47_ = self->priv->import_button;
+	_tmp39_ = self->priv->import_button;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp39_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+	_tmp40_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp48_);
+	g_object_ref_sink (_tmp40_);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	button_box = _tmp48_;
+	button_box = _tmp40_;
 #line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_object_set (button_box, "layout-style", GTK_BUTTONBOX_CENTER, NULL);
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp49_ = self->priv->import_button;
+	_tmp41_ = self->priv->import_button;
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
 #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp50_ = content_box;
+	_tmp42_ = content_box;
 #line 124 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_end (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
+	gtk_box_pack_end (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (button_box, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 6);
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp51_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	_tmp43_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp52_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_box_get_type ()) ? ((GtkBox*) _tmp51_) : NULL;
+	_tmp44_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_box_get_type ()) ? ((GtkBox*) _tmp43_) : NULL;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp52_ == NULL) {
+	if (_tmp44_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp51_);
-#line 1038 "DataImportsUI.c"
+		_g_object_unref0 (_tmp43_);
+#line 1111 "DataImportsUI.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp53_ = _tmp52_;
+	_tmp45_ = _tmp44_;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp54_ = content_box;
+	_tmp46_ = content_box;
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp53_);
+	_g_object_unref0 (_tmp45_);
 #line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1061,32 +1134,42 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	_g_object_unref0 (content_box);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1060 "DataImportsUI.c"
+#line 1133 "DataImportsUI.c"
 }
 
 
-DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
+DataImportsUILibrarySelectionPane*
+data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host,
+                                            const gchar* welcome_message,
+                                            SpitDataImportsImportableLibrary** discovered_libraries,
+                                            int discovered_libraries_length1,
+                                            const gchar* file_select_label)
+{
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_library_selection_pane_construct (DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, host, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
-#line 1067 "DataImportsUI.c"
+#line 1146 "DataImportsUI.c"
 }
 
 
-static Block12Data* block12_data_ref (Block12Data* _data12_) {
+static Block12Data*
+block12_data_ref (Block12Data* _data12_)
+{
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_atomic_int_inc (&_data12_->_ref_count_);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return _data12_;
-#line 1076 "DataImportsUI.c"
+#line 1157 "DataImportsUI.c"
 }
 
 
-static void block12_data_unref (void * _userdata_) {
+static void
+block12_data_unref (void * _userdata_)
+{
 	Block12Data* _data12_;
 	_data12_ = (Block12Data*) _userdata_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) {
-#line 1085 "DataImportsUI.c"
+#line 1168 "DataImportsUI.c"
 		DataImportsUILibrarySelectionPane* self;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self = _data12_->self;
@@ -1098,12 +1181,14 @@ static void block12_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_slice_free (Block12Data, _data12_);
-#line 1097 "DataImportsUI.c"
+#line 1180 "DataImportsUI.c"
 	}
 }
 
 
-static void __lambda22_ (Block12Data* _data12_) {
+static void
+__lambda22_ (Block12Data* _data12_)
+{
 	DataImportsUILibrarySelectionPane* self;
 	GtkRadioButton* _tmp0_;
 	gboolean _tmp1_;
@@ -1118,49 +1203,50 @@ static void __lambda22_ (Block12Data* _data12_) {
 	_tmp2_ = _tmp1_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_) {
-#line 1117 "DataImportsUI.c"
+#line 1202 "DataImportsUI.c"
 		SpitDataImportsImportableLibrary* _tmp3_;
-		SpitDataImportsImportableLibrary* _tmp4_;
-#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp3_ = _data12_->library;
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp4_ = _g_object_ref0 (_tmp3_);
+		_tmp3_ = _g_object_ref0 (_data12_->library);
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->selected_library);
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->selected_library = _tmp4_;
+		self->priv->selected_library = _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 1130 "DataImportsUI.c"
+#line 1212 "DataImportsUI.c"
 	}
 }
 
 
-static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void
+___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender,
+                                        gpointer self)
+{
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	__lambda22_ (self);
-#line 1138 "DataImportsUI.c"
+#line 1223 "DataImportsUI.c"
 }
 
 
-static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) {
+static GtkRadioButton*
+data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self,
+                                                            GtkBox* box,
+                                                            GtkRadioButton* group,
+                                                            SpitDataImportsImportableLibrary* library,
+                                                            const gchar* label,
+                                                            gint margin_left,
+                                                            gint margin_right)
+{
 	GtkRadioButton* result = NULL;
 	Block12Data* _data12_;
 	SpitDataImportsImportableLibrary* _tmp0_;
-	SpitDataImportsImportableLibrary* _tmp1_;
-	GtkRadioButton* _tmp2_;
-	const gchar* _tmp3_;
+	GtkRadioButton* _tmp1_;
 	GtkRadioButton* _tmp4_;
 	GtkRadioButton* _tmp5_;
+	GtkRadioButton* _tmp6_;
+	GtkRadioButton* _tmp7_;
+	GtkRadioButton* _tmp8_;
 	GtkRadioButton* _tmp9_;
-	GtkRadioButton* _tmp10_;
-	gint _tmp11_;
-	GtkRadioButton* _tmp12_;
-	gint _tmp13_;
-	GtkBox* _tmp14_;
-	GtkRadioButton* _tmp15_;
-	GtkRadioButton* _tmp16_;
-	GtkRadioButton* _tmp17_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self), NULL);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1178,84 +1264,69 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_data12_->self = g_object_ref (self);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp0_ = library;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (library);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_data12_->library);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_data12_->library = _tmp1_;
-#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = group;
+	_data12_->library = _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = label;
+	_tmp1_ = (GtkRadioButton*) gtk_radio_button_new_with_label_from_widget (group, label);
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = (GtkRadioButton*) gtk_radio_button_new_with_label_from_widget (_tmp2_, _tmp3_);
-#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp1_);
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_data12_->button = _tmp4_;
-#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = group;
+	_data12_->button = _tmp1_;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp5_ == NULL) {
-#line 1198 "DataImportsUI.c"
-		GtkRadioButton* _tmp6_;
-		SpitDataImportsImportableLibrary* _tmp7_;
-		SpitDataImportsImportableLibrary* _tmp8_;
+	if (group == NULL) {
+#line 1276 "DataImportsUI.c"
+		GtkRadioButton* _tmp2_;
+		SpitDataImportsImportableLibrary* _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp6_ = _data12_->button;
+		_tmp2_ = _data12_->button;
 #line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp7_ = _data12_->library;
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp8_ = _g_object_ref0 (_tmp7_);
+		_tmp3_ = _g_object_ref0 (_data12_->library);
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->selected_library);
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->selected_library = _tmp8_;
-#line 1214 "DataImportsUI.c"
+		self->priv->selected_library = _tmp3_;
+#line 1289 "DataImportsUI.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = _data12_->button;
+	_tmp4_ = _data12_->button;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda22__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
+	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda22__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10_ = _data12_->button;
+	_tmp5_ = _data12_->button;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp11_ = margin_left;
-#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp12_ = _data12_->button;
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), margin_left);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp13_ = margin_right;
+	_tmp6_ = _data12_->button;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _tmp13_);
-#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp14_ = box;
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), margin_right);
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp15_ = _data12_->button;
+	_tmp7_ = _data12_->button;
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+	gtk_box_pack_start (box, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp16_ = _data12_->button;
+	_tmp8_ = _data12_->button;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp17_ = _g_object_ref0 (_tmp16_);
+	_tmp9_ = _g_object_ref0 (_tmp8_);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	result = _tmp17_;
+	result = _tmp9_;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	block12_data_unref (_data12_);
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_data12_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1250 "DataImportsUI.c"
+#line 1319 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self) {
+static void
+data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self)
+{
 	gboolean _tmp0_ = FALSE;
 	SpitDataImportsImportableLibrary* _tmp1_;
 	GtkButton* _tmp3_;
@@ -1267,28 +1338,30 @@ static void data_imports_ui_library_selection_pane_set_import_button_sensitivity
 	if (_tmp1_ != NULL) {
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 1266 "DataImportsUI.c"
+#line 1337 "DataImportsUI.c"
 	} else {
 		GFile* _tmp2_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 1273 "DataImportsUI.c"
+#line 1344 "DataImportsUI.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = self->priv->import_button;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1279 "DataImportsUI.c"
+#line 1350 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library) {
+static void
+data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self,
+                                                            SpitDataImportsImportableLibrary* library)
+{
 	SpitDataImportsPluginHost* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	SpitDataImportsDataImporter* _tmp2_;
-	SpitDataImportsImportableLibrary* _tmp3_;
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
 #line 157 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1300,20 +1373,20 @@ static void data_imports_ui_library_selection_pane_on_library_selected (DataImpo
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = _tmp1_;
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = library;
-#line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	spit_data_imports_data_importer_on_library_selected (_tmp2_, _tmp3_);
+	spit_data_imports_data_importer_on_library_selected (_tmp2_, library);
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1304 "DataImportsUI.c"
+#line 1375 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file) {
+static void
+data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self,
+                                                         GFile* file)
+{
 	SpitDataImportsPluginHost* _tmp0_;
 	SpitDataImportsDataImporter* _tmp1_;
 	SpitDataImportsDataImporter* _tmp2_;
-	GFile* _tmp3_;
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_LIBRARY_SELECTION_PANE (self));
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1325,27 +1398,29 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = file;
-#line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	spit_data_imports_data_importer_on_file_selected (_tmp2_, _tmp3_);
+	spit_data_imports_data_importer_on_file_selected (_tmp2_, file);
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1329 "DataImportsUI.c"
+#line 1400 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_class_init (DataImportsUILibrarySelectionPaneClass * klass) {
+static void
+data_imports_ui_library_selection_pane_class_init (DataImportsUILibrarySelectionPaneClass * klass)
+{
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_library_selection_pane_parent_class = g_type_class_peek_parent (klass);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_type_class_add_private (klass, sizeof (DataImportsUILibrarySelectionPanePrivate));
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_library_selection_pane_finalize;
-#line 1340 "DataImportsUI.c"
+#line 1413 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_instance_init (DataImportsUILibrarySelectionPane * self) {
+static void
+data_imports_ui_library_selection_pane_instance_init (DataImportsUILibrarySelectionPane * self)
+{
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_LIBRARY_SELECTION_PANE_GET_PRIVATE (self);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1354,11 +1429,13 @@ static void data_imports_ui_library_selection_pane_instance_init (DataImportsUIL
 	self->priv->selected_file = NULL;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->file_radio = NULL;
-#line 1353 "DataImportsUI.c"
+#line 1428 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_library_selection_pane_finalize (GObject * obj) {
+static void
+data_imports_ui_library_selection_pane_finalize (GObject * obj)
+{
 	DataImportsUILibrarySelectionPane * self;
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, DataImportsUILibrarySelectionPane);
@@ -1372,11 +1449,13 @@ static void data_imports_ui_library_selection_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->file_radio);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_library_selection_pane_parent_class)->finalize (obj);
-#line 1371 "DataImportsUI.c"
+#line 1448 "DataImportsUI.c"
 }
 
 
-GType data_imports_ui_library_selection_pane_get_type (void) {
+GType
+data_imports_ui_library_selection_pane_get_type (void)
+{
 	static volatile gsize data_imports_ui_library_selection_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&data_imports_ui_library_selection_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataImportsUILibrarySelectionPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_library_selection_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUILibrarySelectionPane), 0, (GInstanceInitFunc) data_imports_ui_library_selection_pane_instance_init, NULL };
@@ -1388,20 +1467,22 @@ GType data_imports_ui_library_selection_pane_get_type (void) {
 }
 
 
-DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object_type, const gchar* message) {
+DataImportsUIProgressPane*
+data_imports_ui_progress_pane_construct (GType object_type,
+                                         const gchar* message)
+{
 	DataImportsUIProgressPane * self = NULL;
 	GtkBox* content_box = NULL;
 	GtkBox* _tmp0_;
-	const gchar* _tmp1_;
+	GtkLabel* _tmp1_;
 	GtkLabel* _tmp2_;
-	GtkLabel* _tmp3_;
+	GtkProgressBar* _tmp3_;
 	GtkProgressBar* _tmp4_;
-	GtkProgressBar* _tmp5_;
+	GtkLabel* _tmp5_;
 	GtkLabel* _tmp6_;
-	GtkLabel* _tmp7_;
-	GtkWidget* _tmp8_;
+	GtkWidget* _tmp7_;
+	GtkContainer* _tmp8_;
 	GtkContainer* _tmp9_;
-	GtkContainer* _tmp10_;
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (message != NULL, NULL);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1413,126 +1494,127 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	content_box = _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = message;
-#line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = (GtkLabel*) gtk_label_new (_tmp1_);
+	_tmp1_ = (GtkLabel*) gtk_label_new (message);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->message_label);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->message_label = _tmp2_;
+	self->priv->message_label = _tmp1_;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = self->priv->message_label;
+	_tmp2_ = self->priv->message_label;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6);
+	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 6);
 #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = (GtkProgressBar*) gtk_progress_bar_new ();
+	_tmp3_ = (GtkProgressBar*) gtk_progress_bar_new ();
 #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp3_);
 #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->progress_bar);
 #line 175 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->progress_bar = _tmp4_;
+	self->priv->progress_bar = _tmp3_;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = self->priv->progress_bar;
+	_tmp4_ = self->priv->progress_bar;
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6);
+	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6);
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp6_ = (GtkLabel*) gtk_label_new ("");
+	_tmp5_ = (GtkLabel*) gtk_label_new ("");
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp5_);
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->progress_label);
 #line 177 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->progress_label = _tmp6_;
+	self->priv->progress_label = _tmp5_;
 #line 178 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp7_ = self->priv->progress_label;
+	_tmp6_ = self->priv->progress_label;
 #line 178 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6);
+	gtk_box_pack_start (content_box, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 6);
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp8_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+	_tmp7_ = spit_data_imports_dialog_pane_get_widget (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp8_) : NULL;
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp7_) : NULL;
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp9_ == NULL) {
+	if (_tmp8_ == NULL) {
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp8_);
-#line 1457 "DataImportsUI.c"
+		_g_object_unref0 (_tmp7_);
+#line 1536 "DataImportsUI.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_container_add (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (content_box, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (content_box, gtk_widget_get_type (), GtkWidget));
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (content_box);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1469 "DataImportsUI.c"
+#line 1548 "DataImportsUI.c"
 }
 
 
-DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message) {
+DataImportsUIProgressPane*
+data_imports_ui_progress_pane_new (const gchar* message)
+{
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_progress_pane_construct (DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, message);
-#line 1476 "DataImportsUI.c"
+#line 1557 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self, gdouble progress, const gchar* progress_message) {
+void
+data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* self,
+                                               gdouble progress,
+                                               const gchar* progress_message)
+{
 	GtkProgressBar* _tmp0_;
-	gdouble _tmp1_;
-	const gchar* _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_PROGRESS_PANE (self));
 #line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->progress_bar;
 #line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = progress;
-#line 184 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
+	gtk_progress_bar_set_fraction (_tmp0_, progress);
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = progress_message;
-#line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp2_ != NULL) {
-#line 1496 "DataImportsUI.c"
-		GtkLabel* _tmp3_;
-		const gchar* _tmp4_;
+	if (progress_message != NULL) {
+#line 1575 "DataImportsUI.c"
+		GtkLabel* _tmp1_;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp3_ = self->priv->progress_label;
+		_tmp1_ = self->priv->progress_label;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp4_ = progress_message;
-#line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_label_set_label (_tmp3_, _tmp4_);
-#line 1505 "DataImportsUI.c"
+		gtk_label_set_label (_tmp1_, progress_message);
+#line 1581 "DataImportsUI.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spin_event_loop ();
-#line 1509 "DataImportsUI.c"
+#line 1585 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneClass * klass) {
+static void
+data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneClass * klass)
+{
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_progress_pane_parent_class = g_type_class_peek_parent (klass);
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_type_class_add_private (klass, sizeof (DataImportsUIProgressPanePrivate));
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_progress_pane_finalize;
-#line 1520 "DataImportsUI.c"
+#line 1598 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) {
+static void
+data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self)
+{
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE (self);
-#line 1527 "DataImportsUI.c"
+#line 1607 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_progress_pane_finalize (GObject * obj) {
+static void
+data_imports_ui_progress_pane_finalize (GObject * obj)
+{
 	DataImportsUIProgressPane * self;
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane);
@@ -1544,11 +1626,13 @@ static void data_imports_ui_progress_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_progress_pane_parent_class)->finalize (obj);
-#line 1543 "DataImportsUI.c"
+#line 1625 "DataImportsUI.c"
 }
 
 
-GType data_imports_ui_progress_pane_get_type (void) {
+GType
+data_imports_ui_progress_pane_get_type (void)
+{
 	static volatile gsize data_imports_ui_progress_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&data_imports_ui_progress_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIProgressPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_progress_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIProgressPane), 0, (GInstanceInitFunc) data_imports_ui_progress_pane_instance_init, NULL };
@@ -1560,408 +1644,414 @@ GType data_imports_ui_progress_pane_get_type (void) {
 }
 
 
-static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+static gboolean
+_data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender,
+                                                                              GdkEventAny* event,
+                                                                              gpointer self)
+{
 	gboolean result;
 	result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event);
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1564 "DataImportsUI.c"
+#line 1652 "DataImportsUI.c"
 }
 
 
-static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                               gpointer self)
+{
 #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self);
-#line 1571 "DataImportsUI.c"
+#line 1662 "DataImportsUI.c"
 }
 
 
-static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                 gpointer self)
+{
 #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
-#line 1578 "DataImportsUI.c"
+#line 1672 "DataImportsUI.c"
 }
 
 
-DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) {
+DataImportsUIDataImportsDialog*
+data_imports_ui_data_imports_dialog_construct (GType object_type)
+{
 	DataImportsUIDataImportsDialog * self = NULL;
 	gboolean use_header = FALSE;
-	gint _tmp0_;
-	gint _tmp1_;
-	gboolean _tmp2_;
+	gboolean _tmp0_;
 	gchar* title = NULL;
-	gchar* _tmp4_;
+	gchar* _tmp2_;
 	gchar* label = NULL;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 	SpitDataImportsService** loaded_services = NULL;
-	gint _tmp7_;
-	SpitDataImportsService** _tmp8_;
+	gint _tmp5_;
+	SpitDataImportsService** _tmp6_;
 	gint loaded_services_length1;
 	gint _loaded_services_size_;
-	SpitDataImportsService** _tmp9_;
-	gint _tmp9__length1;
+	SpitDataImportsService** _tmp7_;
+	gint _tmp7__length1;
+	GtkBox* _tmp62_;
+	GtkBox* _tmp63_;
 	GtkBox* _tmp64_;
-	GtkBox* _tmp65_;
-	GtkBox* _tmp66_;
-	gboolean _tmp67_;
-	GtkButton* _tmp77_;
-	SpitDataImportsService** _tmp78_;
-	gint _tmp78__length1;
-#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp0_ = resources_use_header_bar ();
+	gboolean _tmp65_;
+	GtkButton* _tmp75_;
+	SpitDataImportsService** _tmp76_;
+	gint _tmp76__length1;
 #line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	use_header = _tmp0_ == 1;
+	use_header = resources_use_header_bar () == 1;
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp1_ = resources_use_header_bar ();
-#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+	self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp2_ = use_header;
+	_tmp0_ = use_header;
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp2_) {
-#line 1619 "DataImportsUI.c"
-		GtkWidget* _tmp3_;
+	if (_tmp0_) {
+#line 1709 "DataImportsUI.c"
+		GtkWidget* _tmp1_;
 #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp1_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1625 "DataImportsUI.c"
+		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1715 "DataImportsUI.c"
 	}
 #line 216 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event, self, 0);
 #line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp4_ = g_strdup (_ ("Import From Application"));
+	_tmp2_ = g_strdup (_ ("Import From Application"));
 #line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	title = _tmp4_;
+	title = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = g_strdup (_ ("Import media _from:"));
+	_tmp3_ = g_strdup (_ ("Import media _from:"));
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	label = _tmp5_;
+	label = _tmp3_;
 #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp6_ = title;
+	_tmp4_ = title;
 #line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
 #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp8_ = spit_data_imports_load_services (FALSE, &_tmp7_);
+	_tmp6_ = spit_data_imports_load_services (FALSE, &_tmp5_);
 #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services = _tmp8_;
+	loaded_services = _tmp6_;
 #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services_length1 = _tmp7_;
+	loaded_services_length1 = _tmp5_;
 #line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
 #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = loaded_services;
+	_tmp7_ = loaded_services;
 #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9__length1 = loaded_services_length1;
+	_tmp7__length1 = loaded_services_length1;
 #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp9__length1 > 0) {
-#line 1657 "DataImportsUI.c"
-		GtkComboBoxText* _tmp10_;
-		GtkComboBoxText* _tmp11_;
+	if (_tmp7__length1 > 0) {
+#line 1747 "DataImportsUI.c"
+		GtkComboBoxText* _tmp8_;
+		GtkComboBoxText* _tmp9_;
 		gchar* last_used_service = NULL;
-		ConfigFacade* _tmp12_;
-		ConfigFacade* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
+		ConfigFacade* _tmp10_;
+		ConfigFacade* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 		gint ticker = 0;
 		gint last_used_index = 0;
-		SpitDataImportsService** _tmp16_;
-		gint _tmp16__length1;
-		gint _tmp30_;
-		GtkComboBoxText* _tmp34_;
-		gboolean _tmp35_;
+		SpitDataImportsService** _tmp14_;
+		gint _tmp14__length1;
+		gint _tmp28_;
+		GtkComboBoxText* _tmp32_;
+		gboolean _tmp33_;
 #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp10_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+		_tmp8_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp10_);
+		g_object_ref_sink (_tmp8_);
 #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->service_selector_box);
 #line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->service_selector_box = _tmp10_;
+		self->priv->service_selector_box = _tmp8_;
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp11_ = self->priv->service_selector_box;
+		_tmp9_ = self->priv->service_selector_box;
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp12_ = config_facade_get_instance ();
+		_tmp10_ = config_facade_get_instance ();
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp13_ = _tmp12_;
+		_tmp11_ = _tmp10_;
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp14_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp12_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp15_ = _tmp14_;
+		_tmp13_ = _tmp12_;
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp13_);
+		_g_object_unref0 (_tmp11_);
 #line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		last_used_service = _tmp15_;
+		last_used_service = _tmp13_;
 #line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		ticker = 0;
 #line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		last_used_index = -1;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp16_ = loaded_services;
+		_tmp14_ = loaded_services;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp16__length1 = loaded_services_length1;
-#line 1704 "DataImportsUI.c"
+		_tmp14__length1 = loaded_services_length1;
+#line 1794 "DataImportsUI.c"
 		{
 			SpitDataImportsService** service_collection = NULL;
 			gint service_collection_length1 = 0;
 			gint _service_collection_size_ = 0;
 			gint service_it = 0;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection = _tmp16_;
+			service_collection = _tmp14_;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection_length1 = _tmp16__length1;
+			service_collection_length1 = _tmp14__length1;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			for (service_it = 0; service_it < _tmp16__length1; service_it = service_it + 1) {
-#line 1716 "DataImportsUI.c"
-				SpitDataImportsService* _tmp17_;
+			for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
+#line 1806 "DataImportsUI.c"
+				SpitDataImportsService* _tmp15_;
 				SpitDataImportsService* service = NULL;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				_tmp17_ = _g_object_ref0 (service_collection[service_it]);
+				_tmp15_ = _g_object_ref0 (service_collection[service_it]);
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				service = _tmp17_;
-#line 1723 "DataImportsUI.c"
+				service = _tmp15_;
+#line 1813 "DataImportsUI.c"
 				{
 					gchar* curr_service_id = NULL;
-					SpitDataImportsService* _tmp18_;
-					const gchar* _tmp19_;
-					gchar* _tmp20_;
-					gboolean _tmp21_ = FALSE;
-					const gchar* _tmp22_;
-					GtkComboBoxText* _tmp26_;
-					SpitDataImportsService* _tmp27_;
-					const gchar* _tmp28_;
-					gint _tmp29_;
+					SpitDataImportsService* _tmp16_;
+					const gchar* _tmp17_;
+					gchar* _tmp18_;
+					gboolean _tmp19_ = FALSE;
+					const gchar* _tmp20_;
+					GtkComboBoxText* _tmp24_;
+					SpitDataImportsService* _tmp25_;
+					const gchar* _tmp26_;
+					gint _tmp27_;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp18_ = service;
+					_tmp16_ = service;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp19_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp17_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp20_ = g_strdup (_tmp19_);
+					_tmp18_ = g_strdup (_tmp17_);
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					curr_service_id = _tmp20_;
+					curr_service_id = _tmp18_;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp22_ = last_used_service;
+					_tmp20_ = last_used_service;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp22_ != NULL) {
-#line 1747 "DataImportsUI.c"
-						const gchar* _tmp23_;
-						const gchar* _tmp24_;
+					if (_tmp20_ != NULL) {
+#line 1837 "DataImportsUI.c"
+						const gchar* _tmp21_;
+						const gchar* _tmp22_;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp23_ = last_used_service;
+						_tmp21_ = last_used_service;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp24_ = curr_service_id;
+						_tmp22_ = curr_service_id;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp21_ = g_strcmp0 (_tmp23_, _tmp24_) == 0;
-#line 1756 "DataImportsUI.c"
+						_tmp19_ = g_strcmp0 (_tmp21_, _tmp22_) == 0;
+#line 1846 "DataImportsUI.c"
 					} else {
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp21_ = FALSE;
-#line 1760 "DataImportsUI.c"
+						_tmp19_ = FALSE;
+#line 1850 "DataImportsUI.c"
 					}
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp21_) {
-#line 1764 "DataImportsUI.c"
-						gint _tmp25_;
+					if (_tmp19_) {
+#line 1854 "DataImportsUI.c"
+						gint _tmp23_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp25_ = ticker;
+						_tmp23_ = ticker;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						last_used_index = _tmp25_;
-#line 1770 "DataImportsUI.c"
+						last_used_index = _tmp23_;
+#line 1860 "DataImportsUI.c"
 					}
 #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp26_ = self->priv->service_selector_box;
+					_tmp24_ = self->priv->service_selector_box;
 #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp27_ = service;
+					_tmp25_ = service;
 #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp28_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp26_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					gtk_combo_box_text_append_text (_tmp26_, _tmp28_);
+					gtk_combo_box_text_append_text (_tmp24_, _tmp26_);
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp29_ = ticker;
+					_tmp27_ = ticker;
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					ticker = _tmp29_ + 1;
+					ticker = _tmp27_ + 1;
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_free0 (curr_service_id);
 #line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (service);
-#line 1788 "DataImportsUI.c"
+#line 1878 "DataImportsUI.c"
 				}
 			}
 		}
 #line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp30_ = last_used_index;
+		_tmp28_ = last_used_index;
 #line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp30_ >= 0) {
-#line 1796 "DataImportsUI.c"
-			GtkComboBoxText* _tmp31_;
-			gint _tmp32_;
+		if (_tmp28_ >= 0) {
+#line 1886 "DataImportsUI.c"
+			GtkComboBoxText* _tmp29_;
+			gint _tmp30_;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp31_ = self->priv->service_selector_box;
+			_tmp29_ = self->priv->service_selector_box;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp32_ = last_used_index;
+			_tmp30_ = last_used_index;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), _tmp32_);
-#line 1805 "DataImportsUI.c"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox), _tmp30_);
+#line 1895 "DataImportsUI.c"
 		} else {
-			GtkComboBoxText* _tmp33_;
+			GtkComboBoxText* _tmp31_;
 #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp33_ = self->priv->service_selector_box;
+			_tmp31_ = self->priv->service_selector_box;
 #line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1812 "DataImportsUI.c"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1902 "DataImportsUI.c"
 		}
 #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp34_ = self->priv->service_selector_box;
+		_tmp32_ = self->priv->service_selector_box;
 #line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp35_ = use_header;
+		_tmp33_ = use_header;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (!_tmp35_) {
-#line 1822 "DataImportsUI.c"
+		if (!_tmp33_) {
+#line 1912 "DataImportsUI.c"
 			GtkLabel* service_selector_box_label = NULL;
-			const gchar* _tmp36_;
-			GtkLabel* _tmp37_;
+			const gchar* _tmp34_;
+			GtkLabel* _tmp35_;
+			GtkLabel* _tmp36_;
+			GtkComboBoxText* _tmp37_;
 			GtkLabel* _tmp38_;
-			GtkComboBoxText* _tmp39_;
-			GtkLabel* _tmp40_;
-			GtkLabel* _tmp41_;
+			GtkLabel* _tmp39_;
+			GtkComboBoxText* _tmp40_;
+			GtkComboBoxText* _tmp41_;
 			GtkComboBoxText* _tmp42_;
 			GtkComboBoxText* _tmp43_;
-			GtkComboBoxText* _tmp44_;
-			GtkComboBoxText* _tmp45_;
 			GtkBox* service_selector_layouter = NULL;
+			GtkBox* _tmp44_;
+			GtkBox* _tmp45_;
 			GtkBox* _tmp46_;
-			GtkBox* _tmp47_;
+			GtkLabel* _tmp47_;
 			GtkBox* _tmp48_;
-			GtkLabel* _tmp49_;
-			GtkBox* _tmp50_;
-			GtkComboBoxText* _tmp51_;
+			GtkComboBoxText* _tmp49_;
 			GtkBox* service_area_layouter = NULL;
+			GtkBox* _tmp50_;
+			GtkBox* _tmp51_;
 			GtkBox* _tmp52_;
-			GtkBox* _tmp53_;
-			GtkBox* _tmp54_;
 			GtkSeparator* service_central_separator = NULL;
+			GtkSeparator* _tmp53_;
+			GtkBox* _tmp54_;
 			GtkSeparator* _tmp55_;
 			GtkBox* _tmp56_;
-			GtkSeparator* _tmp57_;
+			GtkBox* _tmp57_;
 			GtkBox* _tmp58_;
 			GtkBox* _tmp59_;
 			GtkBox* _tmp60_;
 			GtkBox* _tmp61_;
-			GtkBox* _tmp62_;
-			GtkBox* _tmp63_;
 #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp36_ = label;
+			_tmp34_ = label;
 #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp37_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp36_);
+			_tmp35_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp34_);
 #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp37_);
+			g_object_ref_sink (_tmp35_);
 #line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_box_label = _tmp37_;
+			service_selector_box_label = _tmp35_;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp38_ = service_selector_box_label;
+			_tmp36_ = service_selector_box_label;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp39_ = self->priv->service_selector_box;
+			_tmp37_ = self->priv->service_selector_box;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_label_set_mnemonic_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+			gtk_label_set_mnemonic_widget (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp40_ = service_selector_box_label;
+			_tmp38_ = service_selector_box_label;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp41_ = service_selector_box_label;
+			_tmp39_ = service_selector_box_label;
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp42_ = self->priv->service_selector_box;
+			_tmp40_ = self->priv->service_selector_box;
 #line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp43_ = self->priv->service_selector_box;
+			_tmp41_ = self->priv->service_selector_box;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp44_ = self->priv->service_selector_box;
+			_tmp42_ = self->priv->service_selector_box;
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp45_ = self->priv->service_selector_box;
+			_tmp43_ = self->priv->service_selector_box;
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp46_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+			_tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp46_);
+			g_object_ref_sink (_tmp44_);
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_layouter = _tmp46_;
+			service_selector_layouter = _tmp44_;
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp47_ = service_selector_layouter;
+			_tmp45_ = service_selector_layouter;
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_container_get_type (), GtkContainer), (guint) 12);
+			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_container_get_type (), GtkContainer), (guint) 12);
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp48_ = service_selector_layouter;
+			_tmp46_ = service_selector_layouter;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp49_ = service_selector_box_label;
+			_tmp47_ = service_selector_box_label;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp50_ = service_selector_layouter;
+			_tmp48_ = service_selector_layouter;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp51_ = self->priv->service_selector_box;
+			_tmp49_ = self->priv->service_selector_box;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			gtk_box_pack_start (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+			_tmp50_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp52_);
+			g_object_ref_sink (_tmp50_);
 #line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_area_layouter = _tmp52_;
+			service_area_layouter = _tmp50_;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp53_ = service_area_layouter;
+			_tmp51_ = service_area_layouter;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp54_ = service_selector_layouter;
+			_tmp52_ = service_selector_layouter;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp55_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+			_tmp53_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp55_);
+			g_object_ref_sink (_tmp53_);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_central_separator = _tmp55_;
+			service_central_separator = _tmp53_;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp56_ = service_area_layouter;
+			_tmp54_ = service_area_layouter;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp57_ = service_central_separator;
+			_tmp55_ = service_central_separator;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp58_ = service_area_layouter;
+			_tmp56_ = service_area_layouter;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp59_ = service_area_layouter;
+			_tmp57_ = service_area_layouter;
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp60_ = service_area_layouter;
+			_tmp58_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), TRUE);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp61_ = service_area_layouter;
+			_tmp59_ = service_area_layouter;
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp62_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+			_tmp60_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp63_ = service_area_layouter;
+			_tmp61_ = service_area_layouter;
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_central_separator);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1970,113 +2060,113 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 			_g_object_unref0 (service_selector_layouter);
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_box_label);
-#line 1969 "DataImportsUI.c"
+#line 2059 "DataImportsUI.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_free0 (last_used_service);
-#line 1973 "DataImportsUI.c"
+#line 2063 "DataImportsUI.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp62_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp64_);
+	g_object_ref_sink (_tmp62_);
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
 #line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->central_area_layouter = _tmp64_;
+	self->priv->central_area_layouter = _tmp62_;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp63_ = gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp66_ = self->priv->central_area_layouter;
+	_tmp64_ = self->priv->central_area_layouter;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp67_ = use_header;
+	_tmp65_ = use_header;
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp67_) {
-#line 1993 "DataImportsUI.c"
-		GtkButton* _tmp68_;
+	if (_tmp65_) {
+#line 2083 "DataImportsUI.c"
+		GtkButton* _tmp66_;
+		GtkButton* _tmp67_;
+		GtkWidget* _tmp68_;
 		GtkButton* _tmp69_;
-		GtkWidget* _tmp70_;
-		GtkButton* _tmp71_;
-		GtkComboBoxText* _tmp72_;
+		GtkComboBoxText* _tmp70_;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp68_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+		_tmp66_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp68_);
+		g_object_ref_sink (_tmp66_);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp68_;
+		self->priv->close_cancel_button = _tmp66_;
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp69_ = self->priv->close_cancel_button;
+		_tmp67_ = self->priv->close_cancel_button;
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp70_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp68_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp71_ = self->priv->close_cancel_button;
+		_tmp69_ = self->priv->close_cancel_button;
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget));
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp72_ = self->priv->service_selector_box;
+		_tmp70_ = self->priv->service_selector_box;
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp72_ != NULL) {
-#line 2021 "DataImportsUI.c"
-			GtkWidget* _tmp73_;
-			GtkComboBoxText* _tmp74_;
+		if (_tmp70_ != NULL) {
+#line 2111 "DataImportsUI.c"
+			GtkWidget* _tmp71_;
+			GtkComboBoxText* _tmp72_;
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+			_tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp74_ = self->priv->service_selector_box;
+			_tmp72_ = self->priv->service_selector_box;
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 2030 "DataImportsUI.c"
+			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+#line 2120 "DataImportsUI.c"
 		}
 	} else {
-		GtkWidget* _tmp75_;
-		GtkButton* _tmp76_;
+		GtkWidget* _tmp73_;
+		GtkButton* _tmp74_;
 #line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp75_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+		_tmp73_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
 #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_button_get_type ()) ? ((GtkButton*) _tmp75_) : NULL);
+		_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, gtk_button_get_type ()) ? ((GtkButton*) _tmp73_) : NULL);
 #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp76_;
-#line 2045 "DataImportsUI.c"
+		self->priv->close_cancel_button = _tmp74_;
+#line 2135 "DataImportsUI.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp77_ = self->priv->close_cancel_button;
+	_tmp75_ = self->priv->close_cancel_button;
 #line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp77_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp75_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
 #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp78_ = loaded_services;
+	_tmp76_ = loaded_services;
 #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp78__length1 = loaded_services_length1;
+	_tmp76__length1 = loaded_services_length1;
 #line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp78__length1 > 0) {
+	if (_tmp76__length1 > 0) {
 #line 311 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2061 "DataImportsUI.c"
+#line 2151 "DataImportsUI.c"
 	} else {
-		DataImportsUIStaticMessagePane* _tmp79_;
-		DataImportsUIStaticMessagePane* _tmp80_;
+		DataImportsUIStaticMessagePane* _tmp77_;
+		DataImportsUIStaticMessagePane* _tmp78_;
 #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp79_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+		_tmp77_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
 #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp80_ = _tmp79_;
+		_tmp78_ = _tmp77_;
 #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp80_);
+		_g_object_unref0 (_tmp78_);
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2075 "DataImportsUI.c"
+#line 2165 "DataImportsUI.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2088,18 +2178,22 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	_g_free0 (title);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 2087 "DataImportsUI.c"
+#line 2177 "DataImportsUI.c"
 }
 
 
-DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
+DataImportsUIDataImportsDialog*
+data_imports_ui_data_imports_dialog_new (void)
+{
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2094 "DataImportsUI.c"
+#line 2186 "DataImportsUI.c"
 }
 
 
-DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void) {
+DataImportsUIDataImportsDialog*
+data_imports_ui_data_imports_dialog_get_or_create_instance (void)
+{
 	DataImportsUIDataImportsDialog* result = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_;
 	DataImportsUIDataImportsDialog* _tmp2_;
@@ -2108,7 +2202,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
 #line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ == NULL) {
-#line 2107 "DataImportsUI.c"
+#line 2201 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_;
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_new ();
@@ -2118,7 +2212,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 		_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2117 "DataImportsUI.c"
+#line 2211 "DataImportsUI.c"
 	}
 #line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = data_imports_ui_data_imports_dialog_instance;
@@ -2128,33 +2222,38 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 	result = _tmp3_;
 #line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2127 "DataImportsUI.c"
+#line 2221 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_terminate_instance (void) {
+void
+data_imports_ui_data_imports_dialog_terminate_instance (void)
+{
 	DataImportsUIDataImportsDialog* _tmp0_;
 #line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
 #line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2137 "DataImportsUI.c"
+#line 2233 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_;
 #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_instance;
 #line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2143 "DataImportsUI.c"
+#line 2239 "DataImportsUI.c"
 	}
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2149 "DataImportsUI.c"
+#line 2245 "DataImportsUI.c"
 }
 
 
-static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) {
+static gboolean
+data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self,
+                                                     GdkEventAny* evt)
+{
 	gboolean result = FALSE;
 #line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE);
@@ -2169,11 +2268,13 @@ static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImports
 	result = TRUE;
 #line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2167 "DataImportsUI.c"
+#line 2266 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_on_service_changed (DataImportsUIDataImportsDialog* self)
+{
 	gchar* service_name = NULL;
 	GtkComboBoxText* _tmp0_;
 	gchar* _tmp1_;
@@ -2217,7 +2318,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	_tmp4_ = services;
 #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4__length1 = services_length1;
-#line 2215 "DataImportsUI.c"
+#line 2316 "DataImportsUI.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2229,14 +2330,14 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 		service_collection_length1 = _tmp4__length1;
 #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2227 "DataImportsUI.c"
+#line 2328 "DataImportsUI.c"
 			SpitDataImportsService* _tmp5_;
 			SpitDataImportsService* service = NULL;
 #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp5_ = _g_object_ref0 (service_collection[service_it]);
 #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			service = _tmp5_;
-#line 2234 "DataImportsUI.c"
+#line 2335 "DataImportsUI.c"
 			{
 				SpitDataImportsService* _tmp6_;
 				const gchar* _tmp7_;
@@ -2249,7 +2350,7 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 				_tmp8_ = service_name;
 #line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2247 "DataImportsUI.c"
+#line 2348 "DataImportsUI.c"
 					SpitDataImportsService* _tmp9_;
 					SpitDataImportsService* _tmp10_;
 #line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2264,11 +2365,11 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 					_g_object_unref0 (service);
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					break;
-#line 2262 "DataImportsUI.c"
+#line 2363 "DataImportsUI.c"
 				}
 #line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_g_object_unref0 (service);
-#line 2266 "DataImportsUI.c"
+#line 2367 "DataImportsUI.c"
 			}
 		}
 	}
@@ -2306,11 +2407,13 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	_g_object_unref0 (selected_service);
 #line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_free0 (service_name);
-#line 2304 "DataImportsUI.c"
+#line 2405 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self)
+{
 #line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2318,11 +2421,13 @@ static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImp
 " invoked.");
 #line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 2315 "DataImportsUI.c"
+#line 2418 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self)
+{
 	SpitDataImportsConcreteDataImportsHost* _tmp0_;
 #line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2332,7 +2437,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 	_tmp0_ = self->priv->host;
 #line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2329 "DataImportsUI.c"
+#line 2434 "DataImportsUI.c"
 		SpitDataImportsConcreteDataImportsHost* _tmp1_;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->host;
@@ -2342,7 +2447,7 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 		_g_object_unref0 (self->priv->host);
 #line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->host = NULL;
-#line 2339 "DataImportsUI.c"
+#line 2444 "DataImportsUI.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -2352,11 +2457,13 @@ static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImpo
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2349 "DataImportsUI.c"
+#line 2454 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self)
+{
 	GtkBox* _tmp0_;
 #line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2368,11 +2475,13 @@ static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImpor
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2365 "DataImportsUI.c"
+#line 2472 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self)
+{
 	GtkBox* _tmp0_;
 #line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2384,11 +2493,13 @@ static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataIm
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2381 "DataImportsUI.c"
+#line 2490 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self)
+{
 	GtkBox* _tmp0_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2400,29 +2511,35 @@ static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataIm
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
 #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2397 "DataImportsUI.c"
+#line 2508 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self)
+{
 #line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2406 "DataImportsUI.c"
+#line 2519 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
+static void
+data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self)
+{
 #line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2415 "DataImportsUI.c"
+#line 2530 "DataImportsUI.c"
 }
 
 
-SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self) {
+SpitDataImportsDialogPane*
+data_imports_ui_data_imports_dialog_get_active_pane (DataImportsUIDataImportsDialog* self)
+{
 	SpitDataImportsDialogPane* result = NULL;
 	SpitDataImportsDialogPane* _tmp0_;
 	SpitDataImportsDialogPane* _tmp1_;
@@ -2436,11 +2553,13 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
 	result = _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2433 "DataImportsUI.c"
+#line 2550 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) {
+void
+data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self)
+{
 	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
 #line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2453,11 +2572,13 @@ void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDat
 	_tmp1_ = self->priv->close_cancel_button;
 #line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2450 "DataImportsUI.c"
+#line 2569 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
+void
+data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self)
+{
 	GtkButton* _tmp0_;
 #line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2465,11 +2586,13 @@ void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDa
 	_tmp0_ = self->priv->close_cancel_button;
 #line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 2462 "DataImportsUI.c"
+#line 2583 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
+void
+data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self)
+{
 	GtkComboBoxText* _tmp0_;
 #line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2477,11 +2600,13 @@ void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsD
 	_tmp0_ = self->priv->service_selector_box;
 #line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2474 "DataImportsUI.c"
+#line 2597 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
+void
+data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self)
+{
 	GtkComboBoxText* _tmp0_;
 #line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
@@ -2489,24 +2614,22 @@ void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImport
 	_tmp0_ = self->priv->service_selector_box;
 #line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2486 "DataImportsUI.c"
+#line 2611 "DataImportsUI.c"
 }
 
 
-void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self, SpitDataImportsDialogPane* pane) {
+void
+data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsDialog* self,
+                                                  SpitDataImportsDialogPane* pane)
+{
 	SpitDataImportsDialogPane* _tmp0_;
 	GtkBox* _tmp6_;
-	SpitDataImportsDialogPane* _tmp7_;
+	GtkWidget* _tmp7_;
 	GtkWidget* _tmp8_;
-	GtkWidget* _tmp9_;
 	SpitDataImportsDialogPaneGeometryOptions geometry_options = 0;
-	SpitDataImportsDialogPane* _tmp10_;
+	SpitDataImportsDialogPaneGeometryOptions _tmp9_;
 	SpitDataImportsDialogPaneGeometryOptions _tmp11_;
-	SpitDataImportsDialogPaneGeometryOptions _tmp12_;
-	SpitDataImportsDialogPaneGeometryOptions _tmp14_;
-	SpitDataImportsDialogPane* _tmp15_;
-	SpitDataImportsDialogPane* _tmp16_;
-	SpitDataImportsDialogPane* _tmp17_;
+	SpitDataImportsDialogPane* _tmp12_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2517,7 +2640,7 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	_tmp0_ = self->priv->active_pane;
 #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2514 "DataImportsUI.c"
+#line 2637 "DataImportsUI.c"
 		SpitDataImportsDialogPane* _tmp1_;
 		GtkBox* _tmp2_;
 		SpitDataImportsDialogPane* _tmp3_;
@@ -2542,97 +2665,93 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
 #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2538 "DataImportsUI.c"
+#line 2661 "DataImportsUI.c"
 	}
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp7_ = pane;
-#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_);
+	_tmp7_ = spit_data_imports_dialog_pane_get_widget (pane);
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp6_, _tmp8_, TRUE, TRUE, (guint) 0);
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10_ = pane;
-#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	geometry_options = _tmp11_;
+	geometry_options = spit_data_imports_dialog_pane_get_preferred_geometry (pane);
 #line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp12_ = geometry_options;
+	_tmp9_ = geometry_options;
 #line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
+	if ((_tmp9_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2566 "DataImportsUI.c"
+#line 2683 "DataImportsUI.c"
 	} else {
-		SpitDataImportsDialogPaneGeometryOptions _tmp13_;
+		SpitDataImportsDialogPaneGeometryOptions _tmp10_;
 #line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp13_ = geometry_options;
+		_tmp10_ = geometry_options;
 #line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
+		if ((_tmp10_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
 #line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2575 "DataImportsUI.c"
+#line 2692 "DataImportsUI.c"
 		} else {
 #line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2579 "DataImportsUI.c"
+#line 2696 "DataImportsUI.c"
 		}
 	}
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp14_ = geometry_options;
+	_tmp11_ = geometry_options;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
+	if ((_tmp11_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
 #line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2588 "DataImportsUI.c"
+#line 2705 "DataImportsUI.c"
 	} else {
 #line 456 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2592 "DataImportsUI.c"
+#line 2709 "DataImportsUI.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp15_ = pane;
-#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp16_ = _g_object_ref0 (_tmp15_);
+	_tmp12_ = _g_object_ref0 (pane);
 #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
 #line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->active_pane = _tmp16_;
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp17_ = pane;
+	self->priv->active_pane = _tmp12_;
 #line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2606 "DataImportsUI.c"
+	spit_data_imports_dialog_pane_on_pane_installed (pane);
+#line 2719 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImportsDialogClass * klass) {
+static void
+data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImportsDialogClass * klass)
+{
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2617 "DataImportsUI.c"
+#line 2732 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
+static void
+data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self)
+{
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2624 "DataImportsUI.c"
+#line 2741 "DataImportsUI.c"
 }
 
 
-static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) {
+static void
+data_imports_ui_data_imports_dialog_finalize (GObject * obj)
+{
 	DataImportsUIDataImportsDialog * self;
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG, DataImportsUIDataImportsDialog);
@@ -2648,11 +2767,13 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->host);
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2644 "DataImportsUI.c"
+#line 2763 "DataImportsUI.c"
 }
 
 
-GType data_imports_ui_data_imports_dialog_get_type (void) {
+GType
+data_imports_ui_data_imports_dialog_get_type (void)
+{
 	static volatile gsize data_imports_ui_data_imports_dialog_type_id__volatile = 0;
 	if (g_once_init_enter (&data_imports_ui_data_imports_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataImportsUIDataImportsDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_ui_data_imports_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsUIDataImportsDialog), 0, (GInstanceInitFunc) data_imports_ui_data_imports_dialog_instance_init, NULL };
@@ -2664,7 +2785,11 @@ GType data_imports_ui_data_imports_dialog_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -2676,7 +2801,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-06-25 21:12:13 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-06-25 21:12:13 +0200
commit	059a62ee3c820a42fbce980c3256049adecc9100 (patch)
tree	e51eab94fd7d65459640ca227fb2257bb41d2acb /src/data_imports
parent	55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parent	e8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)