Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 299 insertions, 343 deletions

diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index 1bedba7..e9756dd 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.34.7, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.36.6, the Vala compiler
  * generated from MediaViewTracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -168,8 +168,6 @@ typedef struct _PhotoClass PhotoClass;
 
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
 
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-
 #define TYPE_VIDEO_SOURCE (video_source_get_type ())
 #define VIDEO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIDEO_SOURCE, VideoSource))
 #define VIDEO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIDEO_SOURCE, VideoSourceClass))
@@ -266,12 +264,6 @@ typedef enum  {
 	PHOTO_FILE_FORMAT_UNKNOWN
 } PhotoFileFormat;
 
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
 struct _FlaggableIface {
 	GTypeInterface parent_iface;
 	gboolean (*is_flagged) (Flaggable* self);
@@ -282,7 +274,7 @@ struct _FlaggableIface {
 
 static gpointer media_view_tracker_parent_class = NULL;
 static gpointer media_accumulator_parent_class = NULL;
-static CoreTrackerAccumulatorIface* media_accumulator_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * media_accumulator_core_tracker_accumulator_parent_iface = NULL;
 
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
@@ -321,7 +313,7 @@ gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 GType core_tracker_accumulator_get_type (void) G_GNUC_CONST;
 void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected);
-static void media_view_tracker_finalize (CoreTracker* obj);
+static void media_view_tracker_finalize (CoreTracker * obj);
 enum  {
 	MEDIA_ACCUMULATOR_DUMMY_PROPERTY
 };
@@ -335,8 +327,6 @@ GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
-GType raw_developer_get_type (void) G_GNUC_CONST;
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
@@ -346,15 +336,15 @@ gchar* media_accumulator_to_string (MediaAccumulator* self);
 GType video_get_type (void) G_GNUC_CONST;
 static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
 gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
-static void media_accumulator_finalize (GObject* obj);
+static void media_accumulator_finalize (GObject * obj);
 
 
 MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection) {
 	MediaViewTracker* self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	MediaAccumulator* _tmp1_ = NULL;
-	MediaAccumulator* _tmp2_ = NULL;
-	MediaAccumulator* _tmp3_ = NULL;
+	ViewCollection* _tmp0_;
+	MediaAccumulator* _tmp1_;
+	MediaAccumulator* _tmp2_;
+	MediaAccumulator* _tmp3_;
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
 #line 13 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -371,14 +361,14 @@ MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollectio
 	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 375 "MediaViewTracker.c"
+#line 365 "MediaViewTracker.c"
 }
 
 
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection) {
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return media_view_tracker_construct (TYPE_MEDIA_VIEW_TRACKER, collection);
-#line 382 "MediaViewTracker.c"
+#line 372 "MediaViewTracker.c"
 }
 
 
@@ -387,14 +377,14 @@ static void media_view_tracker_class_init (MediaViewTrackerClass * klass) {
 	media_view_tracker_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	((CoreTrackerClass *) klass)->finalize = media_view_tracker_finalize;
-#line 391 "MediaViewTracker.c"
+#line 381 "MediaViewTracker.c"
 }
 
 
 static void media_view_tracker_instance_init (MediaViewTracker * self) {
-	MediaAccumulator* _tmp0_ = NULL;
-	MediaAccumulator* _tmp1_ = NULL;
-	MediaAccumulator* _tmp2_ = NULL;
+	MediaAccumulator* _tmp0_;
+	MediaAccumulator* _tmp1_;
+	MediaAccumulator* _tmp2_;
 #line 8 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = media_accumulator_new ();
 #line 8 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -407,11 +397,11 @@ static void media_view_tracker_instance_init (MediaViewTracker * self) {
 	_tmp2_ = media_accumulator_new ();
 #line 10 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->selected = _tmp2_;
-#line 411 "MediaViewTracker.c"
+#line 401 "MediaViewTracker.c"
 }
 
 
-static void media_view_tracker_finalize (CoreTracker* obj) {
+static void media_view_tracker_finalize (CoreTracker * obj) {
 	MediaViewTracker * self;
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker);
@@ -423,7 +413,7 @@ static void media_view_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->selected);
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	CORE_TRACKER_CLASS (media_view_tracker_parent_class)->finalize (obj);
-#line 427 "MediaViewTracker.c"
+#line 417 "MediaViewTracker.c"
 }
 
 
