Merge branch 'feature/upstream' into develop

1 files changed, 1258 insertions, 1269 deletions

diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c
index c0fc03a..cc05c99 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.c
+++ b/plugins/shotwell-data-imports/FSpotImporter.c
@@ -1,4 +1,4 @@
-/* FSpotImporter.c generated by valac 0.34.7, the Vala compiler
+/* FSpotImporter.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotImporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -422,21 +422,21 @@ static gint fspot_service_icon_pixbuf_set_length1;
 static GdkPixbuf** fspot_service_icon_pixbuf_set = NULL;
 static gint fspot_service_icon_pixbuf_set_length1 = 0;
 static gint _fspot_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* fspot_service_spit_pluggable_parent_iface = NULL;
-static SpitDataImportsServiceIface* fspot_service_spit_data_imports_service_parent_iface = NULL;
+static SpitPluggableIface * fspot_service_spit_pluggable_parent_iface = NULL;
+static SpitDataImportsServiceIface * fspot_service_spit_data_imports_service_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_library_parent_class = NULL;
-static SpitDataImportsImportableLibraryIface* data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL;
+static SpitDataImportsImportableLibraryIface * data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_item_parent_class = NULL;
-static SpitDataImportsImportableMediaItemIface* data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL;
+static SpitDataImportsImportableMediaItemIface * data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_tag_parent_class = NULL;
-static SpitDataImportsImportableTagIface* data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL;
+static SpitDataImportsImportableTagIface * data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_event_parent_class = NULL;
-static SpitDataImportsImportableEventIface* data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL;
+static SpitDataImportsImportableEventIface * data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_rating_parent_class = NULL;
-static SpitDataImportsImportableRatingIface* data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL;
+static SpitDataImportsImportableRatingIface * data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_tags_cache_parent_class = NULL;
 static gpointer data_imports_fspot_fspot_data_importer_parent_class = NULL;
-static SpitDataImportsDataImporterIface* data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL;
+static SpitDataImportsDataImporterIface * data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL;
 
 GType fspot_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -456,7 +456,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host);
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host);
 GType data_imports_fspot_fspot_data_importer_get_type (void) G_GNUC_CONST;
-static void fspot_service_finalize (GObject* obj);
+static void fspot_service_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_SERVICE_NAME "F-Spot"
 #define DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE _ ("Welcome to the F-Spot library import service.\n" \
 "\n" \
@@ -489,7 +489,7 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file);
 GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self);
 static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base);
-static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj);
 GType data_imports_fspot_fspot_importable_item_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
@@ -511,14 +511,14 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED 0
 static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url);
 static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_real_get_tags (SpitDataImportsImportableMediaItem* base, int* result_length1);
-static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value);
+static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value);
 static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataImportsImportableMediaItem* base);
 static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base);
 static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base);
-static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagPrivate))
 enum  {
@@ -536,13 +536,13 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self);
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row);
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row);
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_DUMMY_PROPERTY
 };
 static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base);
-static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_DUMMY_PROPERTY
@@ -550,7 +550,7 @@ enum  {
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base);
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base);
 static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base);
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj);
 GType data_imports_fspot_fspot_tags_cache_get_type (void) G_GNUC_CONST;
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
@@ -572,7 +572,7 @@ static gint64* _int64_dup (gint64* self);
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error);
 static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error);
 DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error);
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj);
+static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_DUMMY_PROPERTY
@@ -582,7 +582,7 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s
 static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base);
 static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self);
 static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDataImporter* base);
-static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value);
+static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value);
 static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library);
 static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDataImportsDataImporter* base, GFile* file);
 GType data_imports_fspot_db_fspot_database_get_type (void) G_GNUC_CONST;
@@ -595,26 +595,26 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot
 GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value);
+static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value);
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error);
 GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error);
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
 void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count);
 static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
 #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS "stock_icon:emblem-event"
 #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV "stock_icon:emblem-favorite"
-static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj);
+static void data_imports_fspot_fspot_data_importer_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);
 
 
 FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory) {
 	FSpotService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -628,8 +628,8 @@ FSpotService* fspot_service_construct (GType object_type, GFile* resource_direct
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp0_ == NULL) {
 #line 617 "FSpotImporter.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp2_ = resources_load_from_resource ("/org/gnome/Shotwell/Imports/" FSPOT_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -658,9 +658,9 @@ FSpotService* fspot_service_new (GFile* resource_directory) {
 static gint fspot_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	FSpotService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -718,7 +718,7 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	for (i = 0; i < length; i++) {
 #line 707 "FSpotImporter.c"
-		GdkPixbuf* _tmp0_ = NULL;
+		GdkPixbuf* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -733,18 +733,17 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 
 static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	FSpotService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -756,60 +755,58 @@ static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).authors = _tmp0_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).copyright);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).translators);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).version);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).website_name);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).website_url);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).license);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = fspot_service_icon_pixbuf_set;
+	_tmp7_ = fspot_service_icon_pixbuf_set;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8__length1 = fspot_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = fspot_service_icon_pixbuf_set_length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 799 "FSpotImporter.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 796 "FSpotImporter.c"
 }
 
 
@@ -817,15 +814,15 @@ static void fspot_service_real_activation (SpitPluggable* base, gboolean enabled
 	FSpotService * self;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 807 "FSpotImporter.c"
+#line 804 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (SpitDataImportsService* base, SpitDataImportsPluginHost* host) {
 	FSpotService * self;
 	SpitDataImportsDataImporter* result = NULL;
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	DataImportsFSpotFSpotDataImporter* _tmp1_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	DataImportsFSpotFSpotDataImporter* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -838,7 +835,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 828 "FSpotImporter.c"
+#line 825 "FSpotImporter.c"
 }
 
 
@@ -847,7 +844,7 @@ static void fspot_service_class_init (FSpotServiceClass * klass) {
 	fspot_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = fspot_service_finalize;
-#line 837 "FSpotImporter.c"
+#line 834 "FSpotImporter.c"
 }
 
 
@@ -855,16 +852,16 @@ static void fspot_service_spit_pluggable_interface_init (SpitPluggableIface * if
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	fspot_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) fspot_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) fspot_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) fspot_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) fspot_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) fspot_service_real_activation;
-#line 854 "FSpotImporter.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) fspot_service_real_activation;
+#line 851 "FSpotImporter.c"
 }
 
 
@@ -872,8 +869,8 @@ static void fspot_service_spit_data_imports_service_interface_init (SpitDataImpo
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	fspot_service_spit_data_imports_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->create_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsService*, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer;
-#line 863 "FSpotImporter.c"
+	iface->create_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsService *, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer;
+#line 860 "FSpotImporter.c"
 }
 
 
@@ -881,13 +878,13 @@ static void fspot_service_instance_init (FSpotService * self) {
 }
 
 
-static void fspot_service_finalize (GObject* obj) {
+static void fspot_service_finalize (GObject * obj) {
 	FSpotService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FSPOT_SERVICE, FSpotService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (fspot_service_parent_class)->finalize (obj);
-#line 877 "FSpotImporter.c"
+#line 874 "FSpotImporter.c"
 }
 
 
@@ -909,8 +906,8 @@ GType fspot_service_get_type (void) {
 
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file) {
 	DataImportsFSpotFSpotImportableLibrary * self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (G_IS_FILE (db_file), NULL);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -925,21 +922,21 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr
 	self->priv->db_file = _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 915 "FSpotImporter.c"
+#line 912 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_new (GFile* db_file) {
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_library_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, db_file);
-#line 922 "FSpotImporter.c"
+#line 919 "FSpotImporter.c"
 }
 
 
 GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY (self), NULL);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -950,40 +947,37 @@ GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpot
 	result = _tmp1_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 940 "FSpotImporter.c"
+#line 937 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base) {
 	DataImportsFSpotFSpotImportableLibrary * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = _ ("F-Spot library: %s");
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = self->priv->db_file;
+	_tmp0_ = self->priv->db_file;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_file_get_path (_tmp1_);
+	_tmp1_ = g_file_get_path (_tmp0_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_strdup_printf (_tmp0_, _tmp3_);
+	_tmp3_ = g_strdup_printf (_ ("F-Spot library: %s"), _tmp2_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp5_;
+	result = _tmp4_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 973 "FSpotImporter.c"
+#line 967 "FSpotImporter.c"
 }
 
 
@@ -994,7 +988,7 @@ static void data_imports_fspot_fspot_importable_library_class_init (DataImportsF
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableLibraryPrivate));
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_library_finalize;
-#line 984 "FSpotImporter.c"
+#line 978 "FSpotImporter.c"
 }
 
 
@@ -1002,19 +996,19 @@ static void data_imports_fspot_fspot_importable_library_spit_data_imports_import
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = g_type_interface_peek_parent (iface);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_display_name = (gchar* (*)(SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_importable_library_real_get_display_name;
-#line 993 "FSpotImporter.c"
+	iface->get_display_name = (gchar* (*) (SpitDataImportsImportableLibrary *)) data_imports_fspot_fspot_importable_library_real_get_display_name;
+#line 987 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_library_instance_init (DataImportsFSpotFSpotImportableLibrary * self) {
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_PRIVATE (self);
-#line 1000 "FSpotImporter.c"
+#line 994 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableLibrary * self;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
@@ -1022,7 +1016,7 @@ static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj)
 	_g_object_unref0 (self->priv->db_file);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_library_parent_class)->finalize (obj);
-#line 1012 "FSpotImporter.c"
+#line 1006 "FSpotImporter.c"
 }
 
 
@@ -1047,17 +1041,17 @@ static DataImportsFSpotFSpotImportableTag** _vala_array_dup2 (DataImportsFSpotFS
 	result = g_new0 (DataImportsFSpotFSpotImportableTag*, length + 1);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	for (i = 0; i < length; i++) {
-#line 1037 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
+#line 1031 "FSpotImporter.c"
+		DataImportsFSpotFSpotImportableTag* _tmp0_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		result[i] = _tmp0_;
-#line 1043 "FSpotImporter.c"
+#line 1037 "FSpotImporter.c"
 	}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1047 "FSpotImporter.c"
+#line 1041 "FSpotImporter.c"
 }
 
 
@@ -1069,44 +1063,44 @@ static time_t* _time_t_dup (time_t* self) {
 	memcpy (dup, self, sizeof (time_t));
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return dup;
-#line 1059 "FSpotImporter.c"
+#line 1053 "FSpotImporter.c"
 }
 
 
 static gpointer __time_t_dup0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self ? _time_t_dup (self) : NULL;
-#line 1066 "FSpotImporter.c"
+#line 1060 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_construct (GType object_type, DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
 	DataImportsFSpotFSpotImportableItem * self = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_ = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp4_ = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp5_ = NULL;
-	DataImportsFSpotFSpotImportableTag** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	DataImportsFSpotFSpotImportableTag** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	DataImportsFSpotFSpotImportableEvent* _tmp8_ = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp9_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp10_ = NULL;
-	time_t _tmp11_ = 0;
-	time_t* _tmp12_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_;
+	DataImportsFSpotDbFSpotRollRow* _tmp4_;
+	DataImportsFSpotDbFSpotRollRow* _tmp5_;
+	DataImportsFSpotFSpotImportableTag** _tmp6_;
+	gint _tmp6__length1;
+	DataImportsFSpotFSpotImportableTag** _tmp7_;
+	gint _tmp7__length1;
+	DataImportsFSpotFSpotImportableEvent* _tmp8_;
+	DataImportsFSpotFSpotImportableEvent* _tmp9_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp10_;
+	time_t _tmp11_;
+	time_t* _tmp12_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp13_;
+	gint _tmp14_;
 	gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-	gchar* _tmp31_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+	gchar* _tmp31_;
 	const gchar* _tmp32_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_ = NULL;
-	gchar* _tmp38_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_;
+	gchar* _tmp38_;
 	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_ = NULL;
+	const gchar* _tmp40_;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW (photo_row), NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1181,10 +1175,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp14_ = _tmp13_->rating;
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp14_ > 0) {
-#line 1171 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		DataImportsFSpotFSpotImportableRating* _tmp17_ = NULL;
+#line 1165 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoRow* _tmp15_;
+		gint _tmp16_;
+		DataImportsFSpotFSpotImportableRating* _tmp17_;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp15_ = photo_row;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1195,46 +1189,46 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_object_unref0 (self->priv->rating);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		self->priv->rating = _tmp17_;
-#line 1185 "FSpotImporter.c"
+#line 1179 "FSpotImporter.c"
 	} else {
-		gboolean _tmp18_ = FALSE;
+		gboolean _tmp18_;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp18_ = is_hidden;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (_tmp18_) {
-#line 1192 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableRating* _tmp19_ = NULL;
+#line 1186 "FSpotImporter.c"
+			DataImportsFSpotFSpotImportableRating* _tmp19_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp19_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (self->priv->rating);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			self->priv->rating = _tmp19_;
-#line 1200 "FSpotImporter.c"
+#line 1194 "FSpotImporter.c"
 		} else {
-			gboolean _tmp20_ = FALSE;
+			gboolean _tmp20_;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp20_ = is_favorite;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_tmp20_) {
-#line 1207 "FSpotImporter.c"
-				DataImportsFSpotFSpotImportableRating* _tmp21_ = NULL;
+#line 1201 "FSpotImporter.c"
+				DataImportsFSpotFSpotImportableRating* _tmp21_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp21_ = data_imports_fspot_fspot_importable_rating_new (5);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (self->priv->rating);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				self->priv->rating = _tmp21_;
-#line 1215 "FSpotImporter.c"
+#line 1209 "FSpotImporter.c"
 			} else {
-				DataImportsFSpotFSpotImportableRating* _tmp22_ = NULL;
+				DataImportsFSpotFSpotImportableRating* _tmp22_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp22_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (self->priv->rating);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				self->priv->rating = _tmp22_;
-#line 1224 "FSpotImporter.c"
+#line 1218 "FSpotImporter.c"
 			}
 		}
 	}
@@ -1242,10 +1236,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp24_ = photo_version_row;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp24_ != NULL) {
-#line 1232 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		GFile* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
+#line 1226 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		GFile* _tmp26_;
+		gchar* _tmp27_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp25_ = photo_version_row;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1256,11 +1250,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_free0 (_tmp23_);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp23_ = _tmp27_;
-#line 1246 "FSpotImporter.c"
+#line 1240 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp28_;
+		GFile* _tmp29_;
+		gchar* _tmp30_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp28_ = photo_row;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1271,7 +1265,7 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_free0 (_tmp23_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp23_ = _tmp30_;
-#line 1261 "FSpotImporter.c"
+#line 1255 "FSpotImporter.c"
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp31_ = g_strdup (_tmp23_);
@@ -1283,26 +1277,26 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp33_ = photo_version_row;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp33_ != NULL) {
-#line 1273 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+#line 1267 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_;
+		const gchar* _tmp35_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp34_ = photo_version_row;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp35_ = _tmp34_->filename;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp32_ = _tmp35_;
-#line 1282 "FSpotImporter.c"
+#line 1276 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+		const gchar* _tmp37_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp36_ = photo_row;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp37_ = _tmp36_->filename;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp32_ = _tmp37_;
-#line 1292 "FSpotImporter.c"
+#line 1286 "FSpotImporter.c"
 	}
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp38_ = g_strdup (_tmp32_);
@@ -1314,30 +1308,30 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp40_ = self->priv->folder_path;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp40_ != NULL) {
-#line 1304 "FSpotImporter.c"
-		const gchar* _tmp41_ = NULL;
+#line 1298 "FSpotImporter.c"
+		const gchar* _tmp41_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp41_ = self->priv->filename;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp39_ = _tmp41_ != NULL;
-#line 1310 "FSpotImporter.c"
+#line 1304 "FSpotImporter.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp39_ = FALSE;
-#line 1314 "FSpotImporter.c"
+#line 1308 "FSpotImporter.c"
 	}
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp39_) {
-#line 1318 "FSpotImporter.c"
+#line 1312 "FSpotImporter.c"
 		GFile* photo = NULL;
-		const gchar* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		GFile* _tmp46_ = NULL;
-		GFile* _tmp47_ = NULL;
-		GFile* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+		const gchar* _tmp42_;
+		GFile* _tmp43_;
+		GFile* _tmp44_;
+		const gchar* _tmp45_;
+		GFile* _tmp46_;
+		GFile* _tmp47_;
+		GFile* _tmp48_;
+		gboolean _tmp49_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp42_ = self->priv->folder_path;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1360,11 +1354,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_tmp49_ = g_file_query_exists (_tmp48_, NULL);
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (!_tmp49_) {
-#line 1350 "FSpotImporter.c"
-			const gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-			const gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
+#line 1344 "FSpotImporter.c"
+			const gchar* _tmp50_;
+			gchar* _tmp51_;
+			const gchar* _tmp52_;
+			gchar* _tmp53_;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp50_ = self->priv->folder_path;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1381,41 +1375,41 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 			_g_free0 (self->priv->filename);
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			self->priv->filename = _tmp53_;
-#line 1371 "FSpotImporter.c"
+#line 1365 "FSpotImporter.c"
 		}
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (photo);
-#line 1375 "FSpotImporter.c"
+#line 1369 "FSpotImporter.c"
 	}
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 (_tmp23_);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 1381 "FSpotImporter.c"
+#line 1375 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_new (DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_item_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, photo_row, photo_version_row, roll_row, tags, tags_length1, event, is_hidden, is_favorite);
-#line 1388 "FSpotImporter.c"
+#line 1382 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value) {
+static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value) {
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableTag*, *array, (*size) + 1);
-#line 1399 "FSpotImporter.c"
+#line 1393 "FSpotImporter.c"
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 1405 "FSpotImporter.c"
+#line 1399 "FSpotImporter.c"
 }
 
 
@@ -1423,13 +1417,13 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableTag** result = NULL;
 	SpitDataImportsImportableTag** importable_tags = NULL;
-	SpitDataImportsImportableTag** _tmp0_ = NULL;
-	gint importable_tags_length1 = 0;
-	gint _importable_tags_size_ = 0;
-	DataImportsFSpotFSpotImportableTag** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitDataImportsImportableTag** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	SpitDataImportsImportableTag** _tmp0_;
+	gint importable_tags_length1;
+	gint _importable_tags_size_;
+	DataImportsFSpotFSpotImportableTag** _tmp1_;
+	gint _tmp1__length1;
+	SpitDataImportsImportableTag** _tmp6_;
+	gint _tmp6__length1;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1444,7 +1438,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	_tmp1_ = self->priv->tags;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp1__length1 = self->priv->tags_length1;
-#line 1434 "FSpotImporter.c"
+#line 1428 "FSpotImporter.c"
 	{
 		DataImportsFSpotFSpotImportableTag** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -1456,19 +1450,19 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 		tag_collection_length1 = _tmp1__length1;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		for (tag_it = 0; tag_it < _tmp1__length1; tag_it = tag_it + 1) {
-#line 1446 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL;
+#line 1440 "FSpotImporter.c"
+			DataImportsFSpotFSpotImportableTag* _tmp2_;
 			DataImportsFSpotFSpotImportableTag* tag = NULL;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp2_ = _g_object_ref0 (tag_collection[tag_it]);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			tag = _tmp2_;
-#line 1453 "FSpotImporter.c"
+#line 1447 "FSpotImporter.c"
 			{
-				SpitDataImportsImportableTag** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
-				SpitDataImportsImportableTag* _tmp5_ = NULL;
+				SpitDataImportsImportableTag** _tmp3_;
+				gint _tmp3__length1;
+				DataImportsFSpotFSpotImportableTag* _tmp4_;
+				SpitDataImportsImportableTag* _tmp5_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp3_ = importable_tags;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1481,7 +1475,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 				_vala_array_add1 (&importable_tags, &importable_tags_length1, &_importable_tags_size_, _tmp5_);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag);
-#line 1471 "FSpotImporter.c"
+#line 1465 "FSpotImporter.c"
 			}
 		}
 	}
@@ -1493,21 +1487,21 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	if (result_length1) {
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*result_length1 = _tmp6__length1;
-#line 1483 "FSpotImporter.c"
+#line 1477 "FSpotImporter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _tmp6_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1489 "FSpotImporter.c"
+#line 1483 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableEvent* result = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp0_ = NULL;
-	SpitDataImportsImportableEvent* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableEvent* _tmp0_;
+	SpitDataImportsImportableEvent* _tmp1_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1518,15 +1512,15 @@ static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_
 	result = _tmp1_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1508 "FSpotImporter.c"
+#line 1502 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1537,15 +1531,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (Spi
 	result = _tmp1_;
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1527 "FSpotImporter.c"
+#line 1521 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1556,7 +1550,7 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDa
 	result = _tmp1_;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1546 "FSpotImporter.c"
+#line 1540 "FSpotImporter.c"
 }
 
 
@@ -1565,9 +1559,9 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp8_;
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1578,33 +1572,33 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	if (_tmp3_ == NULL) {
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = TRUE;
-#line 1568 "FSpotImporter.c"
+#line 1562 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp4_;
+		const gchar* _tmp5_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp4_ = self->priv->photo_row;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = _tmp4_->description;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = g_strcmp0 (_tmp5_, "") == 0;
-#line 1578 "FSpotImporter.c"
+#line 1572 "FSpotImporter.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp1_) {
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = NULL;
-#line 1584 "FSpotImporter.c"
+#line 1578 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
+		const gchar* _tmp7_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp6_ = self->priv->photo_row;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp7_ = _tmp6_->description;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _tmp7_;
-#line 1594 "FSpotImporter.c"
+#line 1588 "FSpotImporter.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp8_ = g_strdup (_tmp0_);
@@ -1612,15 +1606,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	result = _tmp8_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1602 "FSpotImporter.c"
+#line 1596 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableRating* result = NULL;
-	DataImportsFSpotFSpotImportableRating* _tmp0_ = NULL;
-	SpitDataImportsImportableRating* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableRating* _tmp0_;
+	SpitDataImportsImportableRating* _tmp1_;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1631,15 +1625,15 @@ static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item
 	result = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1621 "FSpotImporter.c"
+#line 1615 "FSpotImporter.c"
 }
 
 
 static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	time_t* result = NULL;
-	time_t* _tmp0_ = NULL;
-	time_t* _tmp1_ = NULL;
+	time_t* _tmp0_;
+	time_t* _tmp1_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1650,46 +1644,46 @@ static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (
 	result = _tmp1_;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1640 "FSpotImporter.c"
+#line 1634 "FSpotImporter.c"
 }
 
 
 static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1665 "FSpotImporter.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1659 "FSpotImporter.c"
+		gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1673 "FSpotImporter.c"
+#line 1667 "FSpotImporter.c"
 	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1679 "FSpotImporter.c"
+#line 1673 "FSpotImporter.c"
 	}
 }
 
@@ -1697,180 +1691,180 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1713 "FSpotImporter.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1707 "FSpotImporter.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1722 "FSpotImporter.c"
+#line 1716 "FSpotImporter.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1728 "FSpotImporter.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1722 "FSpotImporter.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1737 "FSpotImporter.c"
+#line 1731 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1743 "FSpotImporter.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1737 "FSpotImporter.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1752 "FSpotImporter.c"
+#line 1746 "FSpotImporter.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1756 "FSpotImporter.c"
+#line 1750 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1764 "FSpotImporter.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1758 "FSpotImporter.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1773 "FSpotImporter.c"
+#line 1767 "FSpotImporter.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1777 "FSpotImporter.c"
+#line 1771 "FSpotImporter.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1799 "FSpotImporter.c"
+#line 1793 "FSpotImporter.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1817 "FSpotImporter.c"
+#line 1811 "FSpotImporter.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1840 "FSpotImporter.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1834 "FSpotImporter.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1848 "FSpotImporter.c"
+#line 1842 "FSpotImporter.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1860 "FSpotImporter.c"
+#line 1854 "FSpotImporter.c"
 	}
 }
 
@@ -1879,133 +1873,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1884 "FSpotImporter.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1878 "FSpotImporter.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1890 "FSpotImporter.c"
+#line 1884 "FSpotImporter.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1894 "FSpotImporter.c"
+#line 1888 "FSpotImporter.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1898 "FSpotImporter.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1892 "FSpotImporter.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1910 "FSpotImporter.c"
+#line 1904 "FSpotImporter.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1920 "FSpotImporter.c"
+#line 1914 "FSpotImporter.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1926 "FSpotImporter.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1920 "FSpotImporter.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1940 "FSpotImporter.c"
+#line 1934 "FSpotImporter.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1950 "FSpotImporter.c"
+#line 1944 "FSpotImporter.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1956 "FSpotImporter.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1950 "FSpotImporter.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1965 "FSpotImporter.c"
+#line 1959 "FSpotImporter.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1985 "FSpotImporter.c"
+#line 1979 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
-	GString* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
+	GString* _tmp0_;
+	GString* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM (self), NULL);
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2014,33 +2008,33 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 	_tmp0_ = g_string_new ("");
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	builder = _tmp0_;
-#line 2004 "FSpotImporter.c"
+#line 1998 "FSpotImporter.c"
 	{
 		gint idx = 0;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		idx = 0;
-#line 2009 "FSpotImporter.c"
+#line 2003 "FSpotImporter.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp1_ = TRUE;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			while (TRUE) {
-#line 2016 "FSpotImporter.c"
-				gint _tmp2_ = 0;
-				const gchar* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
+#line 2010 "FSpotImporter.c"
+				gint _tmp2_;
+				const gchar* _tmp3_;
+				gint _tmp4_;
+				gint _tmp5_;
 				gint cidx = 0;
-				const gchar* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp17_ = 0;
+				const gchar* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp17_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (!_tmp1_) {
-#line 2030 "FSpotImporter.c"
+#line 2024 "FSpotImporter.c"
 				}
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp1_ = FALSE;
@@ -2056,7 +2050,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 				if (!(_tmp2_ < _tmp5_)) {
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					break;
-#line 2046 "FSpotImporter.c"
+#line 2040 "FSpotImporter.c"
 				}
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp6_ = url;
@@ -2072,13 +2066,13 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 				_tmp10_ = idx;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp9_ > _tmp10_) {
-#line 2062 "FSpotImporter.c"
-					GString* _tmp11_ = NULL;
-					const gchar* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-					gint _tmp14_ = 0;
-					gchar* _tmp15_ = NULL;
-					gchar* _tmp16_ = NULL;
+#line 2056 "FSpotImporter.c"
+					GString* _tmp11_;
+					const gchar* _tmp12_;
+					gint _tmp13_;
+					gint _tmp14_;
+					gchar* _tmp15_;
+					gchar* _tmp16_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp11_ = builder;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2095,17 +2089,17 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					g_string_append (_tmp11_, _tmp16_);
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_free0 (_tmp16_);
-#line 2085 "FSpotImporter.c"
+#line 2079 "FSpotImporter.c"
 				}
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp17_ = cidx;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp17_ >= 0) {
-#line 2091 "FSpotImporter.c"
-					gint _tmp18_ = 0;
-					const gchar* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
-					gint _tmp21_ = 0;
+#line 2085 "FSpotImporter.c"
+					gint _tmp18_;
+					const gchar* _tmp19_;
+					gint _tmp20_;
+					gint _tmp21_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp18_ = cidx;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2116,19 +2110,19 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					_tmp21_ = _tmp20_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_tmp18_ < (_tmp21_ - 2)) {
-#line 2106 "FSpotImporter.c"
+#line 2100 "FSpotImporter.c"
 						gchar c1 = '\0';
-						const gchar* _tmp22_ = NULL;
-						gint _tmp23_ = 0;
-						gchar _tmp24_ = '\0';
+						const gchar* _tmp22_;
+						gint _tmp23_;
+						gchar _tmp24_;
 						gchar c2 = '\0';
-						const gchar* _tmp25_ = NULL;
-						gint _tmp26_ = 0;
-						gchar _tmp27_ = '\0';
+						const gchar* _tmp25_;
+						gint _tmp26_;
+						gchar _tmp27_;
 						gboolean _tmp28_ = FALSE;
-						gchar _tmp29_ = '\0';
-						gboolean _tmp30_ = FALSE;
-						gint _tmp39_ = 0;
+						gchar _tmp29_;
+						gboolean _tmp30_;
+						gint _tmp39_;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp22_ = url;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2151,31 +2145,31 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 						_tmp30_ = g_ascii_isxdigit (_tmp29_);
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (_tmp30_) {
-#line 2141 "FSpotImporter.c"
-							gchar _tmp31_ = '\0';
-							gboolean _tmp32_ = FALSE;
+#line 2135 "FSpotImporter.c"
+							gchar _tmp31_;
+							gboolean _tmp32_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp31_ = c1;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp32_ = g_ascii_isxdigit (_tmp31_);
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp28_ = _tmp32_;
-#line 2150 "FSpotImporter.c"
+#line 2144 "FSpotImporter.c"
 						} else {
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp28_ = FALSE;
-#line 2154 "FSpotImporter.c"
+#line 2148 "FSpotImporter.c"
 						}
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (_tmp28_) {
-#line 2158 "FSpotImporter.c"
+#line 2152 "FSpotImporter.c"
 							gint ccode = 0;
-							gchar _tmp33_ = '\0';
-							gint _tmp34_ = 0;
-							gchar _tmp35_ = '\0';
-							gint _tmp36_ = 0;
-							GString* _tmp37_ = NULL;
-							gint _tmp38_ = 0;
+							gchar _tmp33_;
+							gint _tmp34_;
+							gchar _tmp35_;
+							gint _tmp36_;
+							GString* _tmp37_;
+							gint _tmp38_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp33_ = c1;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2192,30 +2186,30 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 							_tmp38_ = ccode;
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							g_string_append_c (_tmp37_, (gchar) _tmp38_);
-#line 2182 "FSpotImporter.c"
+#line 2176 "FSpotImporter.c"
 						}
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp39_ = cidx;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						idx = _tmp39_ + 3;
-#line 2188 "FSpotImporter.c"
+#line 2182 "FSpotImporter.c"
 					} else {
-						gint _tmp40_ = 0;
+						gint _tmp40_;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp40_ = cidx;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						idx = _tmp40_ + 1;
-#line 2195 "FSpotImporter.c"
+#line 2189 "FSpotImporter.c"
 					}
 				} else {
-					GString* _tmp41_ = NULL;
-					const gchar* _tmp42_ = NULL;
-					gint _tmp43_ = 0;
-					gchar* _tmp44_ = NULL;
-					gchar* _tmp45_ = NULL;
-					const gchar* _tmp46_ = NULL;
-					gint _tmp47_ = 0;
-					gint _tmp48_ = 0;
+					GString* _tmp41_;
+					const gchar* _tmp42_;
+					gint _tmp43_;
+					gchar* _tmp44_;
+					gchar* _tmp45_;
+					const gchar* _tmp46_;
+					gint _tmp47_;
+					gint _tmp48_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp41_ = builder;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2238,7 +2232,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					_tmp48_ = _tmp47_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					idx = _tmp48_;
-#line 2228 "FSpotImporter.c"
+#line 2222 "FSpotImporter.c"
 				}
 			}
 		}
@@ -2255,7 +2249,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 	_g_string_free0 (builder);
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2245 "FSpotImporter.c"
+#line 2239 "FSpotImporter.c"
 }
 
 
@@ -2266,7 +2260,7 @@ static void data_imports_fspot_fspot_importable_item_class_init (DataImportsFSpo
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableItemPrivate));
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_item_finalize;
-#line 2256 "FSpotImporter.c"
+#line 2250 "FSpotImporter.c"
 }
 
 
@@ -2274,31 +2268,31 @@ static void data_imports_fspot_fspot_importable_item_spit_data_imports_importabl
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_tags = (SpitDataImportsImportableTag** (*)(SpitDataImportsImportableMediaItem*, int*)) data_imports_fspot_fspot_importable_item_real_get_tags;
+	iface->get_tags = (SpitDataImportsImportableTag** (*) (SpitDataImportsImportableMediaItem *, int*)) data_imports_fspot_fspot_importable_item_real_get_tags;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_event = (SpitDataImportsImportableEvent* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_event;
+	iface->get_event = (SpitDataImportsImportableEvent* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_event;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_folder_path = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_folder_path;
+	iface->get_folder_path = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_folder_path;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_filename = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_filename;
+	iface->get_filename = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_filename;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_title = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_title;
+	iface->get_title = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_title;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_rating = (SpitDataImportsImportableRating* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_rating;
+	iface->get_rating = (SpitDataImportsImportableRating* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_rating;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_exposure_time = (time_t* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_exposure_time;
-#line 2277 "FSpotImporter.c"
+	iface->get_exposure_time = (time_t* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_exposure_time;
+#line 2271 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_item_instance_init (DataImportsFSpotFSpotImportableItem * self) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_PRIVATE (self);
-#line 2284 "FSpotImporter.c"
+#line 2278 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableItem * self;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
@@ -2322,7 +2316,7 @@ static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) {
 	_g_free0 (self->priv->date_time);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_item_parent_class)->finalize (obj);
-#line 2312 "FSpotImporter.c"
+#line 2306 "FSpotImporter.c"
 }
 
 
@@ -2342,10 +2336,10 @@ GType data_imports_fspot_fspot_importable_item_get_type (void) {
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
 	DataImportsFSpotFSpotImportableTag * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
+	DataImportsFSpotFSpotImportableTag* _tmp2_;
+	DataImportsFSpotFSpotImportableTag* _tmp3_;
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2370,21 +2364,21 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_cons
 	self->priv->parent = _tmp3_;
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2360 "FSpotImporter.c"
+#line 2354 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_new (DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_tag_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, row, parent);
-#line 2367 "FSpotImporter.c"
+#line 2361 "FSpotImporter.c"
 }
 
 
 gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImportableTag* self) {
 	gint64 result = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	gint64 _tmp1_;
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), 0LL);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2395,16 +2389,16 @@ gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImpo
 	result = _tmp1_;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2385 "FSpotImporter.c"
+#line 2379 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImportsImportableTag* base) {
 	DataImportsFSpotFSpotImportableTag * self;
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2417,15 +2411,15 @@ static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImp
 	result = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2407 "FSpotImporter.c"
+#line 2401 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_real_get_parent (SpitDataImportsImportableTag* base) {
 	DataImportsFSpotFSpotImportableTag * self;
 	SpitDataImportsImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	SpitDataImportsImportableTag* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	SpitDataImportsImportableTag* _tmp1_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2436,14 +2430,14 @@ static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_rea
 	result = _tmp1_;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2426 "FSpotImporter.c"
+#line 2420 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_fspot_parent (DataImportsFSpotFSpotImportableTag* self) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	DataImportsFSpotFSpotImportableTag* _tmp1_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2454,15 +2448,15 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_
 	result = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2444 "FSpotImporter.c"
+#line 2438 "FSpotImporter.c"
 }
 
 
 gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotFSpotImportableTag* self) {
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2475,15 +2469,15 @@ gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotF
 	result = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2465 "FSpotImporter.c"
+#line 2459 "FSpotImporter.c"
 }
 
 
 gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpotImportableTag* self) {
 	gboolean result = FALSE;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), FALSE);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2496,14 +2490,14 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot
 	result = _tmp2_;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2486 "FSpotImporter.c"
+#line 2480 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self) {
 	DataImportsFSpotFSpotImportableEvent* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotFSpotImportableEvent* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2514,7 +2508,7 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to
 	result = _tmp1_;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2504 "FSpotImporter.c"
+#line 2498 "FSpotImporter.c"
 }
 
 
@@ -2525,7 +2519,7 @@ static void data_imports_fspot_fspot_importable_tag_class_init (DataImportsFSpot
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableTagPrivate));
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_tag_finalize;
-#line 2515 "FSpotImporter.c"
+#line 2509 "FSpotImporter.c"
 }
 
 
@@ -2533,21 +2527,21 @@ static void data_imports_fspot_fspot_importable_tag_spit_data_imports_importable
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = g_type_interface_peek_parent (iface);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_name;
+	iface->get_name = (gchar* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_name;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_parent = (SpitDataImportsImportableTag* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_parent;
-#line 2526 "FSpotImporter.c"
+	iface->get_parent = (SpitDataImportsImportableTag* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_parent;
+#line 2520 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_tag_instance_init (DataImportsFSpotFSpotImportableTag * self) {
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE (self);
-#line 2533 "FSpotImporter.c"
+#line 2527 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableTag * self;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
@@ -2557,7 +2551,7 @@ static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->parent);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_tag_parent_class)->finalize (obj);
-#line 2547 "FSpotImporter.c"
+#line 2541 "FSpotImporter.c"
 }
 
 
@@ -2577,8 +2571,8 @@ GType data_imports_fspot_fspot_importable_tag_get_type (void) {
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row) {
 	DataImportsFSpotFSpotImportableEvent * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2593,23 +2587,23 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_
 	self->priv->row = _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2583 "FSpotImporter.c"
+#line 2577 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row) {
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_event_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, row);
-#line 2590 "FSpotImporter.c"
+#line 2584 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base) {
 	DataImportsFSpotFSpotImportableEvent * self;
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2622,7 +2616,7 @@ static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataI
 	result = _tmp2_;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2612 "FSpotImporter.c"
+#line 2606 "FSpotImporter.c"
 }
 
 
@@ -2633,7 +2627,7 @@ static void data_imports_fspot_fspot_importable_event_class_init (DataImportsFSp
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableEventPrivate));
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_event_finalize;
-#line 2623 "FSpotImporter.c"
+#line 2617 "FSpotImporter.c"
 }
 
 
@@ -2641,19 +2635,19 @@ static void data_imports_fspot_fspot_importable_event_spit_data_imports_importab
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = g_type_interface_peek_parent (iface);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*)(SpitDataImportsImportableEvent*)) data_imports_fspot_fspot_importable_event_real_get_name;
-#line 2632 "FSpotImporter.c"
+	iface->get_name = (gchar* (*) (SpitDataImportsImportableEvent *)) data_imports_fspot_fspot_importable_event_real_get_name;
+#line 2626 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_event_instance_init (DataImportsFSpotFSpotImportableEvent * self) {
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE (self);
-#line 2639 "FSpotImporter.c"
+#line 2633 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableEvent * self;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
@@ -2661,7 +2655,7 @@ static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->row);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_event_parent_class)->finalize (obj);
-#line 2651 "FSpotImporter.c"
+#line 2645 "FSpotImporter.c"
 }
 
 
@@ -2681,8 +2675,8 @@ GType data_imports_fspot_fspot_importable_event_get_type (void) {
 
 DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_construct (GType object_type, gint rating_value) {
 	DataImportsFSpotFSpotImportableRating * self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp2_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = (DataImportsFSpotFSpotImportableRating*) g_object_new (object_type, NULL);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2691,16 +2685,16 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 	if (_tmp0_ < -1) {
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		rating_value = -1;
-#line 2681 "FSpotImporter.c"
+#line 2675 "FSpotImporter.c"
 	} else {
-		gint _tmp1_ = 0;
+		gint _tmp1_;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = rating_value;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (_tmp1_ > 5) {
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			rating_value = 5;
-#line 2690 "FSpotImporter.c"
+#line 2684 "FSpotImporter.c"
 		}
 	}
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2709,21 +2703,21 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 	self->priv->rating_value = _tmp2_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2699 "FSpotImporter.c"
+#line 2693 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_new (gint rating_value) {
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_rating_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, rating_value);
-#line 2706 "FSpotImporter.c"
+#line 2700 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2732,14 +2726,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (Spi
 	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2722 "FSpotImporter.c"
+#line 2716 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2748,14 +2742,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (Spit
 	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED;
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2738 "FSpotImporter.c"
+#line 2732 "FSpotImporter.c"
 }
 
 
 static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2764,7 +2758,7 @@ static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataI
 	result = _tmp0_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2754 "FSpotImporter.c"
+#line 2748 "FSpotImporter.c"
 }
 
 
@@ -2775,7 +2769,7 @@ static void data_imports_fspot_fspot_importable_rating_class_init (DataImportsFS
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableRatingPrivate));
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_rating_finalize;
-#line 2765 "FSpotImporter.c"
+#line 2759 "FSpotImporter.c"
 }
 
 
@@ -2783,29 +2777,29 @@ static void data_imports_fspot_fspot_importable_rating_spit_data_imports_importa
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = g_type_interface_peek_parent (iface);
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_rejected = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_rejected;
+	iface->is_rejected = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_rejected;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_unrated = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_unrated;
+	iface->is_unrated = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_unrated;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_value = (gint (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_get_value;
-#line 2778 "FSpotImporter.c"
+	iface->get_value = (gint (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_get_value;
+#line 2772 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_rating_instance_init (DataImportsFSpotFSpotImportableRating * self) {
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE (self);
-#line 2785 "FSpotImporter.c"
+#line 2779 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableRating * self;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_rating_parent_class)->finalize (obj);
-#line 2795 "FSpotImporter.c"
+#line 2789 "FSpotImporter.c"
 }
 
 
@@ -2826,7 +2820,7 @@ GType data_imports_fspot_fspot_importable_rating_get_type (void) {
 static gpointer _importable_database_table_ref0 (gpointer self) {
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self ? importable_database_table_ref (self) : NULL;
-#line 2816 "FSpotImporter.c"
+#line 2810 "FSpotImporter.c"
 }
 
 
@@ -2838,15 +2832,15 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return dup;
-#line 2828 "FSpotImporter.c"
+#line 2822 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (GType object_type, DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
 	DataImportsFSpotFSpotTagsCache * self = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagsTable* _tmp0_;
+	DataImportsFSpotDbFSpotTagsTable* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (tags_table), NULL);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2867,25 +2861,25 @@ DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (G
 	self->priv->tags_map = _tmp2_;
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2857 "FSpotImporter.c"
+#line 2851 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_new (DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_tags_cache_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, tags_table, error);
-#line 2864 "FSpotImporter.c"
+#line 2858 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
 	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gpointer _tmp3_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
+	GeeHashMap* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
+	gint64 _tmp2_;
+	gpointer _tmp3_;
+	DataImportsFSpotFSpotImportableTag* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
@@ -2909,20 +2903,20 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 		result = tag;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 2899 "FSpotImporter.c"
+#line 2893 "FSpotImporter.c"
 	} else {
 		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp5_ = NULL;
-		gint64 _tmp6_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp5_;
+		gint64 _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp9_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp10_ = NULL;
-		GeeHashMap* _tmp11_ = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL;
-		gint64 _tmp13_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp8_;
+		DataImportsFSpotFSpotImportableTag* _tmp9_;
+		DataImportsFSpotFSpotImportableTag* _tmp10_;
+		GeeHashMap* _tmp11_;
+		DataImportsFSpotDbFSpotTagRow* _tmp12_;
+		gint64 _tmp13_;
+		DataImportsFSpotFSpotImportableTag* _tmp14_;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag_row;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2941,7 +2935,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 				_g_object_unref0 (tag);
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 2931 "FSpotImporter.c"
+#line 2925 "FSpotImporter.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag);
@@ -2951,7 +2945,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 2941 "FSpotImporter.c"
+#line 2935 "FSpotImporter.c"
 			}
 		}
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2980,27 +2974,27 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 		_g_object_unref0 (tag);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 2970 "FSpotImporter.c"
+#line 2964 "FSpotImporter.c"
 	}
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (tag);
-#line 2974 "FSpotImporter.c"
+#line 2968 "FSpotImporter.c"
 }
 
 
 static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gpointer _tmp3_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
+	GeeHashMap* _tmp1_;
+	gint64 _tmp2_;
+	gpointer _tmp3_;
+	DataImportsFSpotFSpotImportableTag* _tmp4_;
 	DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp7_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotTagsTable* _tmp5_;
+	gint64 _tmp6_;
+	DataImportsFSpotDbFSpotTagRow* _tmp7_;
+	DataImportsFSpotDbFSpotTagRow* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
@@ -3012,7 +3006,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		result = NULL;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3002 "FSpotImporter.c"
+#line 2996 "FSpotImporter.c"
 	}
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp1_ = self->priv->tags_map;
@@ -3030,7 +3024,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		result = tag;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3020 "FSpotImporter.c"
+#line 3014 "FSpotImporter.c"
 	}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp5_ = self->priv->tags_table;
@@ -3050,7 +3044,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 			_g_object_unref0 (tag);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return NULL;
-#line 3040 "FSpotImporter.c"
+#line 3034 "FSpotImporter.c"
 		} else {
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (tag);
@@ -3060,25 +3054,25 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 			g_clear_error (&_inner_error_);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return NULL;
-#line 3050 "FSpotImporter.c"
+#line 3044 "FSpotImporter.c"
 		}
 	}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp8_ = tag_row;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp8_ != NULL) {
-#line 3057 "FSpotImporter.c"
+#line 3051 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp9_ = NULL;
-		gint64 _tmp10_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp11_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp9_;
+		gint64 _tmp10_;
+		DataImportsFSpotFSpotImportableTag* _tmp11_;
 		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp13_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL;
-		GeeHashMap* _tmp15_ = NULL;
-		gint64 _tmp16_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp17_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp12_;
+		DataImportsFSpotFSpotImportableTag* _tmp13_;
+		DataImportsFSpotFSpotImportableTag* _tmp14_;
+		GeeHashMap* _tmp15_;
+		gint64 _tmp16_;
+		DataImportsFSpotFSpotImportableTag* _tmp17_;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp9_ = tag_row;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3099,7 +3093,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 				_g_object_unref0 (tag);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 3089 "FSpotImporter.c"
+#line 3083 "FSpotImporter.c"
 			} else {
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag_row);
@@ -3111,7 +3105,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 				g_clear_error (&_inner_error_);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 3101 "FSpotImporter.c"
+#line 3095 "FSpotImporter.c"
 			}
 		}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3140,7 +3134,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		_g_object_unref0 (tag);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3130 "FSpotImporter.c"
+#line 3124 "FSpotImporter.c"
 	}
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = NULL;
@@ -3150,7 +3144,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 	_g_object_unref0 (tag);
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3140 "FSpotImporter.c"
+#line 3134 "FSpotImporter.c"
 }
 
 
@@ -3161,18 +3155,18 @@ static void data_imports_fspot_fspot_tags_cache_class_init (DataImportsFSpotFSpo
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotTagsCachePrivate));
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_tags_cache_finalize;
-#line 3151 "FSpotImporter.c"
+#line 3145 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_tags_cache_instance_init (DataImportsFSpotFSpotTagsCache * self) {
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_PRIVATE (self);
-#line 3158 "FSpotImporter.c"
+#line 3152 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj) {
 	DataImportsFSpotFSpotTagsCache * self;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCache);
@@ -3182,7 +3176,7 @@ static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->tags_map);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_tags_cache_parent_class)->finalize (obj);
-#line 3172 "FSpotImporter.c"
+#line 3166 "FSpotImporter.c"
 }
 
 
@@ -3200,8 +3194,8 @@ GType data_imports_fspot_fspot_tags_cache_get_type (void) {
 
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
 	DataImportsFSpotFSpotDataImporter * self = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	SpitDataImportsPluginHost* _tmp1_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	SpitDataImportsPluginHost* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3220,21 +3214,21 @@ DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_constr
 	self->priv->host = _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 3210 "FSpotImporter.c"
+#line 3204 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_data_importer_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, service, host);
-#line 3217 "FSpotImporter.c"
+#line 3211 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3243,15 +3237,15 @@ static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitData
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3233 "FSpotImporter.c"
+#line 3227 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_service (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
 	SpitDataImportsService* result = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	SpitDataImportsService* _tmp1_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	SpitDataImportsService* _tmp1_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3262,13 +3256,13 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s
 	result = _tmp1_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3252 "FSpotImporter.c"
+#line 3246 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3277,7 +3271,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa
 	if (_tmp0_) {
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3267 "FSpotImporter.c"
+#line 3261 "FSpotImporter.c"
 	}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_debug ("FSpotImporter.vala:347: FSpotDataImporter: starting interaction.");
@@ -3285,7 +3279,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa
 	self->priv->running = TRUE;
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (self);
-#line 3275 "FSpotImporter.c"
+#line 3269 "FSpotImporter.c"
 }
 
 
@@ -3297,69 +3291,69 @@ static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDat
 	g_debug ("FSpotImporter.vala:355: FSpotDataImporter: stopping interaction.");
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv->running = FALSE;
-#line 3287 "FSpotImporter.c"
+#line 3281 "FSpotImporter.c"
 }
 
 
 /**
      * Action that discovers importable libraries based on standard locations.
      */
