Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 315 insertions, 290 deletions

diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index e9756dd..92cab3d 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.36.6, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.40.4, the Vala compiler
  * generated from MediaViewTracker.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -105,6 +106,11 @@ typedef struct _DataObjectClass DataObjectClass;
 typedef struct _Alteration Alteration;
 typedef struct _AlterationClass AlterationClass;
 typedef struct _MediaAccumulatorPrivate MediaAccumulatorPrivate;
+enum  {
+	MEDIA_ACCUMULATOR_0_PROPERTY,
+	MEDIA_ACCUMULATOR_NUM_PROPERTIES
+};
+static GParamSpec* media_accumulator_properties[MEDIA_ACCUMULATOR_NUM_PROPERTIES];
 
 #define TYPE_DATA_SOURCE (data_source_get_type ())
 #define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource))
@@ -278,46 +284,64 @@ static CoreTrackerAccumulatorIface * media_accumulator_core_tracker_accumulator_
 
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+                             gpointer v_object);
+void core_value_take_tracker (GValue* value,
+                              gpointer v_object);
 gpointer core_value_get_tracker (const GValue* value);
 GType core_tracker_get_type (void) G_GNUC_CONST;
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
 GType media_view_tracker_get_type (void) G_GNUC_CONST;
 GType media_accumulator_get_type (void) G_GNUC_CONST;
-enum  {
-	MEDIA_VIEW_TRACKER_DUMMY_PROPERTY
-};
 MediaAccumulator* media_accumulator_new (void);
 MediaAccumulator* media_accumulator_construct (GType object_type);
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+                                                ViewCollection* collection);
 CoreViewTracker* core_view_tracker_new (ViewCollection* collection);
-CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection);
+CoreViewTracker* core_view_tracker_construct (GType object_type,
+                                              ViewCollection* collection);
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 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);
+void core_view_tracker_start (CoreViewTracker* self,
+                              CoreTrackerAccumulator* all,
+                              CoreTrackerAccumulator* visible,
+                              CoreTrackerAccumulator* selected);
 static void media_view_tracker_finalize (CoreTracker * obj);
-enum  {
-	MEDIA_ACCUMULATOR_DUMMY_PROPERTY
-};
-static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object);
+static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base,
+                                         DataObject* object);
 GType data_source_get_type (void) G_GNUC_CONST;
 GType data_view_get_type (void) G_GNUC_CONST;
 DataSource* data_view_get_source (DataView* self);