@@ -442,7 +432,7 @@ GType media_view_tracker_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 446 "MediaViewTracker.c"
+#line 436 "MediaViewTracker.c"
 }
 
 
@@ -450,18 +440,18 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
 	Photo* photo = NULL;
-	DataSource* _tmp3_ = NULL;
-	Photo* _tmp4_ = NULL;
-	Photo* _tmp5_ = NULL;
+	DataSource* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp17_ = NULL;
-	Flaggable* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	Flaggable* _tmp20_ = NULL;
+	DataSource* _tmp14_;
+	Flaggable* _tmp15_;
+	gboolean _tmp16_ = FALSE;
+	Flaggable* _tmp17_;
 #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 26 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -486,117 +476,100 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da
 	_tmp5_ = photo;
 #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp5_ != NULL) {
-#line 490 "MediaViewTracker.c"
-		Photo* _tmp6_ = NULL;
-		PhotoFileFormat _tmp7_ = 0;
-		gboolean _tmp9_ = FALSE;
-		Photo* _tmp10_ = NULL;
-		PhotoFileFormat _tmp11_ = 0;
+#line 480 "MediaViewTracker.c"
+		Photo* _tmp6_;
+		PhotoFileFormat _tmp7_;
+		Photo* _tmp9_;
+		PhotoFileFormat _tmp10_;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp6_ = photo;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp7_ = photo_get_master_file_format (_tmp6_);
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 502 "MediaViewTracker.c"
-			gint _tmp8_ = 0;
+#line 491 "MediaViewTracker.c"
+			gint _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp8_ = self->raw;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			self->raw = _tmp8_ + 1;
-#line 508 "MediaViewTracker.c"
+#line 497 "MediaViewTracker.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp10_ = photo;
-#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp11_ = photo_get_master_file_format (_tmp10_);
+		_tmp9_ = photo;
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
+		_tmp10_ = photo_get_master_file_format (_tmp9_);
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp9_ = TRUE;
-#line 518 "MediaViewTracker.c"
-		} else {
-			Photo* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+		if (_tmp10_ != PHOTO_FILE_FORMAT_RAW) {
+#line 505 "MediaViewTracker.c"
+			gint _tmp11_;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp12_ = photo;
+			_tmp11_ = self->photos;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp13_ = photo_is_raw_developer_available (_tmp12_, RAW_DEVELOPER_CAMERA);
-#line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp9_ = _tmp13_;
-#line 528 "MediaViewTracker.c"
-		}
-#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp9_) {
-#line 532 "MediaViewTracker.c"
-			gint _tmp14_ = 0;
-#line 39 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp14_ = self->photos;
-#line 39 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp14_ + 1;
-#line 538 "MediaViewTracker.c"
+			self->photos = _tmp11_ + 1;
+#line 511 "MediaViewTracker.c"
 		}
 	} else {
-		DataSource* _tmp15_ = NULL;
+		DataSource* _tmp12_;
+#line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp12_ = source;
+#line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO_SOURCE)) {
+#line 519 "MediaViewTracker.c"
+			gint _tmp13_;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp15_ = source;
+			_tmp13_ = self->videos;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_SOURCE)) {
-#line 546 "MediaViewTracker.c"
-			gint _tmp16_ = 0;
-#line 42 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp16_ = self->videos;
-#line 42 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp16_ + 1;
-#line 552 "MediaViewTracker.c"
+			self->videos = _tmp13_ + 1;
+#line 525 "MediaViewTracker.c"
 		}
 	}
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp14_ = source;
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
+#line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	flaggable = _tmp15_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp17_ = source;
+	_tmp17_ = flaggable;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp17_) : NULL);
+	if (_tmp17_ != NULL) {
+#line 538 "MediaViewTracker.c"
+		Flaggable* _tmp18_;
+		gboolean _tmp19_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp18_;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp20_ = flaggable;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp20_ != NULL) {
-#line 565 "MediaViewTracker.c"
-		Flaggable* _tmp21_ = NULL;
-		gboolean _tmp22_ = FALSE;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp21_ = flaggable;
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp22_ = flaggable_is_flagged (_tmp21_);
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp19_ = _tmp22_;
-#line 574 "MediaViewTracker.c"
+		_tmp18_ = flaggable;
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp19_ = flaggable_is_flagged (_tmp18_);
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp16_ = _tmp19_;
+#line 547 "MediaViewTracker.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp19_ = FALSE;
-#line 578 "MediaViewTracker.c"
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp16_ = FALSE;
+#line 551 "MediaViewTracker.c"
 	}
