Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

1 files changed, 70 insertions, 70 deletions

diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a1aed95..a23c52f 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.34.4, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.34.7, the Vala compiler
  * generated from PhotoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1621,35 +1621,35 @@ static void photo_updates_class_init (PhotoUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((MonitorableUpdatesClass *) klass)->finalize = photo_updates_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_offline = photo_updates_real_mark_offline;
+	((MonitorableUpdatesClass *) klass)->mark_offline = (void (*)(MonitorableUpdates*)) photo_updates_real_mark_offline;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_in_alteration = photo_updates_real_is_in_alteration;
+	((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*)(MonitorableUpdates*)) photo_updates_real_is_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file = photo_updates_real_set_editable_file;
+	((PhotoUpdatesClass *) klass)->set_editable_file = (void (*)(PhotoUpdates*, GFile*)) photo_updates_real_set_editable_file;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file_info = photo_updates_real_set_editable_file_info;
+	((PhotoUpdatesClass *) klass)->set_editable_file_info = (void (*)(PhotoUpdates*, GFileInfo*)) photo_updates_real_set_editable_file_info;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_file_info_altered = photo_updates_real_set_editable_file_info_altered;
+	((PhotoUpdatesClass *) klass)->set_editable_file_info_altered = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_editable_file_info_altered;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_editable_in_alteration = photo_updates_real_set_editable_in_alteration;
+	((PhotoUpdatesClass *) klass)->set_editable_in_alteration = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_editable_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_raw_development_in_alteration = photo_updates_real_set_raw_development_in_alteration;
+	((PhotoUpdatesClass *) klass)->set_raw_development_in_alteration = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_raw_development_in_alteration;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_raw_developer_file_info_altered = photo_updates_real_set_raw_developer_file_info_altered;
+	((PhotoUpdatesClass *) klass)->set_raw_developer_file_info_altered = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_raw_developer_file_info_altered;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_revert_to_master = photo_updates_real_set_revert_to_master;
+	((PhotoUpdatesClass *) klass)->set_revert_to_master = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_revert_to_master;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->add_raw_developer_file = photo_updates_real_add_raw_developer_file;
+	((PhotoUpdatesClass *) klass)->add_raw_developer_file = (void (*)(PhotoUpdates*, GFile*)) photo_updates_real_add_raw_developer_file;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->clear_raw_developer_files = photo_updates_real_clear_raw_developer_files;
+	((PhotoUpdatesClass *) klass)->clear_raw_developer_files = (void (*)(PhotoUpdates*)) photo_updates_real_clear_raw_developer_files;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_master = photo_updates_real_set_reimport_master;
+	((PhotoUpdatesClass *) klass)->set_reimport_master = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_master;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_editable = photo_updates_real_set_reimport_editable;
+	((PhotoUpdatesClass *) klass)->set_reimport_editable = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_editable;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = photo_updates_real_set_reimport_raw_developments;
+	((PhotoUpdatesClass *) klass)->set_reimport_raw_developments = (void (*)(PhotoUpdates*, gboolean)) photo_updates_real_set_reimport_raw_developments;
 #line 7 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = photo_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) photo_updates_real_is_all_updated;
 #line 1654 "PhotoMonitor.c"
 }
 
@@ -1677,7 +1677,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) {
 #line 19 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->revert_to_master = FALSE;
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1684 "PhotoMonitor.c"
@@ -1859,7 +1859,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp0_ = self->priv->master_reimport_pending;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp2_ = _tmp1_;
 #line 259 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1920,7 +1920,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp11_ = self->priv->editable_reimport_pending;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_MAP, GeeMap));
+		_tmp12_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp13_ = _tmp12_;
 #line 262 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -1981,7 +1981,7 @@ static void photo_monitor_real_close (MediaMonitor* base) {
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp22_ = self->priv->raw_developments_reimport_pending;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_MAP, GeeMap));
+		_tmp23_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp24_ = _tmp23_;
 #line 265 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2277,7 +2277,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 314 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 316 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp2_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp2_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 316 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	matched_masters = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 317 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2317,7 +2317,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp12_ = self->priv->matched_editables;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp13_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp14_ = _tmp13_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2329,7 +2329,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp15_ = self->priv->matched_developments;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp17_ = _tmp16_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2361,7 +2361,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp18_ = self->priv->matched_editables;
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp20_ = _tmp19_;
 #line 332 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2384,7 +2384,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp23_ = self->priv->matched_editables;
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp25_ = _tmp24_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2408,7 +2408,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp29_ = self->priv->matched_editables;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp31_ = _tmp30_;
 #line 335 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2464,7 +2464,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp38_ = self->priv->matched_editables;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-						_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