-static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value) {
+static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value) {
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableLibrary*, *array, (*size) + 1);
-#line 3301 "FSpotImporter.c"
+#line 3295 "FSpotImporter.c"
 	}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3307 "FSpotImporter.c"
+#line 3301 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self) {
 	SpitDataImportsImportableLibrary** discovered_libraries = NULL;
-	SpitDataImportsImportableLibrary** _tmp0_ = NULL;
-	gint discovered_libraries_length1 = 0;
-	gint _discovered_libraries_size_ = 0;
+	SpitDataImportsImportableLibrary** _tmp0_;
+	gint discovered_libraries_length1;
+	gint _discovered_libraries_size_;
 	GFile** db_files = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
-	GFile** _tmp21_ = NULL;
-	GFile** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gint db_files_length1 = 0;
-	gint _db_files_size_ = 0;
-	GFile** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	const gchar* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	const gchar* _tmp15_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	GFile* _tmp18_;
+	GFile* _tmp19_;
+	GFile* _tmp20_;
+	GFile** _tmp21_;
+	GFile** _tmp22_;
+	gint _tmp22__length1;
+	gint db_files_length1;
+	gint _db_files_size_;
+	GFile** _tmp23_;
+	gint _tmp23__length1;
 	const gchar* _tmp33_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	SpitDataImportsPluginHost* _tmp35_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