@@ -330,58 +354,69 @@ PhotoFileFormat photo_get_master_file_format (Photo* self);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object);
+static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base,
+                                           DataObject* object);
 gchar* data_object_to_string (DataObject* self);
 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 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);
 
 
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection) {
+MediaViewTracker*
+media_view_tracker_construct (GType object_type,
+                              ViewCollection* collection)
+{
 	MediaViewTracker* self = NULL;
-	ViewCollection* _tmp0_;
+	MediaAccumulator* _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"
-	_tmp0_ = collection;
-#line 13 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	self = (MediaViewTracker*) core_view_tracker_construct (object_type, _tmp0_);
+	self = (MediaViewTracker*) core_view_tracker_construct (object_type, collection);
 #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp1_ = self->all;
+	_tmp0_ = self->all;
 #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp2_ = self->visible;
+	_tmp1_ = self->visible;
 #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp3_ = self->selected;
+	_tmp2_ = self->selected;
 #line 15 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	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));
+	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 12 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 365 "MediaViewTracker.c"
+#line 394 "MediaViewTracker.c"
 }
 
 
-MediaViewTracker* media_view_tracker_new (ViewCollection* collection) {
+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 372 "MediaViewTracker.c"
+#line 403 "MediaViewTracker.c"
 }
 
 
-static void media_view_tracker_class_init (MediaViewTrackerClass * klass) {
+static void
+media_view_tracker_class_init (MediaViewTrackerClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	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 381 "MediaViewTracker.c"
+#line 414 "MediaViewTracker.c"
 }
 
 
-static void media_view_tracker_instance_init (MediaViewTracker * self) {
+static void
+media_view_tracker_instance_init (MediaViewTracker * self)
+{
 	MediaAccumulator* _tmp0_;
 	MediaAccumulator* _tmp1_;
 	MediaAccumulator* _tmp2_;
@@ -397,11 +432,13 @@ 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 401 "MediaViewTracker.c"
+#line 436 "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);
@@ -413,11 +450,13 @@ 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 417 "MediaViewTracker.c"
+#line 454 "MediaViewTracker.c"
 }
 
 
-GType media_view_tracker_get_type (void) {
+GType
+media_view_tracker_get_type (void)
+{
 	static volatile gsize media_view_tracker_type_id__volatile = 0;
 	if (g_once_init_enter (&media_view_tracker_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MediaViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaViewTracker), 0, (GInstanceInitFunc) media_view_tracker_instance_init, NULL };
@@ -429,135 +468,128 @@ GType media_view_tracker_get_type (void) {
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 436 "MediaViewTracker.c"
+#line 477 "MediaViewTracker.c"
 }
 
 
-static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object) {
+static gboolean
+media_accumulator_real_include (CoreTrackerAccumulator* base,
+                                DataObject* object)
+{
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_;
-	DataSource* _tmp1_;
-	gint _tmp2_;
+	DataSource* _tmp0_;
+	gint _tmp1_;
 	Photo* photo = NULL;
-	DataSource* _tmp3_;
+	DataSource* _tmp2_;
+	Photo* _tmp3_;
 	Photo* _tmp4_;
-	Photo* _tmp5_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp14_;
-	Flaggable* _tmp15_;
-	gboolean _tmp16_ = FALSE;
-	Flaggable* _tmp17_;
+	DataSource* _tmp11_;
+	Flaggable* _tmp12_;
+	gboolean _tmp13_ = FALSE;
+	Flaggable* _tmp14_;
 #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"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp0_ = object;
+	_tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
 #line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 27 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	source = _tmp1_;
+	source = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp2_ = self->total;
+	_tmp1_ = self->total;
 #line 29 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	self->total = _tmp2_ + 1;
+	self->total = _tmp1_ + 1;
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp3_ = source;
+	_tmp2_ = source;
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO) ? ((Photo*) _tmp3_) : NULL);
+	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO) ? ((Photo*) _tmp2_) : NULL);
 #line 31 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	photo = _tmp4_;
+	photo = _tmp3_;
 #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp5_ = photo;
+	_tmp4_ = photo;
 #line 32 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp5_ != NULL) {
-#line 480 "MediaViewTracker.c"
-		Photo* _tmp6_;
-		PhotoFileFormat _tmp7_;
-		Photo* _tmp9_;
-		PhotoFileFormat _tmp10_;
-#line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp6_ = photo;
+	if (_tmp4_ != NULL) {
+#line 521 "MediaViewTracker.c"
+		Photo* _tmp5_;
+		Photo* _tmp7_;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp7_ = photo_get_master_file_format (_tmp6_);
+		_tmp5_ = photo;
 #line 33 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 491 "MediaViewTracker.c"
-			gint _tmp8_;
+		if (photo_get_master_file_format (_tmp5_) == PHOTO_FILE_FORMAT_RAW) {
+#line 528 "MediaViewTracker.c"
+			gint _tmp6_;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp8_ = self->raw;
+			_tmp6_ = self->raw;
 #line 34 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->raw = _tmp8_ + 1;
-#line 497 "MediaViewTracker.c"
+			self->raw = _tmp6_ + 1;
+#line 534 "MediaViewTracker.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp9_ = photo;
-#line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp10_ = photo_get_master_file_format (_tmp9_);
+		_tmp7_ = photo;
 #line 37 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp10_ != PHOTO_FILE_FORMAT_RAW) {
-#line 505 "MediaViewTracker.c"
-			gint _tmp11_;
+		if (photo_get_master_file_format (_tmp7_) != PHOTO_FILE_FORMAT_RAW) {
+#line 540 "MediaViewTracker.c"
+			gint _tmp8_;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp11_ = self->photos;
+			_tmp8_ = self->photos;
 #line 38 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp11_ + 1;
-#line 511 "MediaViewTracker.c"
+			self->photos = _tmp8_ + 1;
+#line 546 "MediaViewTracker.c"
 		}
 	} else {
-		DataSource* _tmp12_;
+		DataSource* _tmp9_;
 #line 40 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp12_ = source;
+		_tmp9_ = 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_;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_VIDEO_SOURCE)) {
+#line 554 "MediaViewTracker.c"
+			gint _tmp10_;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp13_ = self->videos;
+			_tmp10_ = self->videos;
 #line 41 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp13_ + 1;
-#line 525 "MediaViewTracker.c"
+			self->videos = _tmp10_ + 1;
+#line 560 "MediaViewTracker.c"
 		}
 	}
 #line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp14_ = source;
+	_tmp11_ = 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);
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp11_) : NULL);
 #line 44 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp15_;