+#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp16_) {
+#line 555 "MediaViewTracker.c"
+		gint _tmp20_;
 #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp19_) {
-#line 582 "MediaViewTracker.c"
-		gint _tmp23_ = 0;
-#line 47 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp23_ = self->flagged;
-#line 47 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp23_ + 1;
-#line 588 "MediaViewTracker.c"
+		_tmp20_ = self->flagged;
+#line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		self->flagged = _tmp20_ + 1;
+#line 561 "MediaViewTracker.c"
 	}
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (photo);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (source);
-#line 50 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 600 "MediaViewTracker.c"
+#line 573 "MediaViewTracker.c"
 }
 
 
@@ -604,341 +577,324 @@ static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp12_ = 0;
+	DataObject* _tmp0_;
+	DataSource* _tmp1_;
+	gint _tmp2_;
+	gint _tmp12_;
 	Photo* photo = NULL;
-	DataSource* _tmp13_ = NULL;
-	Photo* _tmp14_ = NULL;
-	Photo* _tmp15_ = NULL;
+	DataSource* _tmp13_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp30_ = NULL;
-	Flaggable* _tmp31_ = NULL;
-	gboolean _tmp32_ = FALSE;
-	Flaggable* _tmp33_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	DataSource* _tmp27_;
+	Flaggable* _tmp28_;
+	gboolean _tmp29_ = FALSE;
+	Flaggable* _tmp30_;
+#line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
-#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = object;
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 54 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	source = _tmp1_;
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = self->total;
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp2_ < 1) {
-#line 635 "MediaViewTracker.c"
-		DataObject* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GType _tmp6_ = 0UL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 608 "MediaViewTracker.c"
+		DataObject* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GType _tmp6_;
+		const gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp3_ = object;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp4_ = data_object_to_string (_tmp3_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp5_ = _tmp4_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp6_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp7_ = g_type_name (_tmp6_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp8_ = media_accumulator_to_string (self);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp9_ = _tmp8_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp10_ = g_strdup_printf ("Tried to remove DataObject %s from empty %s (%s)", _tmp5_, _tmp7_, _tmp9_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp11_ = _tmp10_;
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		g_warning ("MediaViewTracker.vala:57: %s", _tmp11_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		g_warning ("MediaViewTracker.vala:56: %s", _tmp11_);
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp11_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp9_);
-#line 57 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_free0 (_tmp5_);
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (source);
-#line 59 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 677 "MediaViewTracker.c"
+#line 650 "MediaViewTracker.c"
 	}
-#line 61 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp12_ = self->total;
-#line 61 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->total = _tmp12_ - 1;
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp13_ = source;
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO) ? ((Photo*) _tmp13_) : NULL);
-#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	photo = _tmp14_;
-#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp15_ = photo;
-#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp15_ != NULL) {
-#line 693 "MediaViewTracker.c"
-		Photo* _tmp16_ = NULL;
-		PhotoFileFormat _tmp17_ = 0;
-		gboolean _tmp20_ = FALSE;
-		Photo* _tmp21_ = NULL;
-		PhotoFileFormat _tmp22_ = 0;
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 666 "MediaViewTracker.c"
+		Photo* _tmp16_;
+		PhotoFileFormat _tmp17_;
+		Photo* _tmp20_;
+		PhotoFileFormat _tmp21_;
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp16_ = photo;
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp17_ = photo_get_master_file_format (_tmp16_);
-#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 705 "MediaViewTracker.c"
-			gint _tmp18_ = 0;
-			gint _tmp19_ = 0;
-#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 677 "MediaViewTracker.c"
+			gint _tmp18_;
+			gint _tmp19_;
+#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp18_ = self->raw;
-#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_vala_assert (_tmp18_ > 0, "raw > 0");
-#line 67 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			_tmp19_ = self->raw;
-#line 67 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 			self->raw = _tmp19_ - 1;
-#line 716 "MediaViewTracker.c"
+#line 688 "MediaViewTracker.c"
 		}
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp20_ = photo;
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp21_ = photo_get_master_file_format (_tmp20_);
+#line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		if (_tmp21_ != PHOTO_FILE_FORMAT_RAW) {
+#line 696 "MediaViewTracker.c"
+			gint _tmp22_;
+			gint _tmp23_;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp21_ = photo;
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp22_ = photo_get_master_file_format (_tmp21_);
+			_tmp22_ = self->photos;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp22_ != PHOTO_FILE_FORMAT_RAW) {
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp20_ = TRUE;
-#line 726 "MediaViewTracker.c"
-		} else {
-			Photo* _tmp23_ = NULL;
-			gboolean _tmp24_ = FALSE;
+			_vala_assert (_tmp22_ > 0, "photos > 0");
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp23_ = photo;
+			_tmp23_ = self->photos;
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp24_ = photo_is_raw_developer_available (_tmp23_, RAW_DEVELOPER_CAMERA);
-#line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp20_ = _tmp24_;
-#line 736 "MediaViewTracker.c"
+			self->photos = _tmp23_ - 1;
+#line 707 "MediaViewTracker.c"
 		}