+	SpitDataImportsImportableLibrary** _tmp34_;
+	gint _tmp34__length1;
+	SpitDataImportsPluginHost* _tmp35_;
+	SpitDataImportsImportableLibrary** _tmp36_;
+	gint _tmp36__length1;
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3446,7 +3440,7 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	_tmp23_ = db_files;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp23__length1 = db_files_length1;
-#line 3436 "FSpotImporter.c"
+#line 3430 "FSpotImporter.c"
 	{
 		GFile** db_file_collection = NULL;
 		gint db_file_collection_length1 = 0;
@@ -3458,31 +3452,31 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 		db_file_collection_length1 = _tmp23__length1;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		for (db_file_it = 0; db_file_it < _tmp23__length1; db_file_it = db_file_it + 1) {
-#line 3448 "FSpotImporter.c"
-			GFile* _tmp24_ = NULL;
+#line 3442 "FSpotImporter.c"
+			GFile* _tmp24_;
 			GFile* db_file = NULL;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp24_ = _g_object_ref0 (db_file_collection[db_file_it]);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			db_file = _tmp24_;
-#line 3455 "FSpotImporter.c"
+#line 3449 "FSpotImporter.c"
 			{
-				GFile* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
+				GFile* _tmp25_;
+				gboolean _tmp26_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp25_ = db_file;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp26_ = g_file_query_exists (_tmp25_, NULL);
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp26_) {
-#line 3465 "FSpotImporter.c"
-					SpitDataImportsImportableLibrary** _tmp27_ = NULL;
-					gint _tmp27__length1 = 0;
-					GFile* _tmp28_ = NULL;
-					DataImportsFSpotFSpotImportableLibrary* _tmp29_ = NULL;
-					GFile* _tmp30_ = NULL;
-					gchar* _tmp31_ = NULL;
-					gchar* _tmp32_ = NULL;
+#line 3459 "FSpotImporter.c"
+					SpitDataImportsImportableLibrary** _tmp27_;
+					gint _tmp27__length1;
+					GFile* _tmp28_;
+					DataImportsFSpotFSpotImportableLibrary* _tmp29_;
+					GFile* _tmp30_;
+					gchar* _tmp31_;
+					gchar* _tmp32_;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp27_ = discovered_libraries;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3503,11 +3497,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 					g_message ("FSpotImporter.vala:384: Discovered importable library: %s", _tmp32_);
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_free0 (_tmp32_);
-#line 3493 "FSpotImporter.c"
+#line 3487 "FSpotImporter.c"
 				}
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (db_file);
-#line 3497 "FSpotImporter.c"
+#line 3491 "FSpotImporter.c"
 			}
 		}
 	}
