Merge branch 'feature/upstream' into develop

1 files changed, 210 insertions, 210 deletions

diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index d7410e2..5edd809 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.34.7, the Vala compiler
+/* VideoMonitor.c generated by valac 0.36.6, the Vala compiler
  * generated from VideoMonitor.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -320,7 +320,7 @@ struct _MediaMonitorClass {
 	MonitorableUpdates* (*create_updates) (MediaMonitor* self, Monitorable* monitorable);
 	void (*on_media_source_destroyed) (MediaMonitor* self, DataSource* source);
 	void (*notify_discovery_started) (MediaMonitor* self);
-	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable** monitorable);
+	MediaMonitorDiscoveredFile (*notify_file_discovered) (MediaMonitor* self, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 	GeeCollection* (*candidates_for_unknown_file) (MediaMonitor* self, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 	GFile** (*get_auxilliary_backing_files) (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
 	void (*update_backing_file_info) (MediaMonitor* self, Monitorable* monitorable, GFile* file, GFileInfo* info);
@@ -426,7 +426,7 @@ void monitorable_updates_mark_online (MonitorableUpdates* self);
 gboolean video_updates_is_check_interpretable (VideoUpdates* self);
 static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base);
 gboolean monitorable_updates_is_all_updated (MonitorableUpdates* self);
-static void video_updates_finalize (MonitorableUpdates* obj);
+static void video_updates_finalize (MonitorableUpdates * obj);
 GType media_monitor_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
@@ -473,7 +473,7 @@ static MediaSourceCollection* video_monitor_real_get_media_source_collection (Me
 static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFile* file);
 GType video_source_collection_state_get_type (void) G_GNUC_CONST;
 static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSourceCollectionState* state);
-static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable);
+static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable);
 static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonitor* base, GFile* file, GFileInfo* info, MediaMonitorDiscoveredFile* _result_);
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master);
 static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFile* file, GFileInfo* info);
@@ -537,8 +537,8 @@ GType abstract_semaphore_get_type (void) G_GNUC_CONST;
 BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
 static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base);
 VideoInterpretableResults* video_check_is_interpretable (Video* self);
-static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob* obj);
-static void video_monitor_finalize (GObject* obj);
+static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj);
+static void video_monitor_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -550,9 +550,9 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 VideoUpdates* video_updates_construct (GType object_type, Video* video) {
 	VideoUpdates* self = NULL;
-	Video* _tmp0_ = NULL;
-	Video* _tmp1_ = NULL;
-	Video* _tmp2_ = NULL;
+	Video* _tmp0_;
+	Video* _tmp1_;
+	Video* _tmp2_;
 #line 12 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
 #line 13 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -581,7 +581,7 @@ VideoUpdates* video_updates_new (Video* video) {
 
 
 static void video_updates_real_set_check_interpretable (VideoUpdates* self, gboolean check) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	_tmp0_ = check;
 #line 19 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -613,7 +613,7 @@ static void video_updates_real_mark_online (MonitorableUpdates* base) {
 
 gboolean video_updates_is_check_interpretable (VideoUpdates* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_UPDATES (self), FALSE);
 #line 29 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -630,7 +630,7 @@ static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) {
 	VideoUpdates * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_UPDATES, VideoUpdates);
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -638,7 +638,7 @@ static gboolean video_updates_real_is_all_updated (MonitorableUpdates* base) {
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp1_ == FALSE) {
 #line 641 "VideoMonitor.c"
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = MONITORABLE_UPDATES_CLASS (video_updates_parent_class)->is_all_updated (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MONITORABLE_UPDATES, MonitorableUpdates));
 #line 33 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -665,11 +665,11 @@ static void video_updates_class_init (VideoUpdatesClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoUpdatesPrivate));
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((VideoUpdatesClass *) klass)->set_check_interpretable = (void (*)(VideoUpdates*, gboolean)) video_updates_real_set_check_interpretable;
+	((VideoUpdatesClass *) klass)->set_check_interpretable = (void (*) (VideoUpdates *, gboolean)) video_updates_real_set_check_interpretable;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) video_updates_real_mark_online;
+	((MonitorableUpdatesClass *) klass)->mark_online = (void (*) (MonitorableUpdates *)) video_updates_real_mark_online;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) video_updates_real_is_all_updated;
+	((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*) (MonitorableUpdates *)) video_updates_real_is_all_updated;
 #line 674 "VideoMonitor.c"
 }
 
@@ -683,7 +683,7 @@ static void video_updates_instance_init (VideoUpdates * self) {
 }
 
 
-static void video_updates_finalize (MonitorableUpdates* obj) {
+static void video_updates_finalize (MonitorableUpdates * obj) {
 	VideoUpdates * self;
 #line 7 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_UPDATES, VideoUpdates);
@@ -709,8 +709,8 @@ GType video_updates_get_type (void) {
 
 VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancellable) {
 	VideoMonitor * self = NULL;
-	VideoSourceCollection* _tmp0_ = NULL;
-	GCancellable* _tmp1_ = NULL;
+	VideoSourceCollection* _tmp0_;
+	GCancellable* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 66 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -722,11 +722,11 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 723 "VideoMonitor.c"
 	{
 		GeeIterator* _obj_it = NULL;
-		VideoSourceCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeCollection* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		VideoSourceCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = video_global;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -744,17 +744,17 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 747 "VideoMonitor.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			DataObject* obj = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			Video* video = NULL;
-			DataObject* _tmp11_ = NULL;
-			Video* _tmp12_ = NULL;
-			Video* _tmp13_ = NULL;
-			Video* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			DataObject* _tmp11_;
+			Video* _tmp12_;
+			Video* _tmp13_;
+			Video* _tmp14_;
+			gboolean _tmp15_;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp7_ = _obj_it;
 #line 68 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -788,7 +788,7 @@ VideoMonitor* video_monitor_construct (GType object_type, GCancellable* cancella
 #line 71 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (!_tmp15_) {
 #line 791 "VideoMonitor.c"
-				Video* _tmp16_ = NULL;
+				Video* _tmp16_;
 #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp16_ = video;
 #line 72 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -821,9 +821,9 @@ VideoMonitor* video_monitor_new (GCancellable* cancellable) {
 static MonitorableUpdates* video_monitor_real_create_updates (MediaMonitor* base, Monitorable* monitorable) {
 	VideoMonitor * self;
 	MonitorableUpdates* result = NULL;
-	Monitorable* _tmp0_ = NULL;
-	Monitorable* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Monitorable* _tmp0_;
+	Monitorable* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 76 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -854,8 +854,8 @@ static gpointer _data_collection_ref0 (gpointer self) {
 static MediaSourceCollection* video_monitor_real_get_media_source_collection (MediaMonitor* base) {
 	VideoMonitor * self;
 	MediaSourceCollection* result = NULL;
-	VideoSourceCollection* _tmp0_ = NULL;
-	MediaSourceCollection* _tmp1_ = NULL;
+	VideoSourceCollection* _tmp0_;
+	MediaSourceCollection* _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 83 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -874,11 +874,11 @@ static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFil
 	VideoMonitor * self;
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	gboolean _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 86 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -903,17 +903,17 @@ static gboolean video_monitor_real_is_file_represented (MediaMonitor* base, GFil
 }
 
 
-static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable** monitorable) {
+static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (MediaMonitor* base, GFile* file, GFileInfo* info, Monitorable* * monitorable) {
 	VideoMonitor * self;
 	Monitorable* _vala_monitorable = NULL;
 	MediaMonitorDiscoveredFile result = 0;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	VideoSourceCollectionState _tmp4_ = 0;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	VideoSourceCollectionState _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 91 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -964,8 +964,8 @@ static MediaMonitorDiscoveredFile video_monitor_real_notify_file_discovered (Med
 		case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
 #line 966 "VideoMonitor.c"
 		{
-			Video* _tmp5_ = NULL;
-			Monitorable* _tmp6_ = NULL;
+			Video* _tmp5_;
+			Monitorable* _tmp6_;
 #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp5_ = video;
 #line 104 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1040,9 +1040,9 @@ static GeeCollection* video_monitor_real_candidates_for_unknown_file (MediaMonit
 	MediaMonitorDiscoveredFile _vala_result = 0;
 	GeeCollection* result = NULL;
 	GeeCollection* matched = NULL;
-	GeeArrayList* _tmp0_ = NULL;
-	VideoSourceCollection* _tmp1_ = NULL;
-	GFileInfo* _tmp2_ = NULL;
+	GeeArrayList* _tmp0_;
+	VideoSourceCollection* _tmp1_;
+	GFileInfo* _tmp2_;
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 117 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1080,11 +1080,11 @@ static gboolean video_monitor_real_notify_file_created (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
 #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 127 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1130,16 +1130,16 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 	gboolean result = FALSE;
 	VideoSourceCollectionState old_state = 0;
 	Video* old_video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
+	Video* _tmp2_;
 	VideoSourceCollectionState new_state = 0;
 	Video* new_video = NULL;
-	GFile* _tmp3_ = NULL;
+	GFile* _tmp3_;
 	VideoSourceCollectionState _tmp4_ = 0;
-	Video* _tmp5_ = NULL;
+	Video* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	Video* _tmp7_ = NULL;
+	Video* _tmp7_;
 #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 138 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1169,7 +1169,7 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp7_ != NULL) {
 #line 1172 "VideoMonitor.c"
-		Video* _tmp8_ = NULL;
+		Video* _tmp8_;
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp8_ = new_video;
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1183,8 +1183,8 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 157 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp6_) {
 #line 1186 "VideoMonitor.c"
-		Video* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
+		Video* _tmp9_;
+		GFile* _tmp10_;
 #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp9_ = old_video;
 #line 159 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1194,13 +1194,13 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1195 "VideoMonitor.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
-		Video* _tmp12_ = NULL;
+		Video* _tmp12_;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp12_ = old_video;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		if (_tmp12_ == NULL) {
 #line 1203 "VideoMonitor.c"
-			Video* _tmp13_ = NULL;
+			Video* _tmp13_;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp13_ = new_video;
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1214,7 +1214,7 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 160 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		if (_tmp11_) {
 #line 1217 "VideoMonitor.c"
-			Video* _tmp14_ = NULL;
+			Video* _tmp14_;
 #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp14_ = new_video;
 #line 162 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1222,13 +1222,13 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1223 "VideoMonitor.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-			Video* _tmp16_ = NULL;
+			Video* _tmp16_;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp16_ = old_video;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp16_ == NULL) {
 #line 1231 "VideoMonitor.c"
-				Video* _tmp17_ = NULL;
+				Video* _tmp17_;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp17_ = new_video;
 #line 163 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1252,15 +1252,15 @@ static gboolean video_monitor_real_notify_file_moved (MediaMonitor* base, GFile*
 #line 1253 "VideoMonitor.c"
 			} else {
 				gboolean _tmp18_ = FALSE;
-				Video* _tmp19_ = NULL;
-				Video* _tmp21_ = NULL;
-				Video* _tmp22_ = NULL;
+				Video* _tmp19_;
+				Video* _tmp21_;
+				Video* _tmp22_;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp19_ = old_video;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				if (_tmp19_ != NULL) {
 #line 1263 "VideoMonitor.c"
-					Video* _tmp20_ = NULL;
+					Video* _tmp20_;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 					_tmp20_ = new_video;
 #line 167 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1301,11 +1301,11 @@ static gboolean video_monitor_real_notify_file_altered (MediaMonitor* base, GFil
 	VideoMonitor * self;
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	gboolean _tmp4_;
 #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 177 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1335,12 +1335,12 @@ static gboolean video_monitor_real_notify_file_attributes_altered (MediaMonitor*
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	Video* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	Video* _tmp5_;
 #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 182 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1388,12 +1388,12 @@ static gboolean video_monitor_real_notify_file_alteration_completed (MediaMonito
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	GFileInfo* _tmp5_;
 #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 194 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1441,12 +1441,12 @@ static gboolean video_monitor_real_notify_file_deleted (MediaMonitor* base, GFil
 	gboolean result = FALSE;
 	VideoSourceCollectionState state = 0;
 	Video* video = NULL;
-	GFile* _tmp0_ = NULL;
+	GFile* _tmp0_;
 	VideoSourceCollectionState _tmp1_ = 0;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
-	Video* _tmp4_ = NULL;
-	Video* _tmp5_ = NULL;
+	Video* _tmp2_;
+	Video* _tmp3_;
+	Video* _tmp4_;
+	Video* _tmp5_;
 #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
 #line 205 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1494,10 +1494,10 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 	Video* result = NULL;
 	GFile* real_file = NULL;
 	GFile* _tmp25_ = NULL;
-	GFile* _tmp26_ = NULL;
-	VideoSourceCollection* _tmp28_ = NULL;
+	GFile* _tmp26_;
+	VideoSourceCollection* _tmp28_;
 	VideoSourceCollectionState _tmp29_ = 0;
-	Video* _tmp30_ = NULL;
+	Video* _tmp30_;
 #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 217 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1507,10 +1507,10 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 1508 "VideoMonitor.c"
 	{
 		GeeIterator* _monitorable_it = NULL;
-		GeeCollection* _tmp0_ = NULL;
-		GeeCollection* _tmp1_ = NULL;
-		GeeIterator* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp0_;
+		GeeCollection* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp0_ = media_monitor_get_monitorables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_MONITOR, MediaMonitor));
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1526,23 +1526,23 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 1529 "VideoMonitor.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			Monitorable* monitorable = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			Video* video = NULL;
-			Monitorable* _tmp8_ = NULL;
-			Video* _tmp9_ = NULL;
+			Monitorable* _tmp8_;
+			Video* _tmp9_;
 			VideoUpdates* updates = NULL;
-			Video* _tmp10_ = NULL;
-			VideoUpdates* _tmp11_ = NULL;
-			VideoUpdates* _tmp12_ = NULL;
+			Video* _tmp10_;
+			VideoUpdates* _tmp11_;
+			VideoUpdates* _tmp12_;
 			gboolean _tmp13_ = FALSE;
-			VideoUpdates* _tmp14_ = NULL;
-			GFile* _tmp15_ = NULL;
-			GFile* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
+			VideoUpdates* _tmp14_;
+			GFile* _tmp15_;
+			GFile* _tmp16_;
+			gboolean _tmp17_;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp4_ = _monitorable_it;
 #line 219 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1598,11 +1598,11 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp17_) {
 #line 1601 "VideoMonitor.c"
-				VideoUpdates* _tmp18_ = NULL;
-				GFile* _tmp19_ = NULL;
-				GFile* _tmp20_ = NULL;
-				GFile* _tmp21_ = NULL;
-				gboolean _tmp22_ = FALSE;
+				VideoUpdates* _tmp18_;
+				GFile* _tmp19_;
+				GFile* _tmp20_;
+				GFile* _tmp21_;
+				gboolean _tmp22_;
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp18_ = updates;
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1626,8 +1626,8 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 226 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp13_) {
 #line 1629 "VideoMonitor.c"
-				Video* _tmp23_ = NULL;
-				GFile* _tmp24_ = NULL;
+				Video* _tmp23_;
+				GFile* _tmp24_;
 #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp23_ = video;
 #line 227 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1665,7 +1665,7 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp25_ == NULL) {
 #line 1668 "VideoMonitor.c"
-		GFile* _tmp27_ = NULL;
+		GFile* _tmp27_;
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = file;
 #line 233 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1697,9 +1697,9 @@ static Video* video_monitor_get_state (VideoMonitor* self, GFile* file, VideoSou
 VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* video) {
 	VideoUpdates* result = NULL;
 	VideoUpdates* updates = NULL;
-	Video* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Video* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 236 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1730,9 +1730,9 @@ VideoUpdates* video_monitor_fetch_video_updates (VideoMonitor* self, Video* vide
 
 VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Video* video) {
 	VideoUpdates* result = NULL;
-	Video* _tmp0_ = NULL;
-	MonitorableUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
+	Video* _tmp0_;
+	MonitorableUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
 #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO_MONITOR (self), NULL);
 #line 243 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1758,10 +1758,10 @@ VideoUpdates* video_monitor_get_existing_video_updates (VideoMonitor* self, Vide
 
 
 void video_monitor_set_check_interpretable (VideoMonitor* self, Video* video, gboolean check) {
-	Video* _tmp0_ = NULL;
-	VideoUpdates* _tmp1_ = NULL;
-	VideoUpdates* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	Video* _tmp0_;
+	VideoUpdates* _tmp1_;
+	VideoUpdates* _tmp2_;
+	gboolean _tmp3_;
 #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_if_fail (IS_VIDEO_MONITOR (self));
 #line 247 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1798,10 +1798,10 @@ static void _video_monitor_on_interpretable_check_complete_completion_callback (
 
 static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollection* all_updates, TransactionController* controller, gint* op_count, GError** error) {
 	VideoMonitor * self;
-	GeeCollection* _tmp0_ = NULL;
-	TransactionController* _tmp1_ = NULL;
+	GeeCollection* _tmp0_;
+	TransactionController* _tmp1_;
 	GeeArrayList* check = NULL;
-	GeeArrayList* _tmp26_ = NULL;
+	GeeArrayList* _tmp26_;
 	GError * _inner_error_ = NULL;
 #line 251 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_MONITOR, VideoMonitor);
@@ -1828,8 +1828,8 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1829 "VideoMonitor.c"
 	{
 		GeeIterator* _monitorable_updates_it = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeCollection* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp2_ = all_updates;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1839,20 +1839,20 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		while (TRUE) {
 #line 1842 "VideoMonitor.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			MonitorableUpdates* monitorable_updates = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
-			gint _tmp8_ = 0;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
+			gint _tmp8_;
 			gboolean _tmp9_ = FALSE;
-			GeeArrayList* _tmp10_ = NULL;
+			GeeArrayList* _tmp10_;
 			VideoUpdates* updates = NULL;
-			MonitorableUpdates* _tmp14_ = NULL;
-			VideoUpdates* _tmp15_ = NULL;
-			VideoUpdates* _tmp16_ = NULL;
-			VideoUpdates* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			MonitorableUpdates* _tmp14_;
+			VideoUpdates* _tmp15_;
+			VideoUpdates* _tmp16_;
+			VideoUpdates* _tmp17_;
+			gboolean _tmp18_;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp4_ = _monitorable_updates_it;
 #line 257 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1884,9 +1884,9 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp10_ != NULL) {
 #line 1887 "VideoMonitor.c"
-				GeeArrayList* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
+				GeeArrayList* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp11_ = check;
 #line 263 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1934,18 +1934,18 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 270 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			if (_tmp18_) {
 #line 1937 "VideoMonitor.c"
-				GeeArrayList* _tmp19_ = NULL;
-				GeeArrayList* _tmp21_ = NULL;
-				VideoUpdates* _tmp22_ = NULL;
-				Video* _tmp23_ = NULL;
-				VideoUpdates* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
+				GeeArrayList* _tmp19_;
+				GeeArrayList* _tmp21_;
+				VideoUpdates* _tmp22_;
+				Video* _tmp23_;
+				VideoUpdates* _tmp24_;
+				gint _tmp25_;
 #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp19_ = check;
 #line 271 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				if (_tmp19_ == NULL) {
 #line 1948 "VideoMonitor.c"
-					GeeArrayList* _tmp20_ = NULL;
+					GeeArrayList* _tmp20_;
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 					_tmp20_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 272 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -1987,15 +1987,15 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 280 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	if (_tmp26_ != NULL) {
 #line 1990 "VideoMonitor.c"
-		GeeArrayList* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
-		gint _tmp29_ = 0;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		guint64 _tmp32_ = 0ULL;
-		GeeArrayList* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
+		GeeArrayList* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
+		gchar* _tmp30_;
+		gchar* _tmp31_;
+		guint64 _tmp32_;
+		GeeArrayList* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 		_tmp27_ = check;
 #line 281 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2025,12 +2025,12 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 2026 "VideoMonitor.c"
 		{
 			GeeArrayList* _video_list = NULL;
-			GeeArrayList* _tmp36_ = NULL;
-			GeeArrayList* _tmp37_ = NULL;
+			GeeArrayList* _tmp36_;
+			GeeArrayList* _tmp37_;
 			gint _video_size = 0;
-			GeeArrayList* _tmp38_ = NULL;
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
+			GeeArrayList* _tmp38_;
+			gint _tmp39_;
+			gint _tmp40_;
 			gint _video_index = 0;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			_tmp36_ = check;
@@ -2051,17 +2051,17 @@ static void video_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 			while (TRUE) {
 #line 2054 "VideoMonitor.c"
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
+				gint _tmp41_;
+				gint _tmp42_;
+				gint _tmp43_;
 				Video* video = NULL;
-				GeeArrayList* _tmp44_ = NULL;
-				gint _tmp45_ = 0;
-				gpointer _tmp46_ = NULL;
-				Workers* _tmp47_ = NULL;
-				Video* _tmp48_ = NULL;
-				VideoMonitorVideoInterpretableCheckJob* _tmp49_ = NULL;
-				VideoMonitorVideoInterpretableCheckJob* _tmp50_ = NULL;
+				GeeArrayList* _tmp44_;
+				gint _tmp45_;
+				gpointer _tmp46_;
+				Workers* _tmp47_;
+				Video* _tmp48_;
+				VideoMonitorVideoInterpretableCheckJob* _tmp49_;
+				VideoMonitorVideoInterpretableCheckJob* _tmp50_;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 				_tmp41_ = _video_index;
 #line 286 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2120,12 +2120,12 @@ static gpointer _background_job_ref0 (gpointer self) {
 
 static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, BackgroundJob* j) {
 	VideoMonitorVideoInterpretableCheckJob* job = NULL;
-	BackgroundJob* _tmp0_ = NULL;
-	VideoMonitorVideoInterpretableCheckJob* _tmp1_ = NULL;
-	VideoMonitorVideoInterpretableCheckJob* _tmp2_ = NULL;
-	VideoInterpretableResults* _tmp3_ = NULL;
-	guint64 _tmp4_ = 0ULL;
-	guint64 _tmp5_ = 0ULL;
+	BackgroundJob* _tmp0_;
+	VideoMonitorVideoInterpretableCheckJob* _tmp1_;
+	VideoMonitorVideoInterpretableCheckJob* _tmp2_;
+	VideoInterpretableResults* _tmp3_;
+	guint64 _tmp4_;
+	guint64 _tmp5_;
 #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_if_fail (IS_VIDEO_MONITOR (self));
 #line 291 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2162,11 +2162,11 @@ static void video_monitor_on_interpretable_check_complete (VideoMonitor* self, B
 
 static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable_check_job_construct (GType object_type, Video* video, CompletionCallback callback, void* callback_target) {
 	VideoMonitorVideoInterpretableCheckJob* self = NULL;
-	Video* _tmp0_ = NULL;
-	CompletionCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	Video* _tmp2_ = NULL;
-	Video* _tmp3_ = NULL;
+	Video* _tmp0_;
+	CompletionCallback _tmp1_;
+	void* _tmp1__target;
+	Video* _tmp2_;
+	Video* _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
 #line 50 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2200,8 +2200,8 @@ static VideoMonitorVideoInterpretableCheckJob* video_monitor_video_interpretable
 
 static void video_monitor_video_interpretable_check_job_real_execute (BackgroundJob* base) {
 	VideoMonitorVideoInterpretableCheckJob * self;
-	Video* _tmp0_ = NULL;
-	VideoInterpretableResults* _tmp1_ = NULL;
+	Video* _tmp0_;
+	VideoInterpretableResults* _tmp1_;
 #line 54 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob);
 #line 55 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2222,7 +2222,7 @@ static void video_monitor_video_interpretable_check_job_class_init (VideoMonitor
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	((BackgroundJobClass *) klass)->finalize = video_monitor_video_interpretable_check_job_finalize;
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) video_monitor_video_interpretable_check_job_real_execute;
+	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) video_monitor_video_interpretable_check_job_real_execute;
 #line 2227 "VideoMonitor.c"
 }
 
@@ -2234,7 +2234,7 @@ static void video_monitor_video_interpretable_check_job_instance_init (VideoMoni
 }
 
 
-static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob* obj) {
+static void video_monitor_video_interpretable_check_job_finalize (BackgroundJob * obj) {
 	VideoMonitorVideoInterpretableCheckJob * self;
 #line 42 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_MONITOR_TYPE_VIDEO_INTERPRETABLE_CHECK_JOB, VideoMonitorVideoInterpretableCheckJob);
@@ -2266,29 +2266,29 @@ static void video_monitor_class_init (VideoMonitorClass * klass) {
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	g_type_class_add_private (klass, sizeof (VideoMonitorPrivate));
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) video_monitor_real_create_updates;
+	((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*) (MediaMonitor *, Monitorable*)) video_monitor_real_create_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) video_monitor_real_get_media_source_collection;
+	((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*) (MediaMonitor *)) video_monitor_real_get_media_source_collection;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_is_file_represented;
+	((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_is_file_represented;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) video_monitor_real_notify_file_discovered;
+	((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*) (MediaMonitor *, GFile*, GFileInfo*, Monitorable* *)) video_monitor_real_notify_file_discovered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) video_monitor_real_candidates_for_unknown_file;
+	((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*) (MediaMonitor *, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) video_monitor_real_candidates_for_unknown_file;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_created;
+	((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) video_monitor_real_notify_file_created;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) video_monitor_real_notify_file_moved;
+	((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*) (MediaMonitor *, GFile*, GFile*, GFileInfo*)) video_monitor_real_notify_file_moved;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_altered;
+	((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_attributes_altered;
+	((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_attributes_altered;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) video_monitor_real_notify_file_alteration_completed;
+	((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*) (MediaMonitor *, GFile*, GFileInfo*)) video_monitor_real_notify_file_alteration_completed;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) video_monitor_real_notify_file_deleted;
+	((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*) (MediaMonitor *, GFile*)) video_monitor_real_notify_file_deleted;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
-	((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates;
+	((MediaMonitorClass *) klass)->process_updates = (void (*) (MediaMonitor *, GeeCollection*, TransactionController*, gint*, GError**)) video_monitor_real_process_updates;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_monitor_finalize;
 #line 2295 "VideoMonitor.c"
@@ -2296,7 +2296,7 @@ static void video_monitor_class_init (VideoMonitorClass * klass) {
 
 
 static void video_monitor_instance_init (VideoMonitor * self) {
-	Workers* _tmp0_ = NULL;
+	Workers* _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self->priv = VIDEO_MONITOR_GET_PRIVATE (self);
 #line 62 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
@@ -2309,7 +2309,7 @@ static void video_monitor_instance_init (VideoMonitor * self) {
 }
 
 
-static void video_monitor_finalize (GObject* obj) {
+static void video_monitor_finalize (GObject * obj) {
 	VideoMonitor * self;
 #line 37 "/home/jens/Source/shotwell/src/VideoMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_MONITOR, VideoMonitor);