Merge branch 'feature/upstream' into develop

1 files changed, 437 insertions, 440 deletions

diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 0932f18..80acc12 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.34.7, the Vala compiler
+/* LibraryFiles.c generated by valac 0.36.6, the Vala compiler
  * generated from LibraryFiles.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -37,6 +37,7 @@ typedef struct _MetadataDateTimeClass MetadataDateTimeClass;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
@@ -57,7 +58,6 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_VIDEO_READER (video_reader_get_type ())
 #define VIDEO_READER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_READER, VideoReader))
@@ -143,11 +143,12 @@ GType metadata_date_time_get_type (void) G_GNUC_CONST;
 MetadataDateTime* media_metadata_get_creation_date_time (MediaMetadata* self);
 time_t metadata_date_time_get_timestamp (MetadataDateTime* self);
 GFile* app_dirs_get_baked_import_dir (time_t tm);
+gchar* library_files_convert_basename (const gchar* basename);
+GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self);
-GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callback, void* progress_callback_target, gboolean blacklist, GError** error);
 time_t query_file_modified (GFile* file, GError** error);
 gboolean video_reader_is_supported_video_file (GFile* file);
@@ -183,7 +184,7 @@ gchar* md5_file (GFile* file, GError** error);
 static gpointer _g_error_copy0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 187 "LibraryFiles.c"
+#line 188 "LibraryFiles.c"
 }
 
 
@@ -191,24 +192,19 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	gboolean _vala_collision = FALSE;
 	GFile* result = NULL;
 	time_t timestamp = 0;
-	time_t _tmp0_ = 0;
-	MediaMetadata* _tmp1_ = NULL;
+	time_t _tmp0_;
+	MediaMetadata* _tmp1_;
 	GFile* dir = NULL;
-	time_t _tmp9_ = 0;
-	GFile* _tmp10_ = NULL;
+	time_t _tmp9_;
+	GFile* _tmp10_;
 	gchar* newbasename = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	ConfigFacade* _tmp17_ = NULL;
-	ConfigFacade* _tmp18_ = NULL;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+	GFile* _tmp17_ = NULL;
+	GFile* _tmp18_;
 	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-	GFile* _tmp23_ = NULL;
-	GFile* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	GFile* _tmp27_ = NULL;
-	GFile* _tmp28_ = NULL;
+	GFile* _tmp20_;
+	GFile* _tmp21_;
 	GError * _inner_error_ = NULL;
 #line 13 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (basename != NULL, NULL);
@@ -222,11 +218,11 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	_tmp1_ = metadata;
 #line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp1_ != NULL) {
-#line 226 "LibraryFiles.c"
+#line 222 "LibraryFiles.c"
 		MetadataDateTime* date_time = NULL;
-		MediaMetadata* _tmp2_ = NULL;
-		MetadataDateTime* _tmp3_ = NULL;
-		MetadataDateTime* _tmp4_ = NULL;
+		MediaMetadata* _tmp2_;
+		MetadataDateTime* _tmp3_;
+		MetadataDateTime* _tmp4_;
 #line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = metadata;
 #line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -237,34 +233,34 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_tmp4_ = date_time;
 #line 21 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp4_ != NULL) {
-#line 241 "LibraryFiles.c"
-			MetadataDateTime* _tmp5_ = NULL;
-			time_t _tmp6_ = 0;
+#line 237 "LibraryFiles.c"
+			MetadataDateTime* _tmp5_;
+			time_t _tmp6_;
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp5_ = date_time;
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp6_ = metadata_date_time_get_timestamp (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			timestamp = _tmp6_;
-#line 250 "LibraryFiles.c"
+#line 246 "LibraryFiles.c"
 		} else {
-			time_t _tmp7_ = 0;
+			time_t _tmp7_;
 #line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp7_ = timestamp;
 #line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (_tmp7_ == ((time_t) 0)) {
-#line 257 "LibraryFiles.c"
-				time_t _tmp8_ = 0;
+#line 253 "LibraryFiles.c"
+				time_t _tmp8_;
 #line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_tmp8_ = time (NULL);
 #line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				timestamp = _tmp8_;
-#line 263 "LibraryFiles.c"
+#line 259 "LibraryFiles.c"
 			}
 		}
 #line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 268 "LibraryFiles.c"
+#line 264 "LibraryFiles.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = timestamp;
@@ -272,24 +268,24 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	_tmp10_ = app_dirs_get_baked_import_dir (_tmp9_);
 #line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dir = _tmp10_;
-#line 276 "LibraryFiles.c"
+#line 272 "LibraryFiles.c"
 	{
-		GFile* _tmp11_ = NULL;
+		GFile* _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = dir;
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 285 "LibraryFiles.c"
-			goto __catch462_g_error;
+#line 281 "LibraryFiles.c"
+			goto __catch463_g_error;
 		}
 	}
-	goto __finally462;
-	__catch462_g_error:
+	goto __finally463;
+	__catch463_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp12_ = NULL;
+		GError* _tmp12_;
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -298,9 +294,9 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_tmp12_ = err;
 #line 32 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-#line 302 "LibraryFiles.c"
-			GError* _tmp13_ = NULL;
-			GError* _tmp14_ = NULL;
+#line 298 "LibraryFiles.c"
+			GError* _tmp13_;
+			GError* _tmp14_;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = err;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -309,14 +305,14 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 			_inner_error_ = _tmp14_;
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 313 "LibraryFiles.c"
-			goto __finally462;
+#line 309 "LibraryFiles.c"
+			goto __finally463;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 318 "LibraryFiles.c"
+#line 314 "LibraryFiles.c"
 	}
-	__finally462:
+	__finally463:
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -325,82 +321,103 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 		_g_object_unref0 (dir);
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 329 "LibraryFiles.c"
+#line 325 "LibraryFiles.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp15_ = basename;
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp16_ = g_strdup (_tmp15_);
+	_tmp16_ = library_files_convert_basename (_tmp15_);
 #line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	newbasename = _tmp16_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp17_ = config_facade_get_instance ();
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp18_ = _tmp17_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp19_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp20_ = _tmp19_;
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_g_object_unref0 (_tmp18_);
-#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	if (_tmp20_) {
-#line 349 "LibraryFiles.c"
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp21_ = newbasename;
+	_tmp18_ = dir;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp22_ = g_utf8_strdown (_tmp21_, (gssize) -1);
+	_tmp20_ = generate_unique_file (_tmp18_, newbasename, &_tmp19_, &_inner_error_);
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_g_free0 (newbasename);
+	_vala_collision = _tmp19_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp17_ = _tmp20_;
 #line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		newbasename = _tmp22_;
-#line 360 "LibraryFiles.c"
-	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp24_ = dir;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp25_ = newbasename;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp27_ = generate_unique_file (_tmp24_, _tmp25_, &_tmp26_, &_inner_error_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_vala_collision = _tmp26_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp23_ = _tmp27_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (newbasename);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dir);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 382 "LibraryFiles.c"
+#line 351 "LibraryFiles.c"
 	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp28_ = _tmp23_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_tmp23_ = NULL;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	result = _tmp28_;
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-	_g_object_unref0 (_tmp23_);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp21_ = _tmp17_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp17_ = NULL;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	result = _tmp21_;
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_object_unref0 (_tmp17_);
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (newbasename);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_object_unref0 (dir);
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (collision) {
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		*collision = _vala_collision;
-#line 400 "LibraryFiles.c"
+#line 369 "LibraryFiles.c"
 	}
-#line 43 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 404 "LibraryFiles.c"
+#line 373 "LibraryFiles.c"
+}
+
+
+gchar* library_files_convert_basename (const gchar* basename) {
+	gchar* result = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	g_return_val_if_fail (basename != NULL, NULL);
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp1_ = _tmp0_;
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp2_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp3_ = _tmp2_;
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_object_unref0 (_tmp1_);
+#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (_tmp3_) {
+#line 397 "LibraryFiles.c"
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp4_ = basename;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		result = _tmp5_;
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return result;
+#line 408 "LibraryFiles.c"
+	} else {
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp6_ = basename;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		result = _tmp7_;
+#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return result;
+#line 420 "LibraryFiles.c"
+	}
 }
 
 
@@ -408,561 +425,541 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 	GFile* result = NULL;
 	time_t timestamp = 0;
 	MediaMetadata* metadata = NULL;
-	GFile* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GFile* _tmp8_;
+	gboolean _tmp9_;
 	gboolean collision = FALSE;
 	GFile* dest = NULL;
-	GFile* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	MediaMetadata* _tmp30_ = NULL;
-	time_t _tmp31_ = 0;
+	GFile* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	MediaMetadata* _tmp30_;
+	time_t _tmp31_;
 	gboolean _tmp32_ = FALSE;
-	GFile* _tmp33_ = NULL;
-	GFile* _tmp34_ = NULL;
-	GFile* _tmp35_ = NULL;
-	gboolean _tmp37_ = FALSE;
+	GFile* _tmp33_;
+	GFile* _tmp34_;
+	GFile* _tmp35_;
+	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (G_IS_FILE (src), NULL);
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	timestamp = (time_t) 0;
-#line 431 "LibraryFiles.c"
+#line 448 "LibraryFiles.c"
 	{
 		time_t _tmp0_ = 0;
-		GFile* _tmp1_ = NULL;
-		time_t _tmp2_ = 0;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp1_;
+		time_t _tmp2_;
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp1_ = src;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = query_file_modified (_tmp1_, &_inner_error_);
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp0_ = _tmp2_;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 444 "LibraryFiles.c"
-			goto __catch463_g_error;
+#line 461 "LibraryFiles.c"
+			goto __catch464_g_error;
 		}
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
-#line 449 "LibraryFiles.c"
+#line 466 "LibraryFiles.c"
 	}
-	goto __finally463;
-	__catch463_g_error:
+	goto __finally464;
+	__catch464_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp3_ = src;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp5_ = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp6_ = err;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp7_ = _tmp6_->message;
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_critical ("LibraryFiles.vala:52: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
-#line 52 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("LibraryFiles.vala:62: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp5_);
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 480 "LibraryFiles.c"
+#line 497 "LibraryFiles.c"
 	}
-	__finally463:
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally464:
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 489 "LibraryFiles.c"
+#line 506 "LibraryFiles.c"
 	}
-#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 65 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	metadata = NULL;
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp8_ = src;
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = video_reader_is_supported_video_file (_tmp8_);
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp9_) {
-#line 499 "LibraryFiles.c"
+#line 516 "LibraryFiles.c"
 		VideoReader* reader = NULL;
-		GFile* _tmp10_ = NULL;
-		VideoReader* _tmp11_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp10_;
+		VideoReader* _tmp11_;
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp10_ = src;
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = video_reader_new (_tmp10_);
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp11_;
-#line 509 "LibraryFiles.c"
+#line 526 "LibraryFiles.c"
 		{
 			VideoMetadata* _tmp12_ = NULL;
-			VideoReader* _tmp13_ = NULL;
-			VideoMetadata* _tmp14_ = NULL;
-			VideoMetadata* _tmp15_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			VideoReader* _tmp13_;
+			VideoMetadata* _tmp14_;
+			VideoMetadata* _tmp15_;
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = reader;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp14_ = video_reader_read_metadata (_tmp13_, &_inner_error_);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = _tmp14_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 523 "LibraryFiles.c"
-				goto __catch464_g_error;
+#line 540 "LibraryFiles.c"
+				goto __catch465_g_error;
 			}
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = NULL;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp12_);
-#line 536 "LibraryFiles.c"
+#line 553 "LibraryFiles.c"
 		}
-		goto __finally464;
-		__catch464_g_error:
+		goto __finally465;
+		__catch465_g_error:
 		{
 			GError* err = NULL;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 548 "LibraryFiles.c"
+#line 565 "LibraryFiles.c"
 		}
-		__finally464:
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally465:
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_video_reader_unref0 (reader);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 561 "LibraryFiles.c"
+#line 578 "LibraryFiles.c"
 		}
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_video_reader_unref0 (reader);
-#line 565 "LibraryFiles.c"
+#line 582 "LibraryFiles.c"
 	} else {
 		PhotoFileReader* reader = NULL;
-		GFile* _tmp16_ = NULL;
-		PhotoFileFormat _tmp17_ = 0;
-		GFile* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		PhotoFileReader* _tmp21_ = NULL;
-		PhotoFileReader* _tmp22_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp16_;
+		PhotoFileFormat _tmp17_;
+		GFile* _tmp18_;
+		gchar* _tmp19_;
+		gchar* _tmp20_;
+		PhotoFileReader* _tmp21_;
+		PhotoFileReader* _tmp22_;
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp16_ = src;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp17_ = photo_file_format_get_by_file_extension (_tmp16_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp18_ = src;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp20_ = _tmp19_;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp21_ = photo_file_format_create_reader (_tmp17_, _tmp20_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp22_ = _tmp21_;
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp20_);
-#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp22_;
-#line 593 "LibraryFiles.c"
+#line 610 "LibraryFiles.c"
 		{
 			PhotoMetadata* _tmp23_ = NULL;
-			PhotoFileReader* _tmp24_ = NULL;
-			PhotoMetadata* _tmp25_ = NULL;
-			PhotoMetadata* _tmp26_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			PhotoFileReader* _tmp24_;
+			PhotoMetadata* _tmp25_;
+			PhotoMetadata* _tmp26_;
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp24_ = reader;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp25_ = photo_file_reader_read_metadata (_tmp24_, &_inner_error_);
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = _tmp25_;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 607 "LibraryFiles.c"
-				goto __catch465_g_error;
+#line 624 "LibraryFiles.c"
+				goto __catch466_g_error;
 			}
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp23_);
-#line 620 "LibraryFiles.c"
+#line 637 "LibraryFiles.c"
 		}
-		goto __finally465;
-		__catch465_g_error:
+		goto __finally466;
+		__catch466_g_error:
 		{
 			GError* err = NULL;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 632 "LibraryFiles.c"
+#line 649 "LibraryFiles.c"
 		}
-		__finally465:
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally466:
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 645 "LibraryFiles.c"
+#line 662 "LibraryFiles.c"
 		}
-#line 56 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 649 "LibraryFiles.c"
+#line 666 "LibraryFiles.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp27_ = src;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp28_ = g_file_get_basename (_tmp27_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp29_ = _tmp28_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp30_ = metadata;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp31_ = timestamp;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp33_ = library_files_generate_unique_file (_tmp29_, _tmp30_, _tmp31_, &_tmp32_, &_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	collision = _tmp32_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp34_ = _tmp33_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (_tmp29_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dest = _tmp34_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 679 "LibraryFiles.c"
+#line 696 "LibraryFiles.c"
 	}
-#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp35_ = dest;
-#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp35_ == NULL) {
-#line 685 "LibraryFiles.c"
-		GError* _tmp36_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 702 "LibraryFiles.c"
+		GError* _tmp36_;
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp36_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "Unable to generate unique pathname for destination");
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = _tmp36_;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 699 "LibraryFiles.c"
+#line 716 "LibraryFiles.c"
 	}
-#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp37_ = blacklist;
-#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp37_) {
-#line 705 "LibraryFiles.c"
-		GFile* _tmp38_ = NULL;
-#line 79 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 722 "LibraryFiles.c"
+		GFile* _tmp38_;
+#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp38_ = dest;
-#line 79 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		library_monitor_blacklist_file (_tmp38_, "LibraryFiles.duplicate");
-#line 711 "LibraryFiles.c"
+#line 728 "LibraryFiles.c"
 	}
 	{
-		GFile* _tmp39_ = NULL;
-		GFile* _tmp40_ = NULL;
-		GFileProgressCallback _tmp41_ = NULL;
-		void* _tmp41__target = NULL;
-		gboolean _tmp42_ = FALSE;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp39_;
+		GFile* _tmp40_;
+		GFileProgressCallback _tmp41_;
+		void* _tmp41__target;
+		gboolean _tmp42_;
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp39_ = src;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp40_ = dest;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp41_ = progress_callback;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp41__target = progress_callback_target;
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_file_copy (_tmp39_, _tmp40_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, _tmp41_, _tmp41__target, &_inner_error_);
-#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 731 "LibraryFiles.c"
-			goto __catch466_g_error;
+#line 748 "LibraryFiles.c"
+			goto __catch467_g_error;
 		}
-#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp42_ = blacklist;
-#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp42_) {
-#line 738 "LibraryFiles.c"
-			GFile* _tmp43_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 755 "LibraryFiles.c"
+			GFile* _tmp43_;
+#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp43_ = dest;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			library_monitor_unblacklist_file (_tmp43_);
-#line 744 "LibraryFiles.c"
+#line 761 "LibraryFiles.c"
 		}
 	}
-	goto __finally466;
-	__catch466_g_error:
+	goto __finally467;
+	__catch467_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp44_ = NULL;
-		gchar* _tmp45_ = NULL;
-		gchar* _tmp46_ = NULL;
-		GError* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
+		GFile* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		GError* _tmp47_;
+		const gchar* _tmp48_;
 		gboolean _tmp49_ = FALSE;
-		gboolean _tmp50_ = FALSE;
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		gboolean _tmp50_;
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp44_ = src;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp46_ = _tmp45_;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp47_ = err;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp48_ = _tmp47_->message;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_message ("LibraryFiles.vala:86: There was a problem copying %s: %s", _tmp46_, _tmp48_);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_message ("LibraryFiles.vala:96: There was a problem copying %s: %s", _tmp46_, _tmp48_);
+#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp46_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp50_ = blacklist;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp50_) {
-#line 780 "LibraryFiles.c"
+#line 797 "LibraryFiles.c"
 			gchar* _tmp51_ = NULL;
-			GFile* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
+			GFile* _tmp52_;
+			gchar* _tmp53_;
 			gchar* _tmp54_ = NULL;
-			GFile* _tmp55_ = NULL;
-			gchar* _tmp56_ = NULL;
-			gchar* _tmp57_ = NULL;
-			gchar* _tmp58_ = NULL;
-			gchar* _tmp59_ = NULL;
-			gchar* _tmp60_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			GFile* _tmp55_;
+			gchar* _tmp56_;
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp52_ = src;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp53_ = md5_file (_tmp52_, &_inner_error_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp51_ = _tmp53_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 801 "LibraryFiles.c"
-				goto __finally466;
+#line 814 "LibraryFiles.c"
+				goto __finally467;
 			}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp55_ = dest;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp56_ = md5_file (_tmp55_, &_inner_error_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp54_ = _tmp56_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_free0 (_tmp51_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 816 "LibraryFiles.c"
-				goto __finally466;
+#line 829 "LibraryFiles.c"
+				goto __finally467;
 			}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp57_ = _tmp51_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp51_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp58_ = _tmp57_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp59_ = _tmp54_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp54_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp60_ = _tmp59_;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp49_ = g_strcmp0 (_tmp58_, _tmp60_) != 0;
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp60_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp58_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp49_ = g_strcmp0 (_tmp51_, _tmp54_) != 0;
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_free0 (_tmp54_);
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_free0 (_tmp51_);
-#line 841 "LibraryFiles.c"
+#line 838 "LibraryFiles.c"
 		} else {
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp49_ = FALSE;
-#line 845 "LibraryFiles.c"
+#line 842 "LibraryFiles.c"
 		}
-#line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp49_) {
-#line 849 "LibraryFiles.c"
-			GFile* _tmp61_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp61_ = dest;
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			library_monitor_unblacklist_file (_tmp61_);
-#line 855 "LibraryFiles.c"
+#line 846 "LibraryFiles.c"
+			GFile* _tmp57_;
+#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp57_ = dest;
+#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			library_monitor_unblacklist_file (_tmp57_);
+#line 852 "LibraryFiles.c"
 		}
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 859 "LibraryFiles.c"
+#line 856 "LibraryFiles.c"
 	}
-	__finally466:
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally467:
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 872 "LibraryFiles.c"
+#line 869 "LibraryFiles.c"
 	}
 	{
 		GFileInfo* info = NULL;
-		GFile* _tmp62_ = NULL;
-		GFileInfo* _tmp63_ = NULL;
+		GFile* _tmp58_;
+		GFileInfo* _tmp59_;
 		guint32 mode = 0U;
-		GFileInfo* _tmp64_ = NULL;
-		guint32 _tmp65_ = 0U;
-		gboolean _tmp66_ = FALSE;
-		GFile* _tmp67_ = NULL;
-		guint32 _tmp68_ = 0U;
-		gboolean _tmp69_ = FALSE;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp62_ = dest;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp63_ = g_file_query_info (_tmp62_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		info = _tmp63_;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFileInfo* _tmp60_;
+		guint32 _tmp61_;
+		gboolean _tmp62_ = FALSE;
+		GFile* _tmp63_;
+		guint32 _tmp64_;
+		gboolean _tmp65_;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp58_ = dest;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp59_ = g_file_query_info (_tmp58_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		info = _tmp59_;
+#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 893 "LibraryFiles.c"
-			goto __catch467_g_error;
+#line 890 "LibraryFiles.c"
+			goto __catch468_g_error;
 		}
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp64_ = info;
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp65_ = g_file_info_get_attribute_uint32 (_tmp64_, G_FILE_ATTRIBUTE_UNIX_MODE);
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		mode = _tmp65_ | 0600;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp67_ = dest;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp68_ = mode;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp69_ = g_file_set_attribute_uint32 (_tmp67_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp68_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp66_ = _tmp69_;
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp60_ = info;
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp61_ = g_file_info_get_attribute_uint32 (_tmp60_, G_FILE_ATTRIBUTE_UNIX_MODE);
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		mode = _tmp61_ | 0600;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp63_ = dest;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp64_ = mode;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp65_ = g_file_set_attribute_uint32 (_tmp63_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp64_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp62_ = _tmp65_;
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
-#line 914 "LibraryFiles.c"
-			goto __catch467_g_error;
+#line 911 "LibraryFiles.c"
+			goto __catch468_g_error;
 		}
-#line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (!_tmp66_) {
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			g_warning ("LibraryFiles.vala:96: Could not make file writable");
-#line 921 "LibraryFiles.c"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (!_tmp62_) {
+#line 106 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_warning ("LibraryFiles.vala:106: Could not make file writable");
+#line 918 "LibraryFiles.c"
 		}
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (info);
-#line 925 "LibraryFiles.c"
+#line 922 "LibraryFiles.c"
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally468;
+	__catch468_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp70_ = NULL;
-		const gchar* _tmp71_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GError* _tmp66_;
+		const gchar* _tmp67_;
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp70_ = err;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp71_ = _tmp70_->message;
-#line 99 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_warning ("LibraryFiles.vala:99: Could not make file writable: %s", _tmp71_);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp66_ = err;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp67_ = _tmp66_->message;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_warning ("LibraryFiles.vala:109: Could not make file writable: %s", _tmp67_);
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 945 "LibraryFiles.c"
+#line 942 "LibraryFiles.c"
 	}
-	__finally467:
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally468:
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 958 "LibraryFiles.c"
+#line 955 "LibraryFiles.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	result = dest;
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_media_metadata_unref0 (metadata);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 966 "LibraryFiles.c"
+#line 963 "LibraryFiles.c"
 }