-#line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp17_ = flaggable;
+	flaggable = _tmp12_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp17_ != NULL) {
-#line 538 "MediaViewTracker.c"
-		Flaggable* _tmp18_;
-		gboolean _tmp19_;
+	_tmp14_ = flaggable;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp18_ = flaggable;
+	if (_tmp14_ != NULL) {
+#line 573 "MediaViewTracker.c"
+		Flaggable* _tmp15_;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp19_ = flaggable_is_flagged (_tmp18_);
+		_tmp15_ = flaggable;
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp16_ = _tmp19_;
-#line 547 "MediaViewTracker.c"
+		_tmp13_ = flaggable_is_flagged (_tmp15_);
+#line 579 "MediaViewTracker.c"
 	} else {
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp16_ = FALSE;
-#line 551 "MediaViewTracker.c"
+		_tmp13_ = FALSE;
+#line 583 "MediaViewTracker.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp16_) {
-#line 555 "MediaViewTracker.c"
-		gint _tmp20_;
+	if (_tmp13_) {
+#line 587 "MediaViewTracker.c"
+		gint _tmp16_;
 #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp20_ = self->flagged;
+		_tmp16_ = self->flagged;
 #line 46 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp20_ + 1;
-#line 561 "MediaViewTracker.c"
+		self->flagged = _tmp16_ + 1;
+#line 593 "MediaViewTracker.c"
 	}
 #line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
@@ -569,201 +601,186 @@ static gboolean media_accumulator_real_include (CoreTrackerAccumulator* base, Da
 	_g_object_unref0 (source);
 #line 49 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 573 "MediaViewTracker.c"
+#line 605 "MediaViewTracker.c"
 }
 
 
-static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) {
+static gboolean
+media_accumulator_real_uninclude (CoreTrackerAccumulator* base,
+                                  DataObject* object)
+{
 	MediaAccumulator * self;
 	gboolean result = FALSE;
 	DataSource* source = NULL;
-	DataObject* _tmp0_;
-	DataSource* _tmp1_;
-	gint _tmp2_;
-	gint _tmp12_;
+	DataSource* _tmp0_;
+	gint _tmp1_;
+	gint _tmp9_;
 	Photo* photo = NULL;
-	DataSource* _tmp13_;
-	Photo* _tmp14_;
-	Photo* _tmp15_;
+	DataSource* _tmp10_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp27_;
-	Flaggable* _tmp28_;
-	gboolean _tmp29_ = FALSE;
-	Flaggable* _tmp30_;
+	DataSource* _tmp22_;
+	Flaggable* _tmp23_;
+	gboolean _tmp24_ = FALSE;
+	Flaggable* _tmp25_;
 #line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 52 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp0_ = object;
-#line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
+	_tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
 #line 53 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	source = _tmp1_;
+	source = _tmp0_;
 #line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp2_ = self->total;
+	_tmp1_ = self->total;
 #line 55 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp2_ < 1) {
-#line 608 "MediaViewTracker.c"
-		DataObject* _tmp3_;
-		gchar* _tmp4_;
+	if (_tmp1_ < 1) {
+#line 640 "MediaViewTracker.c"
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
 		gchar* _tmp5_;
-		GType _tmp6_;
-		const gchar* _tmp7_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 		gchar* _tmp8_;
-		gchar* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp3_ = object;
+		_tmp2_ = data_object_to_string (object);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp4_ = data_object_to_string (_tmp3_);
+		_tmp3_ = _tmp2_;
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = g_type_name (G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)));
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp6_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
+		_tmp5_ = media_accumulator_to_string (self);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp7_ = g_type_name (_tmp6_);
+		_tmp6_ = _tmp5_;
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp8_ = media_accumulator_to_string (self);
+		_tmp7_ = g_strdup_printf ("Tried to remove DataObject %s from empty %s (%s)", _tmp3_, _tmp4_, _tmp6_);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #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_);
+		g_warning ("MediaViewTracker.vala:56: %s", _tmp8_);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp11_ = _tmp10_;
+		_g_free0 (_tmp8_);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		g_warning ("MediaViewTracker.vala:56: %s", _tmp11_);
+		_g_free0 (_tmp6_);
 #line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_g_free0 (_tmp11_);
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_g_free0 (_tmp9_);
-#line 56 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp3_);
 #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
 #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (source);
 #line 58 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 650 "MediaViewTracker.c"
+#line 676 "MediaViewTracker.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp12_ = self->total;
+	_tmp9_ = self->total;
 #line 60 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	self->total = _tmp12_ - 1;
+	self->total = _tmp9_ - 1;
 #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp13_ = source;
+	_tmp10_ = source;
 #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO) ? ((Photo*) _tmp13_) : NULL);
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL);
 #line 62 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	photo = _tmp14_;
+	photo = _tmp11_;
 #line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp15_ = photo;
+	_tmp12_ = photo;
 #line 63 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp15_ != NULL) {
-#line 666 "MediaViewTracker.c"
+	if (_tmp12_ != NULL) {
+#line 692 "MediaViewTracker.c"
+		Photo* _tmp13_;
 		Photo* _tmp16_;
-		PhotoFileFormat _tmp17_;
-		Photo* _tmp20_;
-		PhotoFileFormat _tmp21_;
-#line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp16_ = photo;
 #line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp17_ = photo_get_master_file_format (_tmp16_);
+		_tmp13_ = photo;
 #line 64 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 677 "MediaViewTracker.c"
-			gint _tmp18_;
-			gint _tmp19_;
+		if (photo_get_master_file_format (_tmp13_) == PHOTO_FILE_FORMAT_RAW) {
+#line 699 "MediaViewTracker.c"
+			gint _tmp14_;
+			gint _tmp15_;
 #line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp18_ = self->raw;
+			_tmp14_ = self->raw;
 #line 65 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp18_ > 0, "raw > 0");
+			_vala_assert (_tmp14_ > 0, "raw > 0");
 #line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp19_ = self->raw;
+			_tmp15_ = self->raw;
 #line 66 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->raw = _tmp19_ - 1;
-#line 688 "MediaViewTracker.c"
+			self->raw = _tmp15_ - 1;
+#line 710 "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_);
+		_tmp16_ = photo;
 #line 69 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (_tmp21_ != PHOTO_FILE_FORMAT_RAW) {
-#line 696 "MediaViewTracker.c"
-			gint _tmp22_;
-			gint _tmp23_;
+		if (photo_get_master_file_format (_tmp16_) != PHOTO_FILE_FORMAT_RAW) {
+#line 716 "MediaViewTracker.c"
+			gint _tmp17_;
+			gint _tmp18_;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp22_ = self->photos;
+			_tmp17_ = self->photos;
 #line 70 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp22_ > 0, "photos > 0");
+			_vala_assert (_tmp17_ > 0, "photos > 0");
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp23_ = self->photos;
+			_tmp18_ = self->photos;
 #line 71 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->photos = _tmp23_ - 1;
-#line 707 "MediaViewTracker.c"
+			self->photos = _tmp18_ - 1;
+#line 727 "MediaViewTracker.c"
 		}
 	} else {
-		DataSource* _tmp24_;
+		DataSource* _tmp19_;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp24_ = source;
+		_tmp19_ = source;
 #line 73 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, TYPE_VIDEO)) {
-#line 715 "MediaViewTracker.c"
-			gint _tmp25_;
-			gint _tmp26_;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO)) {
+#line 735 "MediaViewTracker.c"
+			gint _tmp20_;
+			gint _tmp21_;
 #line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp25_ = self->videos;
+			_tmp20_ = self->videos;
 #line 74 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_vala_assert (_tmp25_ > 0, "videos > 0");
+			_vala_assert (_tmp20_ > 0, "videos > 0");
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			_tmp26_ = self->videos;
+			_tmp21_ = self->videos;
 #line 75 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-			self->videos = _tmp26_ - 1;
-#line 726 "MediaViewTracker.c"
+			self->videos = _tmp21_ - 1;
+#line 746 "MediaViewTracker.c"
 		}
 	}
 #line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp27_ = source;