-#line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp20_) {
-#line 740 "MediaViewTracker.c"
-			gint _tmp25_ = 0;
-			gint _tmp26_ = 0;
-#line 72 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp25_ = self->photos;
-#line 72 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp25_ > 0, "photos > 0");
+	} else {
+		DataSource* _tmp24_;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp26_ = self->photos;
+		_tmp24_ = source;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp26_ - 1;
-#line 751 "MediaViewTracker.c"
-		}
-	} else {
-		DataSource* _tmp27_ = NULL;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO)) {
+#line 715 "MediaViewTracker.c"
+			gint _tmp25_;
+			gint _tmp26_;
+#line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+			_tmp25_ = self->videos;
+#line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+			_vala_assert (_tmp25_ > 0, "videos > 0");
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp27_ = source;
+			_tmp26_ = self->videos;
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_VIDEO)) {
-#line 759 "MediaViewTracker.c"
-			gint _tmp28_ = 0;
-			gint _tmp29_ = 0;
-#line 76 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp28_ = self->videos;
-#line 76 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp28_ > 0, "videos > 0");
-#line 77 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp29_ = self->videos;
-#line 77 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp29_ - 1;
-#line 770 "MediaViewTracker.c"
+			self->videos = _tmp26_ - 1;
+#line 726 "MediaViewTracker.c"
 		}
 	}
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp27_ = source;
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp27_) : NULL);
+#line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	flaggable = _tmp28_;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	_tmp30_ = flaggable;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp30_ != NULL) {
+#line 739 "MediaViewTracker.c"
+		Flaggable* _tmp31_;
+		gboolean _tmp32_;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp31_ = flaggable;
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp32_ = flaggable_is_flagged (_tmp31_);
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp29_ = _tmp32_;
+#line 748 "MediaViewTracker.c"
+	} else {
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		_tmp29_ = FALSE;
+#line 752 "MediaViewTracker.c"
+	}
+#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	if (_tmp29_) {
+#line 756 "MediaViewTracker.c"
+		gint _tmp33_;
+		gint _tmp34_;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp30_ = source;
-#line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp30_) : NULL);
+		_tmp33_ = self->flagged;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp31_;
+		_vala_assert (_tmp33_ > 0, "flagged > 0");
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp33_ = flaggable;
+		_tmp34_ = self->flagged;
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp33_ != NULL) {
-#line 783 "MediaViewTracker.c"
-		Flaggable* _tmp34_ = NULL;
-		gboolean _tmp35_ = FALSE;
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp34_ = flaggable;
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp35_ = flaggable_is_flagged (_tmp34_);
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp32_ = _tmp35_;
-#line 792 "MediaViewTracker.c"
-	} else {
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp32_ = FALSE;
-#line 796 "MediaViewTracker.c"
-	}
-#line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp32_) {
-#line 800 "MediaViewTracker.c"
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-#line 82 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp36_ = self->flagged;
-#line 82 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_vala_assert (_tmp36_ > 0, "flagged > 0");
-#line 83 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp37_ = self->flagged;
-#line 83 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp37_ - 1;
-#line 811 "MediaViewTracker.c"
+		self->flagged = _tmp34_ - 1;
+#line 767 "MediaViewTracker.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (photo);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (source);
-#line 87 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 823 "MediaViewTracker.c"
+#line 779 "MediaViewTracker.c"
 }
 
 
 static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) {
 	MediaAccumulator * self;
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 	Flaggable* flaggable = NULL;
-	DataObject* _tmp2_ = NULL;
-	DataSource* _tmp3_ = NULL;
-	Flaggable* _tmp4_ = NULL;
-	Flaggable* _tmp5_ = NULL;
-	Flaggable* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	DataObject* _tmp2_;
+	DataSource* _tmp3_;
+	Flaggable* _tmp4_;
+	Flaggable* _tmp5_;
+	Flaggable* _tmp6_;
+	gboolean _tmp7_;
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 90 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = alteration;
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "flagged");
-#line 93 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (!_tmp1_) {
-#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 855 "MediaViewTracker.c"
+#line 811 "MediaViewTracker.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = object;
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp3_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp3_) : NULL;
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp4_ == NULL) {
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (_tmp3_);
-#line 867 "MediaViewTracker.c"
+#line 823 "MediaViewTracker.c"
 	}