@@ -3519,11 +3513,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	if (_tmp34__length1 > 0) {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE;
-#line 3509 "FSpotImporter.c"
+#line 3503 "FSpotImporter.c"
 	} else {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE_FILE_ONLY;
-#line 3513 "FSpotImporter.c"
+#line 3507 "FSpotImporter.c"
 	}
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp35_ = self->priv->host;
@@ -3537,15 +3531,15 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	db_files = (_vala_array_free (db_files, db_files_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	discovered_libraries = (_vala_array_free (discovered_libraries, discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3527 "FSpotImporter.c"
+#line 3521 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library) {
 	DataImportsFSpotFSpotDataImporter * self;
-	SpitDataImportsImportableLibrary* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	SpitDataImportsImportableLibrary* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3560,82 +3554,82 @@ static void data_imports_fspot_fspot_data_importer_real_on_library_selected (Spi
 	spit_data_imports_data_importer_on_file_selected (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter), _tmp2_);
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3550 "FSpotImporter.c"
+#line 3544 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) {
+static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) {
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (DataImportsFSpotFSpotImportableTag*, *array, (*size) + 1);
-#line 3561 "FSpotImporter.c"
+#line 3555 "FSpotImporter.c"
 	}
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3567 "FSpotImporter.c"
+#line 3561 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3578 "FSpotImporter.c"
+#line 3572 "FSpotImporter.c"
 	}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3584 "FSpotImporter.c"
+#line 3578 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3595 "FSpotImporter.c"
+#line 3589 "FSpotImporter.c"
 	}
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3601 "FSpotImporter.c"
+#line 3595 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3612 "FSpotImporter.c"
+#line 3606 "FSpotImporter.c"
 	}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3618 "FSpotImporter.c"