+	_tmp22_ = 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);
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp22_) : NULL);
 #line 78 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp28_;
-#line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp30_ = flaggable;
+	flaggable = _tmp23_;
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp30_ != NULL) {
-#line 739 "MediaViewTracker.c"
-		Flaggable* _tmp31_;
-		gboolean _tmp32_;
+	_tmp25_ = flaggable;
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp31_ = flaggable;
+	if (_tmp25_ != NULL) {
+#line 759 "MediaViewTracker.c"
+		Flaggable* _tmp26_;
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp32_ = flaggable_is_flagged (_tmp31_);
+		_tmp26_ = flaggable;
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp29_ = _tmp32_;
-#line 748 "MediaViewTracker.c"
+		_tmp24_ = flaggable_is_flagged (_tmp26_);
+#line 765 "MediaViewTracker.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp29_ = FALSE;
-#line 752 "MediaViewTracker.c"
+		_tmp24_ = FALSE;
+#line 769 "MediaViewTracker.c"
 	}
 #line 79 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp29_) {
-#line 756 "MediaViewTracker.c"
-		gint _tmp33_;
-		gint _tmp34_;
+	if (_tmp24_) {
+#line 773 "MediaViewTracker.c"
+		gint _tmp27_;
+		gint _tmp28_;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp33_ = self->flagged;
+		_tmp27_ = self->flagged;
 #line 80 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_vala_assert (_tmp33_ > 0, "flagged > 0");
+		_vala_assert (_tmp27_ > 0, "flagged > 0");
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp34_ = self->flagged;
+		_tmp28_ = self->flagged;
 #line 81 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp34_ - 1;
-#line 767 "MediaViewTracker.c"
+		self->flagged = _tmp28_ - 1;
+#line 784 "MediaViewTracker.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
@@ -775,22 +792,22 @@ static gboolean media_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_g_object_unref0 (source);
 #line 85 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 779 "MediaViewTracker.c"
+#line 796 "MediaViewTracker.c"
 }
 
 
-static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) {
+static gboolean
+media_accumulator_real_altered (CoreTrackerAccumulator* base,
+                                DataObject* object,
+                                Alteration* alteration)
+{
 	MediaAccumulator * self;
 	gboolean result = FALSE;
-	Alteration* _tmp0_;
-	gboolean _tmp1_;
 	Flaggable* flaggable = NULL;
-	DataObject* _tmp2_;
-	DataSource* _tmp3_;
-	Flaggable* _tmp4_;
-	Flaggable* _tmp5_;
-	Flaggable* _tmp6_;
-	gboolean _tmp7_;
+	DataSource* _tmp0_;
+	Flaggable* _tmp1_;
+	Flaggable* _tmp2_;
+	Flaggable* _tmp3_;
 #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_ACCUMULATOR, MediaAccumulator);
 #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -798,68 +815,60 @@ static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, Da
 #line 88 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
 #line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp0_ = alteration;
-#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "flagged");
-#line 91 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (!_tmp1_) {
+	if (!alteration_has_detail (alteration, "metadata", "flagged")) {
 #line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
 #line 92 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 811 "MediaViewTracker.c"
+#line 824 "MediaViewTracker.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp2_ = object;
+	_tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
 #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp3_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL;
 #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp3_) : NULL;
+	if (_tmp1_ == NULL) {
 #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp4_ == NULL) {
-#line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_g_object_unref0 (_tmp3_);
-#line 823 "MediaViewTracker.c"
+		_g_object_unref0 (_tmp0_);
+#line 834 "MediaViewTracker.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	flaggable = _tmp4_;
+	flaggable = _tmp1_;
 #line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp5_ = flaggable;
+	_tmp2_ = flaggable;
 #line 95 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		result = FALSE;
 #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		_g_object_unref0 (flaggable);
 #line 96 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 		return result;
-#line 837 "MediaViewTracker.c"
+#line 848 "MediaViewTracker.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp6_ = flaggable;
-#line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	_tmp7_ = flaggable_is_flagged (_tmp6_);
+	_tmp3_ = flaggable;
 #line 98 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-	if (_tmp7_) {
-#line 845 "MediaViewTracker.c"
-		gint _tmp8_;
+	if (flaggable_is_flagged (_tmp3_)) {
+#line 854 "MediaViewTracker.c"
+		gint _tmp4_;
 #line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp8_ = self->flagged;
+		_tmp4_ = self->flagged;
 #line 99 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp8_ + 1;
-#line 851 "MediaViewTracker.c"
+		self->flagged = _tmp4_ + 1;
+#line 860 "MediaViewTracker.c"
 	} else {
-		gint _tmp9_;
-		gint _tmp10_;
+		gint _tmp5_;
+		gint _tmp6_;
 #line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp9_ = self->flagged;
+		_tmp5_ = self->flagged;
 #line 101 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_vala_assert (_tmp9_ > 0, "flagged > 0");
+		_vala_assert (_tmp5_ > 0, "flagged > 0");
 #line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		_tmp10_ = self->flagged;
+		_tmp6_ = self->flagged;
 #line 102 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
-		self->flagged = _tmp10_ - 1;
-#line 863 "MediaViewTracker.c"
+		self->flagged = _tmp6_ - 1;
+#line 872 "MediaViewTracker.c"
 	}
 #line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	result = TRUE;
@@ -867,11 +876,13 @@ static gboolean media_accumulator_real_altered (CoreTrackerAccumulator* base, Da
 	_g_object_unref0 (flaggable);
 #line 105 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 871 "MediaViewTracker.c"
+#line 880 "MediaViewTracker.c"
 }
 
 
-gchar* media_accumulator_to_string (MediaAccumulator* self) {
+gchar*
+media_accumulator_to_string (MediaAccumulator* self)
+{
 	gchar* result = NULL;
 	gint _tmp0_;
 	gint _tmp1_;
@@ -894,37 +905,45 @@ gchar* media_accumulator_to_string (MediaAccumulator* self) {
 	result = _tmp4_;
 #line 109 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return result;
-#line 898 "MediaViewTracker.c"
+#line 909 "MediaViewTracker.c"
 }
 
 
-MediaAccumulator* media_accumulator_construct (GType object_type) {
+MediaAccumulator*
+media_accumulator_construct (GType object_type)
+{
 	MediaAccumulator * self = NULL;
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self = (MediaAccumulator*) g_object_new (object_type, NULL);
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return self;
-#line 908 "MediaViewTracker.c"
+#line 921 "MediaViewTracker.c"
 }
 
 
-MediaAccumulator* media_accumulator_new (void) {
+MediaAccumulator*
+media_accumulator_new (void)
+{
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	return media_accumulator_construct (TYPE_MEDIA_ACCUMULATOR);
-#line 915 "MediaViewTracker.c"
+#line 930 "MediaViewTracker.c"
 }
 
 
-static void media_accumulator_class_init (MediaAccumulatorClass * klass) {
+static void
+media_accumulator_class_init (MediaAccumulatorClass * klass)
+{
 #line 19 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	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 924 "MediaViewTracker.c"
+#line 941 "MediaViewTracker.c"
 }
 
 
-static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) {
+static void
+media_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface)
+{
 #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"
@@ -933,11 +952,13 @@ static void media_accumulator_core_tracker_accumulator_interface_init (CoreTrack
 	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 937 "MediaViewTracker.c"
+#line 956 "MediaViewTracker.c"
 }
 
 
-static void media_accumulator_instance_init (MediaAccumulator * self) {
+static void
+media_accumulator_instance_init (MediaAccumulator * self)
+{
 #line 20 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->total = 0;
 #line 21 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
@@ -948,21 +969,25 @@ static void media_accumulator_instance_init (MediaAccumulator * self) {
 	self->raw = 0;
 #line 24 "/home/jens/Source/shotwell/src/MediaViewTracker.vala"
 	self->flagged = 0;
-#line 952 "MediaViewTracker.c"
+#line 973 "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 962 "MediaViewTracker.c"
+#line 985 "MediaViewTracker.c"
 }
 
 
-GType media_accumulator_get_type (void) {
+GType
+media_accumulator_get_type (void)
+{
 	static volatile gsize media_accumulator_type_id__volatile = 0;
 	if (g_once_init_enter (&media_accumulator_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MediaAccumulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) media_accumulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MediaAccumulator), 0, (GInstanceInitFunc) media_accumulator_instance_init, NULL };