-#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	flaggable = _tmp4_;
-#line 97 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp5_ = flaggable;
-#line 97 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp5_ == NULL) {
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (flaggable);
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 881 "MediaViewTracker.c"
+#line 837 "MediaViewTracker.c"
 	}
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp6_ = flaggable;
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp7_ = flaggable_is_flagged (_tmp6_);
-#line 100 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	if (_tmp7_) {
-#line 889 "MediaViewTracker.c"
-		gint _tmp8_ = 0;
-#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 845 "MediaViewTracker.c"
+		gint _tmp8_;
+#line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp8_ = self->flagged;
-#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		self->flagged = _tmp8_ + 1;
-#line 895 "MediaViewTracker.c"
+#line 851 "MediaViewTracker.c"
 	} else {
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-#line 103 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+		gint _tmp9_;
+		gint _tmp10_;
+#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp9_ = self->flagged;
-#line 103 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_vala_assert (_tmp9_ > 0, "flagged > 0");
-#line 104 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_tmp10_ = self->flagged;
-#line 104 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		self->flagged = _tmp10_ - 1;
-#line 907 "MediaViewTracker.c"
+#line 863 "MediaViewTracker.c"
 	}
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_g_object_unref0 (flaggable);
-#line 107 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 915 "MediaViewTracker.c"
+#line 871 "MediaViewTracker.c"
 }
 
 
 gchar* media_accumulator_to_string (MediaAccumulator* self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-#line 110 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gchar* _tmp4_;
+#line 108 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_MEDIA_ACCUMULATOR (self), NULL);
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp0_ = self->photos;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp1_ = self->videos;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp2_ = self->raw;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp3_ = self->flagged;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	_tmp4_ = g_strdup_printf ("%d photos/%d videos/%d raw/%d flagged", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
+#line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 942 "MediaViewTracker.c"
+#line 898 "MediaViewTracker.c"
 }
 
 
@@ -948,14 +904,14 @@ MediaAccumulator* media_accumulator_construct (GType object_type) {
 	self = (MediaAccumulator*) g_object_new (object_type, NULL);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 952 "MediaViewTracker.c"
+#line 908 "MediaViewTracker.c"
 }
 
 
 MediaAccumulator* media_accumulator_new (void) {
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return media_accumulator_construct (TYPE_MEDIA_ACCUMULATOR);
-#line 959 "MediaViewTracker.c"
+#line 915 "MediaViewTracker.c"
 }
 
 
@@ -964,7 +920,7 @@ static void media_accumulator_class_init (MediaAccumulatorClass * klass) {
 	media_accumulator_parent_class = g_type_class_peek_parent (klass);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_accumulator_finalize;
-#line 968 "MediaViewTracker.c"
+#line 924 "MediaViewTracker.c"
 }
 
 
@@ -972,12 +928,12 @@ static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrack
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	media_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) media_accumulator_real_include;
+	iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) media_accumulator_real_include;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) media_accumulator_real_uninclude;
+	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) media_accumulator_real_uninclude;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) media_accumulator_real_altered;
-#line 981 "MediaViewTracker.c"
+	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) media_accumulator_real_altered;
+#line 937 "MediaViewTracker.c"
 }
 
 
@@ -992,17 +948,17 @@ static void media_accumulator_instance_init (MediaAccumulator * self) {
 	self->raw = 0;
 #line 24 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->flagged = 0;
-#line 996 "MediaViewTracker.c"
+#line 952 "MediaViewTracker.c"
 }
 
 
-static void media_accumulator_finalize (GObject* obj) {
+static void media_accumulator_finalize (GObject * obj) {
 	MediaAccumulator * self;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	G_OBJECT_CLASS (media_accumulator_parent_class)->finalize (obj);
-#line 1006 "MediaViewTracker.c"
+#line 962 "MediaViewTracker.c"
 }