+#line 3612 "FSpotImporter.c"
 }
 
 
 static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self) {
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_on_imported_items_count ((DataImportsFSpotFSpotDataImporter*) self, imported_items_count);
-#line 3625 "FSpotImporter.c"
+#line 3619 "FSpotImporter.c"
 }
 
 
@@ -3647,12 +3641,11 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 	gdouble progress_delta_per_photo = 0.0;
 	gdouble progress_plugin_to_host_ratio = 0.0;
 	gdouble current_progress = 0.0;
-	SpitDataImportsPluginHost* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GeeArrayList* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	SpitDataImportsPluginHost* _tmp173_ = NULL;
+	SpitDataImportsPluginHost* _tmp24_;
+	GeeArrayList* _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	SpitDataImportsPluginHost* _tmp172_;
 	GError * _inner_error_ = NULL;
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
@@ -3664,12 +3657,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 	progress_plugin_to_host_ratio = 0.5;
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	current_progress = 0.0;
-#line 3654 "FSpotImporter.c"
+#line 3647 "FSpotImporter.c"
 	{
 		DataImportsFSpotDbFSpotDatabase* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp2_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp3_ = NULL;
+		GFile* _tmp1_;
+		DataImportsFSpotDbFSpotDatabase* _tmp2_;
+		DataImportsFSpotDbFSpotDatabase* _tmp3_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = file;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3680,12 +3673,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3670 "FSpotImporter.c"
+#line 3663 "FSpotImporter.c"
 				goto __catch0_database_error;
 			}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) {
-#line 3675 "FSpotImporter.c"
+#line 3668 "FSpotImporter.c"
 				goto __catch0_spit_data_imports_data_import_error;
 			}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3700,7 +3693,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3690 "FSpotImporter.c"
+#line 3683 "FSpotImporter.c"
 		}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp3_ = _tmp0_;
@@ -3712,17 +3705,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		database = _tmp3_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3702 "FSpotImporter.c"
+#line 3695 "FSpotImporter.c"
 	}
 	goto __finally0;
 	__catch0_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		SpitDataImportsPluginHost* _tmp8_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		SpitDataImportsPluginHost* _tmp8_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3753,17 +3746,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3743 "FSpotImporter.c"
+#line 3736 "FSpotImporter.c"
 	}
 	goto __finally0;
 	__catch0_spit_data_imports_data_import_error:
 	{
 		GError* e = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		SpitDataImportsPluginHost* _tmp13_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		SpitDataImportsPluginHost* _tmp13_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3794,7 +3787,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3784 "FSpotImporter.c"
+#line 3777 "FSpotImporter.c"
 	}
 	__finally0:
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3811,14 +3804,14 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3801 "FSpotImporter.c"
+#line 3794 "FSpotImporter.c"
 	}
 	{
 		DataImportsFSpotFSpotTagsCache* _tmp14_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotTagsTable* _tmp16_ = NULL;
-		DataImportsFSpotFSpotTagsCache* _tmp17_ = NULL;
-		DataImportsFSpotFSpotTagsCache* _tmp18_ = NULL;
+		DataImportsFSpotDbFSpotDatabase* _tmp15_;
+		DataImportsFSpotDbFSpotTagsTable* _tmp16_;
+		DataImportsFSpotFSpotTagsCache* _tmp17_;
+		DataImportsFSpotFSpotTagsCache* _tmp18_;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp15_ = database;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3831,7 +3824,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3821 "FSpotImporter.c"
+#line 3814 "FSpotImporter.c"
 				goto __catch1_database_error;
 			}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3846,7 +3839,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3836 "FSpotImporter.c"
+#line 3829 "FSpotImporter.c"
 		}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp18_ = _tmp14_;
@@ -3858,17 +3851,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		tags_cache = _tmp18_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_tmp14_);
-#line 3848 "FSpotImporter.c"
+#line 3841 "FSpotImporter.c"
 	}
 	goto __finally1;
 	__catch1_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		SpitDataImportsPluginHost* _tmp23_ = NULL;
+		GError* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		SpitDataImportsPluginHost* _tmp23_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3899,7 +3892,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3889 "FSpotImporter.c"
+#line 3882 "FSpotImporter.c"
 	}
 	__finally1:
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3916,34 +3909,32 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3906 "FSpotImporter.c"
+#line 3899 "FSpotImporter.c"
 	}
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp24_ = self->priv->host;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp25_ = _ ("Preparing to import");
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _tmp25_);
-#line 3914 "FSpotImporter.c"
+	spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _ ("Preparing to import"));
+#line 3905 "FSpotImporter.c"
 	{
-		GeeArrayList* _tmp26_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotosTable* _tmp28_ = NULL;
-		GeeArrayList* _tmp29_ = NULL;
-		GeeArrayList* _tmp30_ = NULL;
+		GeeArrayList* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotDatabase* _tmp26_;
+		DataImportsFSpotDbFSpotPhotosTable* _tmp27_;
+		GeeArrayList* _tmp28_;
+		GeeArrayList* _tmp29_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp27_ = database;
+		_tmp26_ = database;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp28_ = _tmp27_->photos_table;
+		_tmp27_ = _tmp26_->photos_table;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp29_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp28_, &_inner_error_);
+		_tmp28_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp27_, &_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = _tmp29_;
+		_tmp25_ = _tmp28_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3933 "FSpotImporter.c"
+#line 3924 "FSpotImporter.c"
 				goto __catch2_database_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3958,49 +3949,49 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3948 "FSpotImporter.c"
+#line 3939 "FSpotImporter.c"
 		}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp30_ = _tmp26_;
+		_tmp29_ = _tmp25_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = NULL;
+		_tmp25_ = NULL;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (all_photos);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		all_photos = _tmp30_;
+		all_photos = _tmp29_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp26_);
-#line 3960 "FSpotImporter.c"
+		_g_object_unref0 (_tmp25_);
+#line 3951 "FSpotImporter.c"
 	}
 	goto __finally2;
 	__catch2_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
-		SpitDataImportsPluginHost* _tmp35_ = NULL;
+		GError* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		SpitDataImportsPluginHost* _tmp34_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_inner_error_ = NULL;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp31_ = e;
+		_tmp30_ = e;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp32_ = _tmp31_->message;
+		_tmp31_ = _tmp30_->message;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp33_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp32_);
+		_tmp32_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp31_);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp34_ = _tmp33_;
+		_tmp33_ = _tmp32_;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:428: %s", _tmp34_);
+		g_debug ("FSpotImporter.vala:428: %s", _tmp33_);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp34_);
+		_g_free0 (_tmp33_);
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp35_ = self->priv->host;
+		_tmp34_ = self->priv->host;
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp35_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE);
+		spit_data_imports_plugin_host_post_error_message (_tmp34_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_error_free0 (e);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4011,7 +4002,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 4001 "FSpotImporter.c"
+#line 3992 "FSpotImporter.c"
 	}
 	__finally2:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4028,108 +4019,108 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 4018 "FSpotImporter.c"
