New upstream version 0.26.4upstream/0.26.4

1 files changed, 360 insertions, 355 deletions

diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index 93794c0..ff1dc00 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.34.7, the Vala compiler
+/* Tracker.c generated by valac 0.36.6, the Vala compiler
  * generated from Tracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -65,6 +65,11 @@ typedef struct _DataCollectionClass DataCollectionClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 typedef struct _CoreParamSpecTracker CoreParamSpecTracker;
+enum  {
+	CORE_TRACKER_UPDATED_SIGNAL,
+	CORE_TRACKER_LAST_SIGNAL
+};
+static guint core_tracker_signals[CORE_TRACKER_LAST_SIGNAL] = {0};
 
 #define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ())
 #define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker))
@@ -171,7 +176,7 @@ struct _CoreViewTrackerMuxClass {
 static gpointer core_tracker_parent_class = NULL;
 static gpointer core_view_tracker_parent_class = NULL;
 static gpointer core_view_tracker_mux_parent_class = NULL;
-static CoreTrackerAccumulatorIface* core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * core_view_tracker_mux_core_tracker_accumulator_parent_iface = NULL;
 
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
@@ -218,7 +223,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude_object (DataObject* object, gpointer self);
 static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object (DataObject* object, gpointer self);
 static void core_tracker_real_updated (CoreTracker* self);
-static void core_tracker_finalize (CoreTracker* obj);
+static void core_tracker_finalize (CoreTracker * obj);
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
 static GType core_view_tracker_mux_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define CORE_VIEW_TRACKER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerPrivate))
@@ -249,8 +254,8 @@ gboolean data_view_is_visible (DataView* self);
 gboolean data_view_is_selected (DataView* self);
 static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* base, DataObject* object);
 static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
-static void core_view_tracker_mux_finalize (GObject* obj);
-static void core_view_tracker_finalize (CoreTracker* obj);
+static void core_view_tracker_mux_finalize (GObject * obj);
+static void core_view_tracker_finalize (CoreTracker * obj);
 
 
 gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObject* object) {
@@ -258,7 +263,7 @@ gboolean core_tracker_accumulator_include (CoreTrackerAccumulator* self, DataObj
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 13 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->include (self, object);
-#line 262 "Tracker.c"
+#line 267 "Tracker.c"
 }
 
 
@@ -267,7 +272,7 @@ gboolean core_tracker_accumulator_uninclude (CoreTrackerAccumulator* self, DataO
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 15 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->uninclude (self, object);
-#line 271 "Tracker.c"
+#line 276 "Tracker.c"
 }
 
 
@@ -276,7 +281,7 @@ gboolean core_tracker_accumulator_altered (CoreTrackerAccumulator* self, DataObj
 	g_return_val_if_fail (CORE_IS_TRACKER_ACCUMULATOR (self), FALSE);
 #line 17 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return CORE_TRACKER_ACCUMULATOR_GET_INTERFACE (self)->altered (self, object, alteration);
-#line 280 "Tracker.c"
+#line 285 "Tracker.c"
 }
 
 
@@ -287,7 +292,7 @@ static void core_tracker_accumulator_base_init (CoreTrackerAccumulatorIface * if
 	if (!initialized) {
 #line 12 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		initialized = TRUE;
-#line 291 "Tracker.c"
+#line 296 "Tracker.c"
 	}
 }
 
@@ -308,44 +313,44 @@ GType core_tracker_accumulator_get_type (void) {
 static void _core_tracker_on_items_added_data_collection_items_added (DataCollection* _sender, GeeIterable* added, gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_added ((CoreTracker*) self, added);
-#line 312 "Tracker.c"
+#line 317 "Tracker.c"
 }
 
 
 static void _core_tracker_on_items_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_removed ((CoreTracker*) self, removed);
-#line 319 "Tracker.c"
+#line 324 "Tracker.c"
 }
 
 
 static void _core_tracker_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_on_items_altered ((CoreTracker*) self, items);
-#line 326 "Tracker.c"
+#line 331 "Tracker.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 34 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 333 "Tracker.c"
+#line 338 "Tracker.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 340 "Tracker.c"
+#line 345 "Tracker.c"
 }
 
 
 CoreTracker* core_tracker_construct (GType object_type, DataCollection* collection, GeeCollection* initial) {
 	CoreTracker* self = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (IS_DATA_COLLECTION (collection), NULL);
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -370,26 +375,26 @@ CoreTracker* core_tracker_construct (GType object_type, DataCollection* collecti
 	self->priv->initial = _tmp3_;
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 374 "Tracker.c"
+#line 379 "Tracker.c"
 }
 
 
 CoreTracker* core_tracker_new (DataCollection* collection, GeeCollection* initial) {
 #line 33 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_tracker_construct (CORE_TYPE_TRACKER, collection, initial);
-#line 381 "Tracker.c"
+#line 386 "Tracker.c"
 }
 
 
 void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
-	CoreTrackerAccumulator* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	DataCollection* _tmp3_ = NULL;
-	DataCollection* _tmp4_ = NULL;
-	DataCollection* _tmp5_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	DataCollection* _tmp3_;
+	DataCollection* _tmp4_;
+	DataCollection* _tmp5_;
 	gboolean _tmp6_ = FALSE;
-	GeeCollection* _tmp7_ = NULL;
+	GeeCollection* _tmp7_;
 #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 46 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -422,10 +427,10 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 	_tmp7_ = self->priv->initial;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp7_ != NULL) {
-#line 426 "Tracker.c"
-		GeeCollection* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
+#line 431 "Tracker.c"
+		GeeCollection* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = self->priv->initial;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -434,31 +439,31 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 		_tmp10_ = _tmp9_;
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp6_ = _tmp10_ > 0;
-#line 438 "Tracker.c"
+#line 443 "Tracker.c"
 	} else {
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp6_ = FALSE;
-#line 442 "Tracker.c"
+#line 447 "Tracker.c"
 	}
 #line 56 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp6_) {
-#line 446 "Tracker.c"
-		GeeCollection* _tmp11_ = NULL;
+#line 451 "Tracker.c"
+		GeeCollection* _tmp11_;
 #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = self->priv->initial;
 #line 57 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 452 "Tracker.c"
+#line 457 "Tracker.c"
 	} else {
-		GeeCollection* _tmp12_ = NULL;
+		GeeCollection* _tmp12_;
 #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp12_ = self->priv->initial;
 #line 58 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		if (_tmp12_ == NULL) {
-#line 459 "Tracker.c"
-			DataCollection* _tmp13_ = NULL;
-			GeeCollection* _tmp14_ = NULL;
-			GeeCollection* _tmp15_ = NULL;
+#line 464 "Tracker.c"
+			DataCollection* _tmp13_;
+			GeeCollection* _tmp14_;
+			GeeCollection* _tmp15_;
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = self->priv->collection;
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -469,21 +474,21 @@ void core_tracker_start (CoreTracker* self, CoreTrackerAccumulator* acc) {
 			core_tracker_on_items_added (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 59 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (_tmp15_);
-#line 473 "Tracker.c"
+#line 478 "Tracker.c"
 		}
 	}
 #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->initial);
 #line 61 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->priv->initial = NULL;
-#line 480 "Tracker.c"
+#line 485 "Tracker.c"
 }
 
 
 DataCollection* core_tracker_get_collection (CoreTracker* self) {
 	DataCollection* result = NULL;
-	DataCollection* _tmp0_ = NULL;
-	DataCollection* _tmp1_ = NULL;
+	DataCollection* _tmp0_;
+	DataCollection* _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (CORE_IS_TRACKER (self), NULL);
 #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -494,7 +499,7 @@ DataCollection* core_tracker_get_collection (CoreTracker* self) {
 	result = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 498 "Tracker.c"
+#line 503 "Tracker.c"
 }
 
 
@@ -503,13 +508,13 @@ static gboolean _core_tracker_accumulator_include_core_tracker_include_uninclude
 	result = core_tracker_accumulator_include ((CoreTrackerAccumulator*) self, object);
 #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 507 "Tracker.c"
+#line 512 "Tracker.c"
 }
 
 
 static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added) {
-	GeeIterable* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 68 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -520,7 +525,7 @@ static void core_tracker_on_items_added (CoreTracker* self, GeeIterable* added)
 	_tmp1_ = self->priv->acc;
 #line 69 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp1_);
-#line 524 "Tracker.c"
+#line 529 "Tracker.c"
 }
 
 
@@ -529,13 +534,13 @@ static gboolean _core_tracker_accumulator_uninclude_core_tracker_include_uninclu
 	result = core_tracker_accumulator_uninclude ((CoreTrackerAccumulator*) self, object);
 #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 533 "Tracker.c"
+#line 538 "Tracker.c"
 }
 
 
 static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* removed) {
-	GeeIterable* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	GeeIterable* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 72 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -546,24 +551,24 @@ static void core_tracker_on_items_removed (CoreTracker* self, GeeIterable* remov
 	_tmp1_ = self->priv->acc;
 #line 73 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_tracker_include_uninclude (self, _tmp0_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp1_);
-#line 550 "Tracker.c"
+#line 555 "Tracker.c"
 }
 
 
 void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, CoreTrackerIncludeUnincludeObject cb, void* cb_target) {
 	gboolean fire_updated = FALSE;
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 77 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (objects));
 #line 78 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	fire_updated = FALSE;
-#line 563 "Tracker.c"
+#line 568 "Tracker.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeIterable* _tmp0_ = NULL;
-		GeeIterator* _tmp1_ = NULL;
+		GeeIterable* _tmp0_;
+		GeeIterator* _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp0_ = objects;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -572,17 +577,17 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 		_object_it = _tmp1_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		while (TRUE) {
-#line 576 "Tracker.c"
-			GeeIterator* _tmp2_ = NULL;
-			gboolean _tmp3_ = FALSE;
+#line 581 "Tracker.c"
+			GeeIterator* _tmp2_;
+			gboolean _tmp3_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp4_ = NULL;
-			gpointer _tmp5_ = NULL;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
-			CoreTrackerIncludeUnincludeObject _tmp7_ = NULL;
-			void* _tmp7__target = NULL;
-			DataObject* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			CoreTrackerIncludeUnincludeObject _tmp7_;
+			void* _tmp7__target;
+			DataObject* _tmp8_;
+			gboolean _tmp9_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp2_ = _object_it;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -591,7 +596,7 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 			if (!_tmp3_) {
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				break;
-#line 595 "Tracker.c"
+#line 600 "Tracker.c"
 			}
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp4_ = _object_it;
@@ -611,54 +616,54 @@ void core_tracker_include_uninclude (CoreTracker* self, GeeIterable* objects, Co
 			if (_tmp9_) {
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp6_ = TRUE;
-#line 615 "Tracker.c"
+#line 620 "Tracker.c"
 			} else {
-				gboolean _tmp10_ = FALSE;
+				gboolean _tmp10_;
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = fire_updated;
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp6_ = _tmp10_;
-#line 622 "Tracker.c"
+#line 627 "Tracker.c"
 			}
 #line 80 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			fire_updated = _tmp6_;
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (object);
-#line 628 "Tracker.c"
+#line 633 "Tracker.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_g_object_unref0 (_object_it);
-#line 632 "Tracker.c"
+#line 637 "Tracker.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp11_ = fire_updated;
 #line 82 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp11_) {
 #line 83 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-		g_signal_emit_by_name (self, "updated");
-#line 640 "Tracker.c"
+		g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0);
+#line 645 "Tracker.c"
 	}
 }
 
 
 static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 	gboolean fire_updated = FALSE;
-	gboolean _tmp20_ = FALSE;
+	gboolean _tmp20_;
 #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_TRACKER (self));
 #line 86 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 87 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	fire_updated = FALSE;
-#line 654 "Tracker.c"
+#line 659 "Tracker.c"
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp0_ = NULL;
-		GeeSet* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		GeeMap* _tmp0_;
+		GeeSet* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp0_ = map;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -677,21 +682,21 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 		_object_it = _tmp5_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		while (TRUE) {
-#line 681 "Tracker.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 686 "Tracker.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
 			gboolean _tmp10_ = FALSE;
-			CoreTrackerAccumulator* _tmp11_ = NULL;
-			DataObject* _tmp12_ = NULL;
-			GeeMap* _tmp13_ = NULL;
-			DataObject* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			gboolean _tmp17_ = FALSE;
-			gboolean _tmp18_ = FALSE;
+			CoreTrackerAccumulator* _tmp11_;
+			DataObject* _tmp12_;
+			GeeMap* _tmp13_;
+			DataObject* _tmp14_;
+			gpointer _tmp15_;
+			Alteration* _tmp16_;
+			gboolean _tmp17_;
+			gboolean _tmp18_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp6_ = _object_it;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -700,7 +705,7 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 			if (!_tmp7_) {
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				break;
-#line 704 "Tracker.c"
+#line 709 "Tracker.c"
 			}
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp8_ = _object_it;
@@ -730,32 +735,32 @@ static void core_tracker_on_items_altered (CoreTracker* self, GeeMap* map) {
 			if (_tmp18_) {
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = TRUE;
-#line 734 "Tracker.c"
+#line 739 "Tracker.c"
 			} else {
-				gboolean _tmp19_ = FALSE;
+				gboolean _tmp19_;
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp19_ = fire_updated;
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 				_tmp10_ = _tmp19_;
-#line 741 "Tracker.c"
+#line 746 "Tracker.c"
 			}
 #line 89 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			fire_updated = _tmp10_;
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_g_object_unref0 (object);
-#line 747 "Tracker.c"
+#line 752 "Tracker.c"
 		}
 #line 88 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_g_object_unref0 (_object_it);
-#line 751 "Tracker.c"
+#line 756 "Tracker.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp20_ = fire_updated;
 #line 91 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp20_) {
 #line 92 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-		g_signal_emit_by_name (self, "updated");
-#line 759 "Tracker.c"
+		g_signal_emit (self, core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL], 0);
+#line 764 "Tracker.c"
 	}
 }
 
@@ -767,7 +772,7 @@ static void core_tracker_real_updated (CoreTracker* self) {
 static void core_value_tracker_init (GValue* value) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	value->data[0].v_pointer = NULL;
-#line 771 "Tracker.c"
+#line 776 "Tracker.c"
 }
 
 
@@ -776,7 +781,7 @@ static void core_value_tracker_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (value->data[0].v_pointer);
-#line 780 "Tracker.c"
+#line 785 "Tracker.c"
 	}
 }
 
@@ -786,11 +791,11 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		dest_value->data[0].v_pointer = core_tracker_ref (src_value->data[0].v_pointer);
-#line 790 "Tracker.c"
+#line 795 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 794 "Tracker.c"
+#line 799 "Tracker.c"
 	}
 }
 
@@ -798,66 +803,66 @@ static void core_value_tracker_copy_value (const GValue* src_value, GValue* dest
 static gpointer core_value_tracker_peek_pointer (const GValue* value) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return value->data[0].v_pointer;
-#line 802 "Tracker.c"
+#line 807 "Tracker.c"
 }
 
 
 static gchar* core_value_tracker_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (collect_values[0].v_pointer) {
-#line 809 "Tracker.c"
-		CoreTracker* object;
+#line 814 "Tracker.c"
+		CoreTracker * object;
 		object = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 816 "Tracker.c"
+#line 821 "Tracker.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 820 "Tracker.c"
+#line 825 "Tracker.c"
 		}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = core_tracker_ref (object);
-#line 824 "Tracker.c"
+#line 829 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 828 "Tracker.c"
+#line 833 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return NULL;
-#line 832 "Tracker.c"
+#line 837 "Tracker.c"
 }
 
 
 static gchar* core_value_tracker_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	CoreTracker** object_p;
+	CoreTracker ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (!object_p) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 843 "Tracker.c"
+#line 848 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (!value->data[0].v_pointer) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = NULL;
-#line 849 "Tracker.c"
+#line 854 "Tracker.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = value->data[0].v_pointer;
-#line 853 "Tracker.c"
+#line 858 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		*object_p = core_tracker_ref (value->data[0].v_pointer);
-#line 857 "Tracker.c"
+#line 862 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return NULL;
-#line 861 "Tracker.c"
+#line 866 "Tracker.c"
 }
 
 
@@ -871,7 +876,7 @@ GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return G_PARAM_SPEC (spec);
-#line 875 "Tracker.c"
+#line 880 "Tracker.c"
 }
 
 
@@ -880,12 +885,12 @@ gpointer core_value_get_tracker (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER), NULL);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return value->data[0].v_pointer;
-#line 884 "Tracker.c"
+#line 889 "Tracker.c"
 }
 
 
 void core_value_set_tracker (GValue* value, gpointer v_object) {
-	CoreTracker* old;
+	CoreTracker * old;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -900,23 +905,23 @@ void core_value_set_tracker (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_ref (value->data[0].v_pointer);
-#line 904 "Tracker.c"
+#line 909 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 908 "Tracker.c"
+#line 913 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (old);
-#line 914 "Tracker.c"
+#line 919 "Tracker.c"
 	}
 }
 
 
 void core_value_take_tracker (GValue* value, gpointer v_object) {
-	CoreTracker* old;
+	CoreTracker * old;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CORE_TYPE_TRACKER));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -929,17 +934,17 @@ void core_value_take_tracker (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = v_object;
-#line 933 "Tracker.c"
+#line 938 "Tracker.c"
 	} else {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		value->data[0].v_pointer = NULL;
-#line 937 "Tracker.c"
+#line 942 "Tracker.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (old) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_unref (old);
-#line 943 "Tracker.c"
+#line 948 "Tracker.c"
 	}
 }
 
@@ -954,8 +959,8 @@ static void core_tracker_class_init (CoreTrackerClass * klass) {
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	((CoreTrackerClass *) klass)->updated = core_tracker_real_updated;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 959 "Tracker.c"
+	core_tracker_signals[CORE_TRACKER_UPDATED_SIGNAL] = g_signal_new ("updated", CORE_TYPE_TRACKER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CoreTrackerClass, updated), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 964 "Tracker.c"
 }
 
 
@@ -966,13 +971,13 @@ static void core_tracker_instance_init (CoreTracker * self) {
 	self->priv->acc = NULL;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->ref_count = 1;
-#line 970 "Tracker.c"
+#line 975 "Tracker.c"
 }
 
 
-static void core_tracker_finalize (CoreTracker* obj) {
+static void core_tracker_finalize (CoreTracker * obj) {
 	CoreTracker * self;
-	CoreTrackerAccumulator* _tmp0_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_TRACKER, CoreTracker);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -981,13 +986,13 @@ static void core_tracker_finalize (CoreTracker* obj) {
 	_tmp0_ = self->priv->acc;
 #line 39 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp0_ != NULL) {
-#line 985 "Tracker.c"
-		DataCollection* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		DataCollection* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
-		DataCollection* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
+#line 990 "Tracker.c"
+		DataCollection* _tmp1_;
+		guint _tmp2_;
+		DataCollection* _tmp3_;
+		guint _tmp4_;
+		DataCollection* _tmp5_;
+		guint _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp1_ = self->priv->collection;
 #line 40 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1006,7 +1011,7 @@ static void core_tracker_finalize (CoreTracker* obj) {
 		g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
 #line 42 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _core_tracker_on_items_altered_data_collection_items_altered, self);
-#line 1010 "Tracker.c"
+#line 1015 "Tracker.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_data_collection_unref0 (self->priv->collection);
@@ -1014,7 +1019,7 @@ static void core_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->priv->initial);
 #line 28 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->acc);
-#line 1018 "Tracker.c"
+#line 1023 "Tracker.c"
 }
 
 
@@ -1033,18 +1038,18 @@ GType core_tracker_get_type (void) {
 
 
 gpointer core_tracker_ref (gpointer instance) {
-	CoreTracker* self;
+	CoreTracker * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return instance;
-#line 1043 "Tracker.c"
+#line 1048 "Tracker.c"
 }
 
 
 void core_tracker_unref (gpointer instance) {
-	CoreTracker* self;
+	CoreTracker * self;
 	self = instance;
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1052,7 +1057,7 @@ void core_tracker_unref (gpointer instance) {
 		CORE_TRACKER_GET_CLASS (self)->finalize (self);
 #line 23 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1056 "Tracker.c"
+#line 1061 "Tracker.c"
 	}
 }
 
@@ -1060,37 +1065,37 @@ void core_tracker_unref (gpointer instance) {
 static void _core_view_tracker_on_items_shown_view_collection_items_shown (ViewCollection* _sender, GeeCollection* visible, gpointer self) {
 #line 173 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_shown ((CoreViewTracker*) self, visible);
-#line 1064 "Tracker.c"
+#line 1069 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) {
 #line 174 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_hidden ((CoreViewTracker*) self, hidden);
-#line 1071 "Tracker.c"
+#line 1076 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_selected_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 175 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_selected ((CoreViewTracker*) self, selected);
-#line 1078 "Tracker.c"
+#line 1083 "Tracker.c"
 }
 
 
 static void _core_view_tracker_on_items_unselected_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) {
 #line 176 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_on_items_unselected ((CoreViewTracker*) self, unselected);
-#line 1085 "Tracker.c"
+#line 1090 "Tracker.c"
 }
 
 
 CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection) {
 	CoreViewTracker* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	GeeCollection* _tmp3_;
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
 #line 166 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1107,27 +1112,27 @@ CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection*
 	_g_object_unref0 (_tmp3_);
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 1111 "Tracker.c"
+#line 1116 "Tracker.c"
 }
 
 
 CoreViewTracker* core_view_tracker_new (ViewCollection* collection) {
 #line 165 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_view_tracker_construct (CORE_TYPE_VIEW_TRACKER, collection);
-#line 1118 "Tracker.c"
+#line 1123 "Tracker.c"
 }
 
 
 void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	CoreTrackerAccumulator* _tmp3_ = NULL;
-	CoreViewTrackerMux* _tmp4_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	CoreTrackerAccumulator* _tmp3_;
+	CoreViewTrackerMux* _tmp4_;
 	ViewCollection* collection = NULL;
-	DataCollection* _tmp5_ = NULL;
-	ViewCollection* _tmp6_ = NULL;
-	CoreViewTrackerMux* _tmp7_ = NULL;
+	DataCollection* _tmp5_;
+	ViewCollection* _tmp6_;
+	CoreViewTrackerMux* _tmp7_;
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1160,7 +1165,7 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all
 	if (_tmp6_ == NULL) {
 #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1164 "Tracker.c"
+#line 1169 "Tracker.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	collection = _tmp6_;
@@ -1180,13 +1185,13 @@ void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all
 	core_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 180 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_data_collection_unref0 (collection);
-#line 1184 "Tracker.c"
+#line 1189 "Tracker.c"
 }
 
 
 static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollection* shown) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 195 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1197,10 +1202,10 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti
 	_tmp1_ = _tmp0_->visible;
 #line 196 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1201 "Tracker.c"
-		GeeCollection* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1206 "Tracker.c"
+		GeeCollection* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = shown;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1209,14 +1214,14 @@ static void core_view_tracker_on_items_shown (CoreViewTracker* self, GeeCollecti
 		_tmp4_ = _tmp3_->visible;
 #line 197 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_);
-#line 1213 "Tracker.c"
+#line 1218 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollection* hidden) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 200 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1227,10 +1232,10 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect
 	_tmp1_ = _tmp0_->visible;
 #line 201 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1231 "Tracker.c"
-		GeeCollection* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1236 "Tracker.c"
+		GeeCollection* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = hidden;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1239,14 +1244,14 @@ static void core_view_tracker_on_items_hidden (CoreViewTracker* self, GeeCollect
 		_tmp4_ = _tmp3_->visible;
 #line 202 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable), _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_);
-#line 1243 "Tracker.c"
+#line 1248 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeIterable* selected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 205 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1257,10 +1262,10 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera
 	_tmp1_ = _tmp0_->selected;
 #line 206 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1261 "Tracker.c"
-		GeeIterable* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1266 "Tracker.c"
+		GeeIterable* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = selected;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1269,14 +1274,14 @@ static void core_view_tracker_on_items_selected (CoreViewTracker* self, GeeItera
 		_tmp4_ = _tmp3_->selected;
 #line 207 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_include_core_tracker_include_uninclude_object, _tmp4_);
-#line 1273 "Tracker.c"
+#line 1278 "Tracker.c"
 	}
 }
 
 
 static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIterable* unselected) {
-	CoreViewTrackerMux* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
 #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_if_fail (CORE_IS_VIEW_TRACKER (self));
 #line 210 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1287,10 +1292,10 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte
 	_tmp1_ = _tmp0_->selected;
 #line 211 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp1_ != NULL) {
-#line 1291 "Tracker.c"
-		GeeIterable* _tmp2_ = NULL;
-		CoreViewTrackerMux* _tmp3_ = NULL;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
+#line 1296 "Tracker.c"
+		GeeIterable* _tmp2_;
+		CoreViewTrackerMux* _tmp3_;
+		CoreTrackerAccumulator* _tmp4_;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp2_ = unselected;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1299,19 +1304,19 @@ static void core_view_tracker_on_items_unselected (CoreViewTracker* self, GeeIte
 		_tmp4_ = _tmp3_->selected;
 #line 212 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		core_tracker_include_uninclude (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker), _tmp2_, _core_tracker_accumulator_uninclude_core_tracker_include_uninclude_object, _tmp4_);
-#line 1303 "Tracker.c"
+#line 1308 "Tracker.c"
 	}
 }
 
 
 static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
 	CoreViewTrackerMux * self = NULL;
-	CoreTrackerAccumulator* _tmp0_ = NULL;
-	CoreTrackerAccumulator* _tmp1_ = NULL;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
-	CoreTrackerAccumulator* _tmp3_ = NULL;
-	CoreTrackerAccumulator* _tmp4_ = NULL;
-	CoreTrackerAccumulator* _tmp5_ = NULL;
+	CoreTrackerAccumulator* _tmp0_;
+	CoreTrackerAccumulator* _tmp1_;
+	CoreTrackerAccumulator* _tmp2_;
+	CoreTrackerAccumulator* _tmp3_;
+	CoreTrackerAccumulator* _tmp4_;
+	CoreTrackerAccumulator* _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_return_val_if_fail ((all == NULL) || CORE_IS_TRACKER_ACCUMULATOR (all), NULL);
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1346,14 +1351,14 @@ static CoreViewTrackerMux* core_view_tracker_mux_construct (GType object_type, C
 	self->selected = _tmp5_;
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return self;
-#line 1350 "Tracker.c"
+#line 1355 "Tracker.c"
 }
 
 
 static CoreViewTrackerMux* core_view_tracker_mux_new (CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected) {
 #line 105 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return core_view_tracker_mux_construct (CORE_VIEW_TRACKER_TYPE_MUX, all, visible, selected);
-#line 1357 "Tracker.c"
+#line 1362 "Tracker.c"
 }
 
 
@@ -1361,14 +1366,14 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp8_ = FALSE;
-	CoreTrackerAccumulator* _tmp9_ = NULL;
+	CoreTrackerAccumulator* _tmp9_;
 	gboolean _tmp17_ = FALSE;
-	CoreTrackerAccumulator* _tmp18_ = NULL;
+	CoreTrackerAccumulator* _tmp18_;
 #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 111 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1385,11 +1390,11 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	_tmp2_ = self->all;
 #line 116 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1389 "Tracker.c"
+#line 1394 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1400,45 +1405,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp6_) {
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1404 "Tracker.c"
+#line 1409 "Tracker.c"
 		} else {
-			gboolean _tmp7_ = FALSE;
+			gboolean _tmp7_;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp7_ = fire_updated;
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp7_;
-#line 1411 "Tracker.c"
+#line 1416 "Tracker.c"
 		}
 #line 117 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1415 "Tracker.c"
+#line 1420 "Tracker.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp9_ = self->visible;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_ != NULL) {
-#line 1421 "Tracker.c"
-		DataView* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 1426 "Tracker.c"
+		DataView* _tmp10_;
+		gboolean _tmp11_;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp10_ = view;
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = data_view_is_visible (_tmp10_);
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = _tmp11_;
-#line 1430 "Tracker.c"
+#line 1435 "Tracker.c"
 	} else {
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = FALSE;
-#line 1434 "Tracker.c"
+#line 1439 "Tracker.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp8_) {
-#line 1438 "Tracker.c"
+#line 1443 "Tracker.c"
 		gboolean _tmp12_ = FALSE;
-		CoreTrackerAccumulator* _tmp13_ = NULL;
-		DataView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		CoreTrackerAccumulator* _tmp13_;
+		DataView* _tmp14_;
+		gboolean _tmp15_;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp13_ = self->visible;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1449,45 +1454,45 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp15_) {
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = TRUE;
-#line 1453 "Tracker.c"
+#line 1458 "Tracker.c"
 		} else {
-			gboolean _tmp16_ = FALSE;
+			gboolean _tmp16_;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp16_ = fire_updated;
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = _tmp16_;
-#line 1460 "Tracker.c"
+#line 1465 "Tracker.c"
 		}
 #line 120 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp12_;
-#line 1464 "Tracker.c"
+#line 1469 "Tracker.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp18_ = self->selected;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp18_ != NULL) {
-#line 1470 "Tracker.c"
-		DataView* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 1475 "Tracker.c"
+		DataView* _tmp19_;
+		gboolean _tmp20_;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = view;
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp20_ = data_view_is_selected (_tmp19_);
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = _tmp20_;
-#line 1479 "Tracker.c"
+#line 1484 "Tracker.c"
 	} else {
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = FALSE;
-#line 1483 "Tracker.c"
+#line 1488 "Tracker.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp17_) {
-#line 1487 "Tracker.c"
+#line 1492 "Tracker.c"
 		gboolean _tmp21_ = FALSE;
-		CoreTrackerAccumulator* _tmp22_ = NULL;
-		DataView* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		CoreTrackerAccumulator* _tmp22_;
+		DataView* _tmp23_;
+		gboolean _tmp24_;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = self->selected;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1498,18 +1503,18 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 		if (_tmp24_) {
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = TRUE;
-#line 1502 "Tracker.c"
+#line 1507 "Tracker.c"
 		} else {
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp25_;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp25_ = fire_updated;
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = _tmp25_;
-#line 1509 "Tracker.c"
+#line 1514 "Tracker.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp21_;
-#line 1513 "Tracker.c"
+#line 1518 "Tracker.c"
 	}
 #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1517,7 +1522,7 @@ static gboolean core_view_tracker_mux_real_include (CoreTrackerAccumulator* base
 	_g_object_unref0 (view);
 #line 125 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1521 "Tracker.c"
+#line 1526 "Tracker.c"
 }
 
 
@@ -1525,14 +1530,14 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp8_ = FALSE;
-	CoreTrackerAccumulator* _tmp9_ = NULL;
+	CoreTrackerAccumulator* _tmp9_;
 	gboolean _tmp17_ = FALSE;
-	CoreTrackerAccumulator* _tmp18_ = NULL;
+	CoreTrackerAccumulator* _tmp18_;
 #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 128 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1549,11 +1554,11 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	_tmp2_ = self->all;
 #line 133 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1553 "Tracker.c"
+#line 1558 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		gboolean _tmp6_;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1564,45 +1569,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp6_) {
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1568 "Tracker.c"
+#line 1573 "Tracker.c"
 		} else {
-			gboolean _tmp7_ = FALSE;
+			gboolean _tmp7_;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp7_ = fire_updated;
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp7_;
-#line 1575 "Tracker.c"
+#line 1580 "Tracker.c"
 		}
 #line 134 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1579 "Tracker.c"
+#line 1584 "Tracker.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp9_ = self->visible;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_ != NULL) {
-#line 1585 "Tracker.c"
-		DataView* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
+#line 1590 "Tracker.c"
+		DataView* _tmp10_;
+		gboolean _tmp11_;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp10_ = view;
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = data_view_is_visible (_tmp10_);
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = _tmp11_;
-#line 1594 "Tracker.c"
+#line 1599 "Tracker.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp8_ = FALSE;
-#line 1598 "Tracker.c"
+#line 1603 "Tracker.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp8_) {
-#line 1602 "Tracker.c"
+#line 1607 "Tracker.c"
 		gboolean _tmp12_ = FALSE;
-		CoreTrackerAccumulator* _tmp13_ = NULL;
-		DataView* _tmp14_ = NULL;
-		gboolean _tmp15_ = FALSE;
+		CoreTrackerAccumulator* _tmp13_;
+		DataView* _tmp14_;
+		gboolean _tmp15_;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp13_ = self->visible;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1613,45 +1618,45 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp15_) {
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = TRUE;
-#line 1617 "Tracker.c"
+#line 1622 "Tracker.c"
 		} else {
-			gboolean _tmp16_ = FALSE;
+			gboolean _tmp16_;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp16_ = fire_updated;
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp12_ = _tmp16_;
-#line 1624 "Tracker.c"
+#line 1629 "Tracker.c"
 		}
 #line 137 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp12_;
-#line 1628 "Tracker.c"
+#line 1633 "Tracker.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp18_ = self->selected;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp18_ != NULL) {
-#line 1634 "Tracker.c"
-		DataView* _tmp19_ = NULL;
-		gboolean _tmp20_ = FALSE;
+#line 1639 "Tracker.c"
+		DataView* _tmp19_;
+		gboolean _tmp20_;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = view;
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp20_ = data_view_is_selected (_tmp19_);
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = _tmp20_;
-#line 1643 "Tracker.c"
+#line 1648 "Tracker.c"
 	} else {
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp17_ = FALSE;
-#line 1647 "Tracker.c"
+#line 1652 "Tracker.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp17_) {
-#line 1651 "Tracker.c"
+#line 1656 "Tracker.c"
 		gboolean _tmp21_ = FALSE;
-		CoreTrackerAccumulator* _tmp22_ = NULL;
-		DataView* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
+		CoreTrackerAccumulator* _tmp22_;
+		DataView* _tmp23_;
+		gboolean _tmp24_;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = self->selected;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1662,18 +1667,18 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 		if (_tmp24_) {
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = TRUE;
-#line 1666 "Tracker.c"
+#line 1671 "Tracker.c"
 		} else {
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp25_;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp25_ = fire_updated;
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp21_ = _tmp25_;
-#line 1673 "Tracker.c"
+#line 1678 "Tracker.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp21_;
-#line 1677 "Tracker.c"
+#line 1682 "Tracker.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1681,7 +1686,7 @@ static gboolean core_view_tracker_mux_real_uninclude (CoreTrackerAccumulator* ba
 	_g_object_unref0 (view);
 #line 142 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1685 "Tracker.c"
+#line 1690 "Tracker.c"
 }
 
 
@@ -1689,14 +1694,14 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	CoreViewTrackerMux * self;
 	gboolean result = FALSE;
 	DataView* view = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataView* _tmp1_ = NULL;
+	DataObject* _tmp0_;
+	DataView* _tmp1_;
 	gboolean fire_updated = FALSE;
-	CoreTrackerAccumulator* _tmp2_ = NULL;
+	CoreTrackerAccumulator* _tmp2_;
 	gboolean _tmp9_ = FALSE;
-	CoreTrackerAccumulator* _tmp10_ = NULL;
+	CoreTrackerAccumulator* _tmp10_;
 	gboolean _tmp19_ = FALSE;
-	CoreTrackerAccumulator* _tmp20_ = NULL;
+	CoreTrackerAccumulator* _tmp20_;
 #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
 #line 145 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1715,12 +1720,12 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	_tmp2_ = self->all;
 #line 150 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp2_ != NULL) {
-#line 1719 "Tracker.c"
+#line 1724 "Tracker.c"
 		gboolean _tmp3_ = FALSE;
-		CoreTrackerAccumulator* _tmp4_ = NULL;
-		DataView* _tmp5_ = NULL;
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		CoreTrackerAccumulator* _tmp4_;
+		DataView* _tmp5_;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp4_ = self->all;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1733,46 +1738,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp7_) {
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = TRUE;
-#line 1737 "Tracker.c"
+#line 1742 "Tracker.c"
 		} else {
-			gboolean _tmp8_ = FALSE;
+			gboolean _tmp8_;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp8_ = fire_updated;
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp3_ = _tmp8_;
-#line 1744 "Tracker.c"
+#line 1749 "Tracker.c"
 		}
 #line 151 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp3_;
-#line 1748 "Tracker.c"
+#line 1753 "Tracker.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp10_ = self->visible;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp10_ != NULL) {
-#line 1754 "Tracker.c"
-		DataView* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
+#line 1759 "Tracker.c"
+		DataView* _tmp11_;
+		gboolean _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp11_ = view;
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp12_ = data_view_is_visible (_tmp11_);
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp9_ = _tmp12_;
-#line 1763 "Tracker.c"
+#line 1768 "Tracker.c"
 	} else {
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp9_ = FALSE;
-#line 1767 "Tracker.c"
+#line 1772 "Tracker.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp9_) {
-#line 1771 "Tracker.c"
+#line 1776 "Tracker.c"
 		gboolean _tmp13_ = FALSE;
-		CoreTrackerAccumulator* _tmp14_ = NULL;
-		DataView* _tmp15_ = NULL;
-		Alteration* _tmp16_ = NULL;
-		gboolean _tmp17_ = FALSE;
+		CoreTrackerAccumulator* _tmp14_;
+		DataView* _tmp15_;
+		Alteration* _tmp16_;
+		gboolean _tmp17_;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp14_ = self->visible;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1785,46 +1790,46 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp17_) {
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = TRUE;
-#line 1789 "Tracker.c"
+#line 1794 "Tracker.c"
 		} else {
-			gboolean _tmp18_ = FALSE;
+			gboolean _tmp18_;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp18_ = fire_updated;
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp13_ = _tmp18_;
-#line 1796 "Tracker.c"
+#line 1801 "Tracker.c"
 		}
 #line 154 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp13_;
-#line 1800 "Tracker.c"
+#line 1805 "Tracker.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp20_ = self->selected;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp20_ != NULL) {
-#line 1806 "Tracker.c"
-		DataView* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
+#line 1811 "Tracker.c"
+		DataView* _tmp21_;
+		gboolean _tmp22_;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp21_ = view;
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp22_ = data_view_is_selected (_tmp21_);
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = _tmp22_;
-#line 1815 "Tracker.c"
+#line 1820 "Tracker.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp19_ = FALSE;
-#line 1819 "Tracker.c"
+#line 1824 "Tracker.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp19_) {
-#line 1823 "Tracker.c"
+#line 1828 "Tracker.c"
 		gboolean _tmp23_ = FALSE;
-		CoreTrackerAccumulator* _tmp24_ = NULL;
-		DataView* _tmp25_ = NULL;
-		Alteration* _tmp26_ = NULL;
-		gboolean _tmp27_ = FALSE;
+		CoreTrackerAccumulator* _tmp24_;
+		DataView* _tmp25_;
+		Alteration* _tmp26_;
+		gboolean _tmp27_;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp24_ = self->selected;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1837,18 +1842,18 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 		if (_tmp27_) {
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp23_ = TRUE;
-#line 1841 "Tracker.c"
+#line 1846 "Tracker.c"
 		} else {
-			gboolean _tmp28_ = FALSE;
+			gboolean _tmp28_;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp28_ = fire_updated;
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_tmp23_ = _tmp28_;
-#line 1848 "Tracker.c"
+#line 1853 "Tracker.c"
 		}
 #line 157 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		fire_updated = _tmp23_;
-#line 1852 "Tracker.c"
+#line 1857 "Tracker.c"
 	}
 #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	result = fire_updated;
@@ -1856,7 +1861,7 @@ static gboolean core_view_tracker_mux_real_altered (CoreTrackerAccumulator* base
 	_g_object_unref0 (view);
 #line 159 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	return result;
-#line 1860 "Tracker.c"
+#line 1865 "Tracker.c"
 }
 
 
@@ -1865,7 +1870,7 @@ static void core_view_tracker_mux_class_init (CoreViewTrackerMuxClass * klass) {
 	core_view_tracker_mux_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	G_OBJECT_CLASS (klass)->finalize = core_view_tracker_mux_finalize;
-#line 1869 "Tracker.c"
+#line 1874 "Tracker.c"
 }
 
 
@@ -1873,12 +1878,12 @@ static void core_view_tracker_mux_core_tracker_accumulator_interface_init (CoreT
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	core_view_tracker_mux_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_include;
+	iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_include;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) core_view_tracker_mux_real_uninclude;
+	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) core_view_tracker_mux_real_uninclude;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
-	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) core_view_tracker_mux_real_altered;
-#line 1882 "Tracker.c"
+	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) core_view_tracker_mux_real_altered;
+#line 1887 "Tracker.c"
 }
 
 
@@ -1886,7 +1891,7 @@ static void core_view_tracker_mux_instance_init (CoreViewTrackerMux * self) {
 }
 
 
-static void core_view_tracker_mux_finalize (GObject* obj) {
+static void core_view_tracker_mux_finalize (GObject * obj) {
 	CoreViewTrackerMux * self;
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_VIEW_TRACKER_TYPE_MUX, CoreViewTrackerMux);
@@ -1898,7 +1903,7 @@ static void core_view_tracker_mux_finalize (GObject* obj) {
 	_g_object_unref0 (self->selected);
 #line 100 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	G_OBJECT_CLASS (core_view_tracker_mux_parent_class)->finalize (obj);
-#line 1902 "Tracker.c"
+#line 1907 "Tracker.c"
 }
 
 
@@ -1923,7 +1928,7 @@ static void core_view_tracker_class_init (CoreViewTrackerClass * klass) {
 	((CoreTrackerClass *) klass)->finalize = core_view_tracker_finalize;
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	g_type_class_add_private (klass, sizeof (CoreViewTrackerPrivate));
-#line 1927 "Tracker.c"
+#line 1932 "Tracker.c"
 }
 
 
@@ -1932,32 +1937,32 @@ static void core_view_tracker_instance_init (CoreViewTracker * self) {
 	self->priv = CORE_VIEW_TRACKER_GET_PRIVATE (self);
 #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self->priv->mux = NULL;
-#line 1936 "Tracker.c"
+#line 1941 "Tracker.c"
 }
 
 
-static void core_view_tracker_finalize (CoreTracker* obj) {
+static void core_view_tracker_finalize (CoreTracker * obj) {
 	CoreViewTracker * self;
-	CoreViewTrackerMux* _tmp0_ = NULL;
+	CoreViewTrackerMux* _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CORE_TYPE_VIEW_TRACKER, CoreViewTracker);
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_tmp0_ = self->priv->mux;
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	if (_tmp0_ != NULL) {
-#line 1949 "Tracker.c"
+#line 1954 "Tracker.c"
 		ViewCollection* collection = NULL;
-		DataCollection* _tmp1_ = NULL;
-		ViewCollection* _tmp2_ = NULL;
-		ViewCollection* _tmp3_ = NULL;
-		ViewCollection* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		ViewCollection* _tmp6_ = NULL;
-		guint _tmp7_ = 0U;
-		ViewCollection* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-		ViewCollection* _tmp10_ = NULL;
-		guint _tmp11_ = 0U;
+		DataCollection* _tmp1_;
+		ViewCollection* _tmp2_;
+		ViewCollection* _tmp3_;
+		ViewCollection* _tmp4_;
+		guint _tmp5_;
+		ViewCollection* _tmp6_;
+		guint _tmp7_;
+		ViewCollection* _tmp8_;
+		guint _tmp9_;
+		ViewCollection* _tmp10_;
+		guint _tmp11_;
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_tmp1_ = core_tracker_get_collection (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_TRACKER, CoreTracker));
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
@@ -1966,7 +1971,7 @@ static void core_view_tracker_finalize (CoreTracker* obj) {
 		if (_tmp2_ == NULL) {
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 			_data_collection_unref0 (_tmp1_);
-#line 1970 "Tracker.c"
+#line 1975 "Tracker.c"
 		}
 #line 171 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		collection = _tmp2_;
@@ -2000,13 +2005,13 @@ static void core_view_tracker_finalize (CoreTracker* obj) {
 		g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _core_view_tracker_on_items_unselected_view_collection_items_unselected, self);
 #line 170 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 		_data_collection_unref0 (collection);
-#line 2004 "Tracker.c"
+#line 2009 "Tracker.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	_g_object_unref0 (self->priv->mux);
 #line 99 "/home/jens/Source/shotwell/src/core/Tracker.vala"
 	CORE_TRACKER_CLASS (core_view_tracker_parent_class)->finalize (obj);
-#line 2010 "Tracker.c"
+#line 2015 "Tracker.c"
 }