+						_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 						_tmp40_ = _tmp39_;
 #line 337 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2525,7 +2525,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp53_ = self->priv->matched_developments;
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp55_ = _tmp54_;
 #line 346 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2548,7 +2548,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp58_ = self->priv->matched_developments;
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp60_ = _tmp59_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2572,7 +2572,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp64_ = self->priv->matched_developments;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp65_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp66_ = _tmp65_;
 #line 349 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6226,7 +6226,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6225 "PhotoMonitor.c"
 					GeeHashMap* _tmp17_ = NULL;
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (set_editable_file);
 #line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6288,7 +6288,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6287 "PhotoMonitor.c"
 					GeeHashMap* _tmp31_ = NULL;
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp31_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (set_editable_file_info);
 #line 945 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6350,7 +6350,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6349 "PhotoMonitor.c"
 					GeeHashMap* _tmp45_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+					_tmp45_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_COLLECTION, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (set_raw_developer_files);
 #line 954 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6402,7 +6402,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6401 "PhotoMonitor.c"
 					GeeArrayList* _tmp57_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp57_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (revert_to_master);
 #line 963 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6412,7 +6412,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp58_ = revert_to_master;
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-				_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp59_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp60_ = _tmp59_;
 #line 965 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6477,7 +6477,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6476 "PhotoMonitor.c"
 					GeeArrayList* _tmp71_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp71_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (reimport_master);
 #line 974 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6541,7 +6541,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6540 "PhotoMonitor.c"
 					GeeArrayList* _tmp83_ = NULL;
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-					_tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+					_tmp83_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 					_g_object_unref0 (reimport_editable);
 #line 984 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6797,7 +6797,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp107_ = revert_to_master;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp109_ = _tmp108_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6827,7 +6827,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp114_ = _photo_list;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp115_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp116_ = _tmp115_;
 #line 1016 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6893,7 +6893,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp125_ = reimport_master;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp126_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp127_ = _tmp126_;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6923,7 +6923,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp132_ = _photo_list;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp133_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp134_ = _tmp133_;
 #line 1027 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7025,7 +7025,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp152_ = reimport_editable;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp153_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp154_ = _tmp153_;
 #line 1037 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7055,7 +7055,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp159_ = _photo_list;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp160_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp161_ = _tmp160_;
 #line 1039 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7157,7 +7157,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp179_ = reimport_raw_developments;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp180_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp179_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp181_ = _tmp180_;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7187,7 +7187,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp186_ = _photo_list;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-			_tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp187_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp186_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_tmp188_ = _tmp187_;
 #line 1051 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8078,7 +8078,7 @@ static void photo_monitor_reimport_master_job_class_init (PhotoMonitorReimportMa
 #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_master_job_finalize;
 #line 161 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = photo_monitor_reimport_master_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_master_job_real_execute;
 #line 8080 "PhotoMonitor.c"
 }
 
@@ -8256,7 +8256,7 @@ static void photo_monitor_reimport_editable_job_class_init (PhotoMonitorReimport
 #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_editable_job_finalize;
 #line 183 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = photo_monitor_reimport_editable_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_editable_job_real_execute;
 #line 8258 "PhotoMonitor.c"
 }
 
@@ -8434,7 +8434,7 @@ static void photo_monitor_reimport_raw_development_job_class_init (PhotoMonitorR
 #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = photo_monitor_reimport_raw_development_job_finalize;
 #line 205 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = photo_monitor_reimport_raw_development_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) photo_monitor_reimport_raw_development_job_real_execute;
 #line 8436 "PhotoMonitor.c"
 }
 
@@ -8484,39 +8484,39 @@ static void photo_monitor_class_init (PhotoMonitorClass * klass) {
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (PhotoMonitorPrivate));
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = photo_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) photo_monitor_real_create_updates;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = photo_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) photo_monitor_real_get_media_source_collection;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = photo_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_is_file_represented;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->close = photo_monitor_real_close;
+	((MediaMonitorClass *) klass)->close = (void (*)(MediaMonitor*)) photo_monitor_real_close;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = photo_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) photo_monitor_real_notify_file_discovered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = photo_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) photo_monitor_real_candidates_for_unknown_file;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = photo_monitor_real_get_auxilliary_backing_files;
+	((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*)(MediaMonitor*, Monitorable*, int*)) photo_monitor_real_get_auxilliary_backing_files;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->update_backing_file_info = photo_monitor_real_update_backing_file_info;
+	((MediaMonitorClass *) klass)->update_backing_file_info = (void (*)(MediaMonitor*, Monitorable*, GFile*, GFileInfo*)) photo_monitor_real_update_backing_file_info;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_discovery_completing = photo_monitor_real_notify_discovery_completing;
+	((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*)(MediaMonitor*)) photo_monitor_real_notify_discovery_completing;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = photo_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_created;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = photo_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_moved;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = photo_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_altered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = photo_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_attributes_altered;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = photo_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) photo_monitor_real_notify_file_alteration_completed;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = photo_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) photo_monitor_real_notify_file_deleted;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->on_media_source_destroyed = photo_monitor_real_on_media_source_destroyed;
+	((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*)(MediaMonitor*, DataSource*)) photo_monitor_real_on_media_source_destroyed;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = photo_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) photo_monitor_real_process_updates;
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_monitor_finalize;
 #line 8520 "PhotoMonitor.c"
@@ -8532,23 +8532,23 @@ static void photo_monitor_instance_init (PhotoMonitor * self) {
 #line 157 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv = PHOTO_MONITOR_GET_PRIVATE (self);
 #line 228 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 228 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->matched_editables = _tmp0_;
 #line 229 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 229 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->matched_developments = _tmp1_;
 #line 230 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp2_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp2_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_MASTER_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 230 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->master_reimport_pending = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_EDITABLE_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 232 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->editable_reimport_pending = _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, PHOTO_MONITOR_TYPE_REIMPORT_RAW_DEVELOPMENT_JOB, (GBoxedCopyFunc) background_job_ref, (GDestroyNotify) background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 234 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	self->priv->raw_developments_reimport_pending = _tmp4_;
 #line 8552 "PhotoMonitor.c"