+#line 4009 "FSpotImporter.c"
 	}
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp36_ = all_photos;
+	_tmp35_ = all_photos;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp38_ = _tmp37_;
+	_tmp37_ = _tmp36_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp38_ > 0) {
-#line 4028 "FSpotImporter.c"
-		GeeArrayList* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
+	if (_tmp37_ > 0) {
+#line 4019 "FSpotImporter.c"
+		GeeArrayList* _tmp38_;
+		gint _tmp39_;
+		gint _tmp40_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp39_ = all_photos;
+		_tmp38_ = all_photos;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp41_ = _tmp40_;
+		_tmp40_ = _tmp39_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		progress_delta_per_photo = 1.0 / _tmp41_;
-#line 4040 "FSpotImporter.c"
+		progress_delta_per_photo = 1.0 / _tmp40_;
+#line 4031 "FSpotImporter.c"
 	}
 	{
 		GeeArrayList* _photo_row_list = NULL;
-		GeeArrayList* _tmp42_ = NULL;
-		GeeArrayList* _tmp43_ = NULL;
+		GeeArrayList* _tmp41_;
+		GeeArrayList* _tmp42_;
 		gint _photo_row_size = 0;
-		GeeArrayList* _tmp44_ = NULL;
-		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
+		GeeArrayList* _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
 		gint _photo_row_index = 0;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp42_ = all_photos;
+		_tmp41_ = all_photos;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp43_ = _g_object_ref0 (_tmp42_);
+		_tmp42_ = _g_object_ref0 (_tmp41_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_list = _tmp43_;
+		_photo_row_list = _tmp42_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp44_ = _photo_row_list;
+		_tmp43_ = _photo_row_list;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp44_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp46_ = _tmp45_;
+		_tmp45_ = _tmp44_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_size = _tmp46_;
+		_photo_row_size = _tmp45_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_photo_row_index = -1;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		while (TRUE) {
-#line 4069 "FSpotImporter.c"
-			gint _tmp47_ = 0;
-			gint _tmp48_ = 0;
-			gint _tmp49_ = 0;
+#line 4060 "FSpotImporter.c"
+			gint _tmp46_;
+			gint _tmp47_;
+			gint _tmp48_;
 			DataImportsFSpotDbFSpotPhotoRow* photo_row = NULL;
-			GeeArrayList* _tmp50_ = NULL;
-			gint _tmp51_ = 0;
-			gpointer _tmp52_ = NULL;
+			GeeArrayList* _tmp49_;
+			gint _tmp50_;
+			gpointer _tmp51_;
 			gboolean hidden = FALSE;
 			gboolean favorite = FALSE;
 			DataImportsFSpotFSpotImportableTag** tags = NULL;
-			DataImportsFSpotFSpotImportableTag** _tmp53_ = NULL;
-			gint tags_length1 = 0;
-			gint _tags_size_ = 0;
+			DataImportsFSpotFSpotImportableTag** _tmp52_;
+			gint tags_length1;
+			gint _tags_size_;
 			DataImportsFSpotFSpotImportableEvent* event = NULL;
 			DataImportsFSpotDbFSpotRollRow* roll_row = NULL;
 			SpitDataImportsImportableMediaItem** importable_items = NULL;
-			SpitDataImportsImportableMediaItem** _tmp97_ = NULL;
-			gint importable_items_length1 = 0;
-			gint _importable_items_size_ = 0;
-			gboolean _tmp161_ = FALSE;
+			SpitDataImportsImportableMediaItem** _tmp96_;
+			gint importable_items_length1;
+			gint _importable_items_size_;
+			gboolean _tmp160_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp47_ = _photo_row_index;
+			_tmp46_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_photo_row_index = _tmp47_ + 1;
+			_photo_row_index = _tmp46_ + 1;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp48_ = _photo_row_index;
+			_tmp47_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp49_ = _photo_row_size;
+			_tmp48_ = _photo_row_size;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (!(_tmp48_ < _tmp49_)) {
+			if (!(_tmp47_ < _tmp48_)) {
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				break;
-#line 4102 "FSpotImporter.c"
+#line 4093 "FSpotImporter.c"
 			}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp50_ = _photo_row_list;
+			_tmp49_ = _photo_row_list;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp51_ = _photo_row_index;
+			_tmp50_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp52_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_);
+			_tmp51_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp50_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp52_;
+			photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp51_;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			hidden = FALSE;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			favorite = FALSE;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp53_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1);
+			_tmp52_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tags = _tmp53_;
+			tags = _tmp52_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			tags_length1 = 0;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4138,31 +4129,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			event = NULL;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			roll_row = NULL;
-#line 4128 "FSpotImporter.c"
+#line 4119 "FSpotImporter.c"
 			{
-				GeeArrayList* _tmp54_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp55_ = NULL;
-				DataImportsFSpotDbFSpotTagsTable* _tmp56_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp57_ = NULL;
-				gint64 _tmp58_ = 0LL;
-				GeeArrayList* _tmp59_ = NULL;
+				GeeArrayList* _tmp53_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp54_;
+				DataImportsFSpotDbFSpotTagsTable* _tmp55_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp56_;
+				gint64 _tmp57_;
+				GeeArrayList* _tmp58_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp55_ = database;
+				_tmp54_ = database;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp56_ = _tmp55_->tags_table;
+				_tmp55_ = _tmp54_->tags_table;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp57_ = photo_row;
+				_tmp56_ = photo_row;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp58_ = _tmp57_->photo_id;
+				_tmp57_ = _tmp56_->photo_id;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp59_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp56_, _tmp58_, &_inner_error_);
+				_tmp58_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp55_, _tmp57_, &_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp54_ = _tmp59_;
+				_tmp53_ = _tmp58_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4152 "FSpotImporter.c"
+#line 4143 "FSpotImporter.c"
 						goto __catch3_database_error;
 					}
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4187,80 +4178,78 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4177 "FSpotImporter.c"
+#line 4168 "FSpotImporter.c"
 				}
 				{
 					GeeArrayList* _tag_row_list = NULL;
-					GeeArrayList* _tmp60_ = NULL;
+					GeeArrayList* _tmp59_;
 					gint _tag_row_size = 0;
-					GeeArrayList* _tmp61_ = NULL;
-					gint _tmp62_ = 0;
-					gint _tmp63_ = 0;
+					GeeArrayList* _tmp60_;
+					gint _tmp61_;
+					gint _tmp62_;
 					gint _tag_row_index = 0;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp60_ = _tmp54_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp54_ = NULL;
+					_tmp59_ = _g_object_ref0 (_tmp53_);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_list = _tmp60_;
+					_tag_row_list = _tmp59_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp61_ = _tag_row_list;
+					_tmp60_ = _tag_row_list;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp61_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp63_ = _tmp62_;
+					_tmp62_ = _tmp61_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_size = _tmp63_;
+					_tag_row_size = _tmp62_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tag_row_index = -1;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					while (TRUE) {
-#line 4205 "FSpotImporter.c"
-						gint _tmp64_ = 0;
-						gint _tmp65_ = 0;
-						gint _tmp66_ = 0;
+#line 4194 "FSpotImporter.c"
+						gint _tmp63_;
+						gint _tmp64_;
+						gint _tmp65_;
 						DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-						GeeArrayList* _tmp67_ = NULL;
-						gint _tmp68_ = 0;
-						gpointer _tmp69_ = NULL;
+						GeeArrayList* _tmp66_;
+						gint _tmp67_;
+						gpointer _tmp68_;
 						DataImportsFSpotFSpotImportableTag* tag = NULL;
-						DataImportsFSpotFSpotTagsCache* _tmp70_ = NULL;
-						DataImportsFSpotDbFSpotTagRow* _tmp71_ = NULL;
-						DataImportsFSpotFSpotImportableTag* _tmp72_ = NULL;
-						DataImportsFSpotFSpotImportableTag* _tmp73_ = NULL;
-						DataImportsFSpotDbFSpotDatabase* _tmp74_ = NULL;
-						gint64 _tmp75_ = 0LL;
-						gboolean _tmp76_ = FALSE;
+						DataImportsFSpotFSpotTagsCache* _tmp69_;
+						DataImportsFSpotDbFSpotTagRow* _tmp70_;
+						DataImportsFSpotFSpotImportableTag* _tmp71_;
+						DataImportsFSpotFSpotImportableTag* _tmp72_;
+						DataImportsFSpotDbFSpotDatabase* _tmp73_;
+						gint64 _tmp74_;
+						gboolean _tmp75_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp64_ = _tag_row_index;
+						_tmp63_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tag_row_index = _tmp64_ + 1;
+						_tag_row_index = _tmp63_ + 1;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp65_ = _tag_row_index;
+						_tmp64_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp66_ = _tag_row_size;
+						_tmp65_ = _tag_row_size;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp65_ < _tmp66_)) {
+						if (!(_tmp64_ < _tmp65_)) {
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							break;
-#line 4233 "FSpotImporter.c"
+#line 4222 "FSpotImporter.c"
 						}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp67_ = _tag_row_list;
+						_tmp66_ = _tag_row_list;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp68_ = _tag_row_index;
+						_tmp67_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp69_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp68_);
+						_tmp68_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp67_);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp69_;
+						tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp68_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp70_ = tags_cache;
+						_tmp69_ = tags_cache;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp71_ = tag_row;
+						_tmp70_ = tag_row;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp72_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp70_, _tmp71_, &_inner_error_);
+						_tmp71_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp69_, _tmp70_, &_inner_error_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag = _tmp72_;
+						tag = _tmp71_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4268,10 +4257,10 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (_tag_row_list);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp54_);
+							_g_object_unref0 (_tmp53_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4261 "FSpotImporter.c"
+#line 4250 "FSpotImporter.c"
 								goto __catch3_database_error;
 							}
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4279,7 +4268,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (_tag_row_list);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp54_);
+							_g_object_unref0 (_tmp53_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (roll_row);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4302,90 +4291,90 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 							g_clear_error (&_inner_error_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							return;
-#line 4292 "FSpotImporter.c"
+#line 4281 "FSpotImporter.c"
 						}
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp73_ = tag;
+						_tmp72_ = tag;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp74_ = database;
+						_tmp73_ = database;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp75_ = _tmp74_->hidden_tag_id;
+						_tmp74_ = _tmp73_->hidden_tag_id;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp76_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp73_, _tmp75_);
+						_tmp75_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp72_, _tmp74_);
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp76_) {
+						if (_tmp75_) {
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							hidden = TRUE;
-#line 4306 "FSpotImporter.c"
+#line 4295 "FSpotImporter.c"
 						} else {
-							DataImportsFSpotFSpotImportableTag* _tmp77_ = NULL;
-							gboolean _tmp78_ = FALSE;
+							DataImportsFSpotFSpotImportableTag* _tmp76_;
+							gboolean _tmp77_;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp77_ = tag;
+							_tmp76_ = tag;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp78_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp77_);
+							_tmp77_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp76_);
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							if (_tmp78_) {
+							if (_tmp77_) {
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 								favorite = TRUE;
-#line 4318 "FSpotImporter.c"
+#line 4307 "FSpotImporter.c"
 							} else {
-								DataImportsFSpotFSpotImportableTag** _tmp79_ = NULL;
-								gint _tmp79__length1 = 0;
-								DataImportsFSpotFSpotImportableTag* _tmp80_ = NULL;
-								DataImportsFSpotFSpotImportableTag* _tmp81_ = NULL;
+								DataImportsFSpotFSpotImportableTag** _tmp78_;
+								gint _tmp78__length1;
+								DataImportsFSpotFSpotImportableTag* _tmp79_;
+								DataImportsFSpotFSpotImportableTag* _tmp80_;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp79_ = tags;
+								_tmp78_ = tags;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp79__length1 = tags_length1;
+								_tmp78__length1 = tags_length1;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp80_ = tag;
+								_tmp79_ = tag;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp81_ = _g_object_ref0 (_tmp80_);
+								_tmp80_ = _g_object_ref0 (_tmp79_);
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp81_);
-#line 4334 "FSpotImporter.c"
+								_vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp80_);
+#line 4323 "FSpotImporter.c"
 							}
 						}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (tag);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (tag_row);
-#line 4341 "FSpotImporter.c"
+#line 4330 "FSpotImporter.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_object_unref0 (_tag_row_list);
-#line 4345 "FSpotImporter.c"
+#line 4334 "FSpotImporter.c"
 				}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp54_);
-#line 4349 "FSpotImporter.c"
+				_g_object_unref0 (_tmp53_);
+#line 4338 "FSpotImporter.c"
 			}
 			goto __finally3;
 			__catch3_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp82_ = NULL;
-				gint64 _tmp83_ = 0LL;
-				GError* _tmp84_ = NULL;
-				const gchar* _tmp85_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp81_;
+				gint64 _tmp82_;
+				GError* _tmp83_;
+				const gchar* _tmp84_;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp82_ = photo_row;
+				_tmp81_ = photo_row;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp83_ = _tmp82_->photo_id;
+				_tmp82_ = _tmp81_->photo_id;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp84_ = e;
+				_tmp83_ = e;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp85_ = _tmp84_->message;
+				_tmp84_ = _tmp83_->message;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp83_, _tmp85_);
+				g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp82_, _tmp84_);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4375 "FSpotImporter.c"
+#line 4364 "FSpotImporter.c"
 			}
 			__finally3:
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4412,33 +4401,33 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4402 "FSpotImporter.c"
+#line 4391 "FSpotImporter.c"
 			}
 			{
-				DataImportsFSpotDbFSpotRollRow* _tmp86_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp87_ = NULL;
-				DataImportsFSpotDbFSpotRollsTable* _tmp88_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp89_ = NULL;
-				gint64 _tmp90_ = 0LL;
-				DataImportsFSpotDbFSpotRollRow* _tmp91_ = NULL;
-				DataImportsFSpotDbFSpotRollRow* _tmp92_ = NULL;
+				DataImportsFSpotDbFSpotRollRow* _tmp85_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp86_;
+				DataImportsFSpotDbFSpotRollsTable* _tmp87_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp88_;
+				gint64 _tmp89_;
+				DataImportsFSpotDbFSpotRollRow* _tmp90_;
+				DataImportsFSpotDbFSpotRollRow* _tmp91_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp87_ = database;
+				_tmp86_ = database;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp88_ = _tmp87_->rolls_table;
+				_tmp87_ = _tmp86_->rolls_table;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp89_ = photo_row;
+				_tmp88_ = photo_row;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp90_ = _tmp89_->roll_id;
+				_tmp89_ = _tmp88_->roll_id;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp91_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp88_, _tmp90_, &_inner_error_);
+				_tmp90_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp87_, _tmp89_, &_inner_error_);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp86_ = _tmp91_;
+				_tmp85_ = _tmp90_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4428 "FSpotImporter.c"
+#line 4417 "FSpotImporter.c"
 						goto __catch4_database_error;
 					}
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4463,45 +4452,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4453 "FSpotImporter.c"
+#line 4442 "FSpotImporter.c"
 				}
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp92_ = _tmp86_;
+				_tmp91_ = _tmp85_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp86_ = NULL;
+				_tmp85_ = NULL;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (roll_row);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				roll_row = _tmp92_;
+				roll_row = _tmp91_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp86_);
-#line 4465 "FSpotImporter.c"
+				_g_object_unref0 (_tmp85_);
+#line 4454 "FSpotImporter.c"
 			}
 			goto __finally4;
 			__catch4_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp93_ = NULL;
-				gint64 _tmp94_ = 0LL;
-				GError* _tmp95_ = NULL;
-				const gchar* _tmp96_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp92_;
+				gint64 _tmp93_;
+				GError* _tmp94_;
+				const gchar* _tmp95_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp93_ = photo_row;
+				_tmp92_ = photo_row;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp94_ = _tmp93_->photo_id;
+				_tmp93_ = _tmp92_->photo_id;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp95_ = e;
+				_tmp94_ = e;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp96_ = _tmp95_->message;
+				_tmp95_ = _tmp94_->message;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp94_, _tmp96_);
+				g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp93_, _tmp95_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4491 "FSpotImporter.c"
+#line 4480 "FSpotImporter.c"
 			}
 			__finally4:
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4528,45 +4517,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4518 "FSpotImporter.c"
+#line 4507 "FSpotImporter.c"
 			}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp97_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1);
+			_tmp96_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			importable_items = _tmp97_;
+			importable_items = _tmp96_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			importable_items_length1 = 0;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_importable_items_size_ = importable_items_length1;
-#line 4528 "FSpotImporter.c"
+#line 4517 "FSpotImporter.c"
 			{
 				GeeArrayList* photo_versions = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp98_ = NULL;
-				DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp99_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp100_ = NULL;
-				gint64 _tmp101_ = 0LL;
-				GeeArrayList* _tmp102_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp97_;
+				DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp98_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp99_;
+				gint64 _tmp100_;
+				GeeArrayList* _tmp101_;
 				gboolean photo_versions_added = FALSE;
 				gboolean photo_versions_skipped = FALSE;
-				gboolean _tmp128_ = FALSE;
-				gboolean _tmp129_ = FALSE;
+				gboolean _tmp127_ = FALSE;
+				gboolean _tmp128_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp98_ = database;
+				_tmp97_ = database;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp99_ = _tmp98_->photo_versions_table;
+				_tmp98_ = _tmp97_->photo_versions_table;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp100_ = photo_row;
+				_tmp99_ = photo_row;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp101_ = _tmp100_->photo_id;
+				_tmp100_ = _tmp99_->photo_id;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp102_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp99_, _tmp101_, &_inner_error_);
+				_tmp101_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp98_, _tmp100_, &_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				photo_versions = _tmp102_;
+				photo_versions = _tmp101_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4556 "FSpotImporter.c"
+#line 4545 "FSpotImporter.c"
 						goto __catch5_database_error;
 					}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4593,319 +4582,319 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4583 "FSpotImporter.c"
+#line 4572 "FSpotImporter.c"
 				}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				photo_versions_added = FALSE;
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				photo_versions_skipped = FALSE;
-#line 4589 "FSpotImporter.c"
+#line 4578 "FSpotImporter.c"
 				{
 					GeeArrayList* _photo_version_row_list = NULL;
-					GeeArrayList* _tmp103_ = NULL;
-					GeeArrayList* _tmp104_ = NULL;
+					GeeArrayList* _tmp102_;
+					GeeArrayList* _tmp103_;
 					gint _photo_version_row_size = 0;
-					GeeArrayList* _tmp105_ = NULL;
-					gint _tmp106_ = 0;
-					gint _tmp107_ = 0;
+					GeeArrayList* _tmp104_;
+					gint _tmp105_;
+					gint _tmp106_;
 					gint _photo_version_row_index = 0;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp103_ = photo_versions;
+					_tmp102_ = photo_versions;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp104_ = _g_object_ref0 (_tmp103_);
+					_tmp103_ = _g_object_ref0 (_tmp102_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_list = _tmp104_;
+					_photo_version_row_list = _tmp103_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp105_ = _photo_version_row_list;
+					_tmp104_ = _photo_version_row_list;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp107_ = _tmp106_;
+					_tmp106_ = _tmp105_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_size = _tmp107_;
+					_photo_version_row_size = _tmp106_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_photo_version_row_index = -1;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					while (TRUE) {
-#line 4617 "FSpotImporter.c"
-						gint _tmp108_ = 0;
-						gint _tmp109_ = 0;
-						gint _tmp110_ = 0;
+#line 4606 "FSpotImporter.c"
+						gint _tmp107_;
+						gint _tmp108_;
+						gint _tmp109_;
 						DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row = NULL;
-						GeeArrayList* _tmp111_ = NULL;
-						gint _tmp112_ = 0;
-						gpointer _tmp113_ = NULL;
-						gboolean _tmp114_ = FALSE;
-						DataImportsFSpotDbFSpotPhotoVersionRow* _tmp115_ = NULL;
-						GFile* _tmp116_ = NULL;
+						GeeArrayList* _tmp110_;
+						gint _tmp111_;
+						gpointer _tmp112_;
+						gboolean _tmp113_ = FALSE;
+						DataImportsFSpotDbFSpotPhotoVersionRow* _tmp114_;
+						GFile* _tmp115_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp108_ = _photo_version_row_index;
+						_tmp107_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_photo_version_row_index = _tmp108_ + 1;
+						_photo_version_row_index = _tmp107_ + 1;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp109_ = _photo_version_row_index;
+						_tmp108_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp110_ = _photo_version_row_size;
+						_tmp109_ = _photo_version_row_size;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp109_ < _tmp110_)) {
+						if (!(_tmp108_ < _tmp109_)) {
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							break;
-#line 4640 "FSpotImporter.c"
+#line 4629 "FSpotImporter.c"
 						}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp111_ = _photo_version_row_list;
+						_tmp110_ = _photo_version_row_list;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp112_ = _photo_version_row_index;
+						_tmp111_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp113_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp112_);
+						_tmp112_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp111_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp113_;
+						photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp112_;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp115_ = photo_version_row;
+						_tmp114_ = photo_version_row;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp116_ = _tmp115_->base_path;
+						_tmp115_ = _tmp114_->base_path;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp116_ != NULL) {
-#line 4656 "FSpotImporter.c"
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp117_ = NULL;
-							const gchar* _tmp118_ = NULL;
+						if (_tmp115_ != NULL) {
+#line 4645 "FSpotImporter.c"
+							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp116_;
+							const gchar* _tmp117_;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp117_ = photo_version_row;
+							_tmp116_ = photo_version_row;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp118_ = _tmp117_->filename;
+							_tmp117_ = _tmp116_->filename;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp114_ = _tmp118_ != NULL;
-#line 4665 "FSpotImporter.c"
+							_tmp113_ = _tmp117_ != NULL;
+#line 4654 "FSpotImporter.c"
 						} else {
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp114_ = FALSE;
-#line 4669 "FSpotImporter.c"
+							_tmp113_ = FALSE;
+#line 4658 "FSpotImporter.c"
 						}
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp114_) {
-#line 4673 "FSpotImporter.c"
-							SpitDataImportsImportableMediaItem** _tmp119_ = NULL;
-							gint _tmp119__length1 = 0;
-							DataImportsFSpotDbFSpotPhotoRow* _tmp120_ = NULL;
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp121_ = NULL;
-							DataImportsFSpotDbFSpotRollRow* _tmp122_ = NULL;
-							DataImportsFSpotFSpotImportableTag** _tmp123_ = NULL;
-							gint _tmp123__length1 = 0;
-							DataImportsFSpotFSpotImportableEvent* _tmp124_ = NULL;
-							gboolean _tmp125_ = FALSE;
-							gboolean _tmp126_ = FALSE;
-							DataImportsFSpotFSpotImportableItem* _tmp127_ = NULL;
+						if (_tmp113_) {
+#line 4662 "FSpotImporter.c"
+							SpitDataImportsImportableMediaItem** _tmp118_;
+							gint _tmp118__length1;
+							DataImportsFSpotDbFSpotPhotoRow* _tmp119_;
+							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp120_;
+							DataImportsFSpotDbFSpotRollRow* _tmp121_;
+							DataImportsFSpotFSpotImportableTag** _tmp122_;
+							gint _tmp122__length1;
+							DataImportsFSpotFSpotImportableEvent* _tmp123_;
+							gboolean _tmp124_;
+							gboolean _tmp125_;
+							DataImportsFSpotFSpotImportableItem* _tmp126_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp119_ = importable_items;
+							_tmp118_ = importable_items;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp119__length1 = importable_items_length1;
+							_tmp118__length1 = importable_items_length1;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp120_ = photo_row;
+							_tmp119_ = photo_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp121_ = photo_version_row;
+							_tmp120_ = photo_version_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp122_ = roll_row;
+							_tmp121_ = roll_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp123_ = tags;
+							_tmp122_ = tags;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp123__length1 = tags_length1;
+							_tmp122__length1 = tags_length1;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp124_ = event;
+							_tmp123_ = event;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp125_ = hidden;
+							_tmp124_ = hidden;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp126_ = favorite;
+							_tmp125_ = favorite;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp127_ = data_imports_fspot_fspot_importable_item_new (_tmp120_, _tmp121_, _tmp122_, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_);
+							_tmp126_ = data_imports_fspot_fspot_importable_item_new (_tmp119_, _tmp120_, _tmp121_, _tmp122_, _tmp122__length1, _tmp123_, _tmp124_, _tmp125_);
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+							_vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							photo_versions_added = TRUE;
-#line 4711 "FSpotImporter.c"
+#line 4700 "FSpotImporter.c"
 						} else {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							photo_versions_skipped = TRUE;
-#line 4715 "FSpotImporter.c"
+#line 4704 "FSpotImporter.c"
 						}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (photo_version_row);
-#line 4719 "FSpotImporter.c"
+#line 4708 "FSpotImporter.c"
 					}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_object_unref0 (_photo_version_row_list);
-#line 4723 "FSpotImporter.c"
+#line 4712 "FSpotImporter.c"
 				}
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp129_ = photo_versions_skipped;
+				_tmp128_ = photo_versions_skipped;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp129_) {
+				if (_tmp128_) {
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp128_ = TRUE;
-#line 4731 "FSpotImporter.c"
+					_tmp127_ = TRUE;
+#line 4720 "FSpotImporter.c"
 				} else {
-					gboolean _tmp130_ = FALSE;
+					gboolean _tmp129_;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp130_ = photo_versions_added;
+					_tmp129_ = photo_versions_added;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp128_ = !_tmp130_;
-#line 4738 "FSpotImporter.c"
+					_tmp127_ = !_tmp129_;
+#line 4727 "FSpotImporter.c"
 				}
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp128_) {
-#line 4742 "FSpotImporter.c"
-					gboolean _tmp131_ = FALSE;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp132_ = NULL;
-					GFile* _tmp133_ = NULL;
+				if (_tmp127_) {
+#line 4731 "FSpotImporter.c"
+					gboolean _tmp130_ = FALSE;
+					DataImportsFSpotDbFSpotPhotoRow* _tmp131_;
+					GFile* _tmp132_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp132_ = photo_row;
+					_tmp131_ = photo_row;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp133_ = _tmp132_->base_path;
+					_tmp132_ = _tmp131_->base_path;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp133_ != NULL) {
-#line 4752 "FSpotImporter.c"
-						DataImportsFSpotDbFSpotPhotoRow* _tmp134_ = NULL;
-						const gchar* _tmp135_ = NULL;
+					if (_tmp132_ != NULL) {
+#line 4741 "FSpotImporter.c"
+						DataImportsFSpotDbFSpotPhotoRow* _tmp133_;
+						const gchar* _tmp134_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp134_ = photo_row;
+						_tmp133_ = photo_row;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp135_ = _tmp134_->filename;
+						_tmp134_ = _tmp133_->filename;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp131_ = _tmp135_ != NULL;
-#line 4761 "FSpotImporter.c"
+						_tmp130_ = _tmp134_ != NULL;
+#line 4750 "FSpotImporter.c"
 					} else {
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp131_ = FALSE;
-#line 4765 "FSpotImporter.c"
+						_tmp130_ = FALSE;
+#line 4754 "FSpotImporter.c"
 					}
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp131_) {
-#line 4769 "FSpotImporter.c"
-						SpitDataImportsImportableMediaItem** _tmp136_ = NULL;
-						gint _tmp136__length1 = 0;
-						DataImportsFSpotDbFSpotPhotoRow* _tmp137_ = NULL;
-						DataImportsFSpotDbFSpotRollRow* _tmp138_ = NULL;
-						DataImportsFSpotFSpotImportableTag** _tmp139_ = NULL;
-						gint _tmp139__length1 = 0;
-						DataImportsFSpotFSpotImportableEvent* _tmp140_ = NULL;
-						gboolean _tmp141_ = FALSE;
-						gboolean _tmp142_ = FALSE;
-						DataImportsFSpotFSpotImportableItem* _tmp143_ = NULL;
+					if (_tmp130_) {
+#line 4758 "FSpotImporter.c"
+						SpitDataImportsImportableMediaItem** _tmp135_;
+						gint _tmp135__length1;
+						DataImportsFSpotDbFSpotPhotoRow* _tmp136_;
+						DataImportsFSpotDbFSpotRollRow* _tmp137_;
+						DataImportsFSpotFSpotImportableTag** _tmp138_;
+						gint _tmp138__length1;
+						DataImportsFSpotFSpotImportableEvent* _tmp139_;
+						gboolean _tmp140_;
+						gboolean _tmp141_;
+						DataImportsFSpotFSpotImportableItem* _tmp142_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp136_ = importable_items;
+						_tmp135_ = importable_items;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp136__length1 = importable_items_length1;
+						_tmp135__length1 = importable_items_length1;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp137_ = photo_row;
+						_tmp136_ = photo_row;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp138_ = roll_row;
+						_tmp137_ = roll_row;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp139_ = tags;
+						_tmp138_ = tags;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp139__length1 = tags_length1;
+						_tmp138__length1 = tags_length1;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp140_ = event;
+						_tmp139_ = event;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp141_ = hidden;
+						_tmp140_ = hidden;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp142_ = favorite;
+						_tmp141_ = favorite;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp143_ = data_imports_fspot_fspot_importable_item_new (_tmp137_, NULL, _tmp138_, _tmp139_, _tmp139__length1, _tmp140_, _tmp141_, _tmp142_);
+						_tmp142_ = data_imports_fspot_fspot_importable_item_new (_tmp136_, NULL, _tmp137_, _tmp138_, _tmp138__length1, _tmp139_, _tmp140_, _tmp141_);
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4802 "FSpotImporter.c"
+						_vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+#line 4791 "FSpotImporter.c"
 					}
 				}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (photo_versions);
-#line 4807 "FSpotImporter.c"
+#line 4796 "FSpotImporter.c"
 			}
 			goto __finally5;
 			__catch5_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp144_ = NULL;
-				gint64 _tmp145_ = 0LL;
-				GError* _tmp146_ = NULL;
-				const gchar* _tmp147_ = NULL;
-				gboolean _tmp148_ = FALSE;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp149_ = NULL;
-				GFile* _tmp150_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp143_;
+				gint64 _tmp144_;
+				GError* _tmp145_;
+				const gchar* _tmp146_;
+				gboolean _tmp147_ = FALSE;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp148_;
+				GFile* _tmp149_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp144_ = photo_row;
+				_tmp143_ = photo_row;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp145_ = _tmp144_->photo_id;
+				_tmp144_ = _tmp143_->photo_id;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp146_ = e;
+				_tmp145_ = e;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp147_ = _tmp146_->message;
+				_tmp146_ = _tmp145_->message;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				g_message ("FSpotImporter.vala:504: Failed to retrieve versions for photo ID %ld: " \
-"%s", (glong) _tmp145_, _tmp147_);
+"%s", (glong) _tmp144_, _tmp146_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp149_ = photo_row;
+				_tmp148_ = photo_row;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp150_ = _tmp149_->base_path;
+				_tmp149_ = _tmp148_->base_path;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp150_ != NULL) {
-#line 4840 "FSpotImporter.c"
-					DataImportsFSpotDbFSpotPhotoRow* _tmp151_ = NULL;
-					const gchar* _tmp152_ = NULL;
+				if (_tmp149_ != NULL) {
+#line 4829 "FSpotImporter.c"
+					DataImportsFSpotDbFSpotPhotoRow* _tmp150_;
+					const gchar* _tmp151_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp151_ = photo_row;
+					_tmp150_ = photo_row;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp152_ = _tmp151_->filename;
+					_tmp151_ = _tmp150_->filename;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp148_ = _tmp152_ != NULL;
-#line 4849 "FSpotImporter.c"
+					_tmp147_ = _tmp151_ != NULL;
+#line 4838 "FSpotImporter.c"
 				} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp148_ = FALSE;
-#line 4853 "FSpotImporter.c"
+					_tmp147_ = FALSE;
+#line 4842 "FSpotImporter.c"
 				}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp148_) {
-#line 4857 "FSpotImporter.c"
-					SpitDataImportsImportableMediaItem** _tmp153_ = NULL;
-					gint _tmp153__length1 = 0;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp154_ = NULL;
-					DataImportsFSpotDbFSpotRollRow* _tmp155_ = NULL;
-					DataImportsFSpotFSpotImportableTag** _tmp156_ = NULL;
-					gint _tmp156__length1 = 0;
-					DataImportsFSpotFSpotImportableEvent* _tmp157_ = NULL;
-					gboolean _tmp158_ = FALSE;
-					gboolean _tmp159_ = FALSE;
-					DataImportsFSpotFSpotImportableItem* _tmp160_ = NULL;
+				if (_tmp147_) {
+#line 4846 "FSpotImporter.c"
+					SpitDataImportsImportableMediaItem** _tmp152_;
+					gint _tmp152__length1;
+					DataImportsFSpotDbFSpotPhotoRow* _tmp153_;
+					DataImportsFSpotDbFSpotRollRow* _tmp154_;
+					DataImportsFSpotFSpotImportableTag** _tmp155_;
+					gint _tmp155__length1;
+					DataImportsFSpotFSpotImportableEvent* _tmp156_;
+					gboolean _tmp157_;
+					gboolean _tmp158_;
+					DataImportsFSpotFSpotImportableItem* _tmp159_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp153_ = importable_items;
+					_tmp152_ = importable_items;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp153__length1 = importable_items_length1;
+					_tmp152__length1 = importable_items_length1;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp154_ = photo_row;
+					_tmp153_ = photo_row;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp155_ = roll_row;
+					_tmp154_ = roll_row;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp156_ = tags;
+					_tmp155_ = tags;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp156__length1 = tags_length1;
+					_tmp155__length1 = tags_length1;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp157_ = event;
+					_tmp156_ = event;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp158_ = hidden;
+					_tmp157_ = hidden;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp159_ = favorite;
+					_tmp158_ = favorite;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp160_ = data_imports_fspot_fspot_importable_item_new (_tmp154_, NULL, _tmp155_, _tmp156_, _tmp156__length1, _tmp157_, _tmp158_, _tmp159_);
+					_tmp159_ = data_imports_fspot_fspot_importable_item_new (_tmp153_, NULL, _tmp154_, _tmp155_, _tmp155__length1, _tmp156_, _tmp157_, _tmp158_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4890 "FSpotImporter.c"
+					_vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+#line 4879 "FSpotImporter.c"
 				}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4894 "FSpotImporter.c"
+#line 4883 "FSpotImporter.c"
 			}
 			__finally5:
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4934,56 +4923,56 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4923 "FSpotImporter.c"
+#line 4912 "FSpotImporter.c"
 			}
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp161_ = self->priv->running;
+			_tmp160_ = self->priv->running;
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_tmp161_) {
-#line 4929 "FSpotImporter.c"
-				SpitDataImportsPluginHost* _tmp162_ = NULL;
-				SpitDataImportsImportableMediaItem** _tmp163_ = NULL;
-				gint _tmp163__length1 = 0;
-				gdouble _tmp164_ = 0.0;
-				gdouble _tmp165_ = 0.0;
-				gdouble _tmp166_ = 0.0;
-				gdouble _tmp167_ = 0.0;
-				gdouble _tmp168_ = 0.0;
-				gdouble _tmp169_ = 0.0;
-				gdouble _tmp170_ = 0.0;
-				SpitDataImportsPluginHost* _tmp171_ = NULL;
-				gdouble _tmp172_ = 0.0;
+			if (_tmp160_) {
+#line 4918 "FSpotImporter.c"
+				SpitDataImportsPluginHost* _tmp161_;
+				SpitDataImportsImportableMediaItem** _tmp162_;
+				gint _tmp162__length1;
+				gdouble _tmp163_;
+				gdouble _tmp164_;
+				gdouble _tmp165_;
+				gdouble _tmp166_;
+				gdouble _tmp167_;
+				gdouble _tmp168_;
+				gdouble _tmp169_;
+				SpitDataImportsPluginHost* _tmp170_;
+				gdouble _tmp171_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp162_ = self->priv->host;
+				_tmp161_ = self->priv->host;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp163_ = importable_items;
+				_tmp162_ = importable_items;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp163__length1 = importable_items_length1;
+				_tmp162__length1 = importable_items_length1;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp164_ = current_progress;
+				_tmp163_ = current_progress;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp165_ = progress_delta_per_photo;
+				_tmp164_ = progress_delta_per_photo;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp166_ = progress_plugin_to_host_ratio;
+				_tmp165_ = progress_plugin_to_host_ratio;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp167_ = progress_delta_per_photo;
+				_tmp166_ = progress_delta_per_photo;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp168_ = progress_plugin_to_host_ratio;
+				_tmp167_ = progress_plugin_to_host_ratio;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp162_, _tmp163_, _tmp163__length1, _tmp164_ + (_tmp165_ * _tmp166_), _tmp167_ * (1 - _tmp168_), NULL);
+				spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp161_, _tmp162_, _tmp162__length1, _tmp163_ + (_tmp164_ * _tmp165_), _tmp166_ * (1 - _tmp167_), NULL);
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp169_ = current_progress;
+				_tmp168_ = current_progress;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp170_ = progress_delta_per_photo;
+				_tmp169_ = progress_delta_per_photo;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				current_progress = _tmp169_ + _tmp170_;
+				current_progress = _tmp168_ + _tmp169_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp171_ = self->priv->host;
+				_tmp170_ = self->priv->host;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp172_ = current_progress;
+				_tmp171_ = current_progress;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_update_import_progress_pane (_tmp171_, _tmp172_, NULL);
-#line 4972 "FSpotImporter.c"
+				spit_data_imports_plugin_host_update_import_progress_pane (_tmp170_, _tmp171_, NULL);
+#line 4961 "FSpotImporter.c"
 			} else {
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -4997,7 +4986,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				_g_object_unref0 (photo_row);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				break;
-#line 4986 "FSpotImporter.c"
+#line 4975 "FSpotImporter.c"
 			}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -5009,31 +4998,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (photo_row);
-#line 4998 "FSpotImporter.c"
+#line 4987 "FSpotImporter.c"
 		}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_photo_row_list);
-#line 5002 "FSpotImporter.c"
+#line 4991 "FSpotImporter.c"
 	}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp173_ = self->priv->host;
+	_tmp172_ = self->priv->host;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_finalize_import (_tmp173_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL);
+	spit_data_imports_plugin_host_finalize_import (_tmp172_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (all_photos);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (tags_cache);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (database);
-#line 5014 "FSpotImporter.c"
+#line 5003 "FSpotImporter.c"
 }
 
 
 void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count) {
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5048,18 +5037,18 @@ void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImports
 	spit_data_imports_plugin_host_install_static_message_pane (_tmp0_, _tmp3_, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 (_tmp3_);
-#line 5037 "FSpotImporter.c"
+#line 5026 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5080,11 +5069,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports
 	_tmp4_ = _result_;
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp4_) {
-#line 5069 "FSpotImporter.c"
+#line 5058 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5097,37 +5086,37 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports
 		if (_tmp7_ == NULL) {
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5086 "FSpotImporter.c"
+#line 5075 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp8_;
+			gboolean _tmp9_;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp8_ = parent;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_event (self, _tmp8_);
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5096 "FSpotImporter.c"
+#line 5085 "FSpotImporter.c"
 		}
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5100 "FSpotImporter.c"
+#line 5089 "FSpotImporter.c"
 	}
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5106 "FSpotImporter.c"
+#line 5095 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gint64 _tmp0_ = 0LL;
-	DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gboolean _tmp3_ = FALSE;
+	gint64 _tmp0_;
+	DataImportsFSpotFSpotImportableTag* _tmp1_;
+	gint64 _tmp2_;
+	gboolean _tmp3_;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5144,11 +5133,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 	_tmp3_ = _result_;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp3_) {
-#line 5133 "FSpotImporter.c"
+#line 5122 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp4_;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp4_ = tag;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5161,11 +5150,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 		if (_tmp6_ == NULL) {
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5150 "FSpotImporter.c"
+#line 5139 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
-			gint64 _tmp8_ = 0LL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp7_;
+			gint64 _tmp8_;
+			gboolean _tmp9_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp7_ = parent;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5174,28 +5163,28 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp7_, _tmp8_);
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5163 "FSpotImporter.c"
+#line 5152 "FSpotImporter.c"
 		}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5167 "FSpotImporter.c"
+#line 5156 "FSpotImporter.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5173 "FSpotImporter.c"
+#line 5162 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5216,11 +5205,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo
 	_tmp4_ = _result_;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp4_) {
-#line 5205 "FSpotImporter.c"
+#line 5194 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5233,27 +5222,27 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo
 		if (_tmp7_ == NULL) {
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5222 "FSpotImporter.c"
+#line 5211 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp8_;
+			gboolean _tmp9_;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp8_ = parent;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp8_);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5232 "FSpotImporter.c"
+#line 5221 "FSpotImporter.c"
 		}
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5236 "FSpotImporter.c"
+#line 5225 "FSpotImporter.c"
 	}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5242 "FSpotImporter.c"
+#line 5231 "FSpotImporter.c"
 }
 
 
@@ -5264,7 +5253,7 @@ static void data_imports_fspot_fspot_data_importer_class_init (DataImportsFSpotF
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotDataImporterPrivate));
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_data_importer_finalize;
-#line 5253 "FSpotImporter.c"
+#line 5242 "FSpotImporter.c"
 }
 
 
@@ -5272,18 +5261,18 @@ static void data_imports_fspot_fspot_data_importer_spit_data_imports_data_import
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = g_type_interface_peek_parent (iface);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_running = (gboolean (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_is_running;
+	iface->is_running = (gboolean (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_is_running;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_service = (SpitDataImportsService* (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_get_service;
+	iface->get_service = (SpitDataImportsService* (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_get_service;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->start = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_start;
+	iface->start = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_start;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->stop = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_stop;
+	iface->stop = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_stop;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_library_selected = (void (*)(SpitDataImportsDataImporter*, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected;
+	iface->on_library_selected = (void (*) (SpitDataImportsDataImporter *, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_file_selected = (void (*)(SpitDataImportsDataImporter*, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected;
-#line 5272 "FSpotImporter.c"
+	iface->on_file_selected = (void (*) (SpitDataImportsDataImporter *, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected;
+#line 5261 "FSpotImporter.c"
 }
 
 
@@ -5296,17 +5285,17 @@ static void data_imports_fspot_fspot_data_importer_instance_init (DataImportsFSp
 	self->priv->service = NULL;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv->running = FALSE;
-#line 5285 "FSpotImporter.c"
+#line 5274 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj) {
 	DataImportsFSpotFSpotDataImporter * self;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_data_importer_parent_class)->finalize (obj);
-#line 5295 "FSpotImporter.c"
+#line 5284 "FSpotImporter.c"
 }