New upstream version 0.28.3upstream/0.28.3

1 files changed, 416 insertions, 351 deletions

diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 583afbf..1d4d597 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.36.6, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.40.4, the Vala compiler
  * generated from MediaInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -50,6 +50,7 @@
 /* The object is thread-safe.  There is no guarantee that the underlying persistent store is,*/
 /* however.*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -201,25 +202,32 @@ static gpointer transaction_controller_parent_class = NULL;
 
 gpointer transaction_controller_ref (gpointer instance);
 void transaction_controller_unref (gpointer instance);
-GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_transaction_controller (GValue* value, gpointer v_object);
-void value_take_transaction_controller (GValue* value, gpointer v_object);
+GParamSpec* param_spec_transaction_controller (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void value_set_transaction_controller (GValue* value,
+                                       gpointer v_object);
+void value_take_transaction_controller (GValue* value,
+                                        gpointer v_object);
 gpointer value_get_transaction_controller (const GValue* value);
 GType transaction_controller_get_type (void) G_GNUC_CONST;
 #define TRANSACTION_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRANSACTION_CONTROLLER, TransactionControllerPrivate))
-enum  {
-	TRANSACTION_CONTROLLER_DUMMY_PROPERTY
-};
 TransactionController* transaction_controller_construct (GType object_type);
 void transaction_controller_begin (TransactionController* self);
-void transaction_controller_begin_impl (TransactionController* self, GError** error);
+void transaction_controller_begin_impl (TransactionController* self,
+                                        GError** error);
 GQuark database_error_quark (void);
 void app_window_database_error (GError* err);
 void app_window_panic (const gchar* msg);
-static void transaction_controller_real_begin_impl (TransactionController* self, GError** error);
+static void transaction_controller_real_begin_impl (TransactionController* self,
+                                             GError** error);
 void transaction_controller_commit (TransactionController* self);
-void transaction_controller_commit_impl (TransactionController* self, GError** error);
-static void transaction_controller_real_commit_impl (TransactionController* self, GError** error);
+void transaction_controller_commit_impl (TransactionController* self,
+                                         GError** error);
+static void transaction_controller_real_commit_impl (TransactionController* self,
+                                              GError** error);
 static void transaction_controller_finalize (TransactionController * obj);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
@@ -229,43 +237,60 @@ GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
 void flaggable_mark_flagged (Flaggable* self);
 void flaggable_mark_unflagged (Flaggable* self);
-void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error);
+void flaggable_mark_many_flagged_unflagged (GeeCollection* flag,
+                                            GeeCollection* unflag,
+                                            TransactionController* controller,
+                                            GError** error);
 GType monitorable_get_type (void) G_GNUC_CONST;
 gboolean monitorable_is_offline (Monitorable* self);
 void monitorable_mark_online (Monitorable* self);
 void monitorable_mark_offline (Monitorable* self);
-void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error);
-void monitorable_set_master_file (Monitorable* self, GFile* file);
-void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error);
-void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info);
-void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error);
+void monitorable_mark_many_online_offline (GeeCollection* online,
+                                           GeeCollection* offline,
+                                           TransactionController* controller,
+                                           GError** error);
+void monitorable_set_master_file (Monitorable* self,
+                                  GFile* file);
+void monitorable_set_many_master_file (GeeMap* map,
+                                       TransactionController* controller,
+                                       GError** error);
+void monitorable_set_master_timestamp (Monitorable* self,
+                                       GFileInfo* info);
+void monitorable_set_many_master_timestamp (GeeMap* map,
+                                            TransactionController* controller,
+                                            GError** error);
 GType dateable_get_type (void) G_GNUC_CONST;
-void dateable_set_exposure_time (Dateable* self, time_t target_time);
+void dateable_set_exposure_time (Dateable* self,
+                                 time_t target_time);
 time_t dateable_get_exposure_time (Dateable* self);
 
 
-TransactionController* transaction_controller_construct (GType object_type) {
+TransactionController*
+transaction_controller_construct (GType object_type)
+{
 	TransactionController* self = NULL;
 #line 54 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	self = (TransactionController*) g_type_create_instance (object_type);
 #line 54 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return self;
-#line 254 "MediaInterfaces.c"
+#line 277 "MediaInterfaces.c"
 }
 
 
-void transaction_controller_begin (TransactionController* self) {
+void
+transaction_controller_begin (TransactionController* self)
+{
 	GError * _inner_error_ = NULL;
 #line 63 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
-#line 262 "MediaInterfaces.c"
+#line 287 "MediaInterfaces.c"
 	{
 		gint _tmp0_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
-#line 269 "MediaInterfaces.c"
+#line 294 "MediaInterfaces.c"
 		{
 			gint _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -274,25 +299,25 @@ void transaction_controller_begin (TransactionController* self) {
 			self->priv->count = _tmp1_ + 1;
 #line 65 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (_tmp1_ != 0) {
-#line 278 "MediaInterfaces.c"
+#line 303 "MediaInterfaces.c"
 				{
 					gint _tmp2_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp2_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 285 "MediaInterfaces.c"
+#line 310 "MediaInterfaces.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				return;
-#line 289 "MediaInterfaces.c"
+#line 314 "MediaInterfaces.c"
 			}
 			{
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				transaction_controller_begin_impl (self, &_inner_error_);
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 296 "MediaInterfaces.c"
+#line 321 "MediaInterfaces.c"
 					goto __catch583_g_error;
 				}
 			}
@@ -314,13 +339,13 @@ void transaction_controller_begin (TransactionController* self) {
 				_tmp4_ = err;
 #line 74 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp4_->domain == DATABASE_ERROR) {
-#line 318 "MediaInterfaces.c"
+#line 343 "MediaInterfaces.c"
 					GError* _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp5_ = err;
 #line 75 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp5_);
-#line 324 "MediaInterfaces.c"
+#line 349 "MediaInterfaces.c"
 				} else {
 					GError* _tmp6_;
 					const gchar* _tmp7_;
@@ -338,23 +363,23 @@ void transaction_controller_begin (TransactionController* self) {
 					app_window_panic (_tmp9_);
 #line 77 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_g_free0 (_tmp9_);
-#line 342 "MediaInterfaces.c"
+#line 367 "MediaInterfaces.c"
 				}
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_error_free0 (err);
-#line 346 "MediaInterfaces.c"
+#line 371 "MediaInterfaces.c"
 			}
 			__finally583:
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 351 "MediaInterfaces.c"
+#line 376 "MediaInterfaces.c"
 				{
 					gint _tmp10_;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp10_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 358 "MediaInterfaces.c"
+#line 383 "MediaInterfaces.c"
 				}
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -362,7 +387,7 @@ void transaction_controller_begin (TransactionController* self) {
 				g_clear_error (&_inner_error_);
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				return;
-#line 366 "MediaInterfaces.c"
+#line 391 "MediaInterfaces.c"
 			}
 		}
 		__finally582:
@@ -372,7 +397,7 @@ void transaction_controller_begin (TransactionController* self) {
 			_tmp11_ = self->priv->count;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 376 "MediaInterfaces.c"
+#line 401 "MediaInterfaces.c"
 		}
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -382,42 +407,50 @@ void transaction_controller_begin (TransactionController* self) {
 			g_clear_error (&_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			return;
-#line 386 "MediaInterfaces.c"
+#line 411 "MediaInterfaces.c"
 		}
 	}
 }
 
 
-static void transaction_controller_real_begin_impl (TransactionController* self, GError** error) {
+static void
+transaction_controller_real_begin_impl (TransactionController* self,
+                                        GError** error)
+{
 #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_critical ("Type `%s' does not implement abstract method `transaction_controller_begin_impl'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return;
-#line 397 "MediaInterfaces.c"
+#line 425 "MediaInterfaces.c"
 }
 
 
-void transaction_controller_begin_impl (TransactionController* self, GError** error) {
+void
+transaction_controller_begin_impl (TransactionController* self,
+                                   GError** error)
+{
 #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 83 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	TRANSACTION_CONTROLLER_GET_CLASS (self)->begin_impl (self, error);
-#line 406 "MediaInterfaces.c"
+#line 437 "MediaInterfaces.c"
 }
 
 
-void transaction_controller_commit (TransactionController* self) {
+void
+transaction_controller_commit (TransactionController* self)
+{
 	GError * _inner_error_ = NULL;
 #line 85 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
-#line 414 "MediaInterfaces.c"
+#line 447 "MediaInterfaces.c"
 	{
 		gint _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
-#line 421 "MediaInterfaces.c"
+#line 454 "MediaInterfaces.c"
 		{
 			gint _tmp1_;
 			gint _tmp2_;
@@ -434,25 +467,25 @@ void transaction_controller_commit (TransactionController* self) {
 			_tmp3_ = self->priv->count;
 #line 88 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (_tmp3_ != 0) {
-#line 438 "MediaInterfaces.c"
+#line 471 "MediaInterfaces.c"
 				{
 					gint _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp4_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 445 "MediaInterfaces.c"
+#line 478 "MediaInterfaces.c"
 				}
 #line 89 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				return;
-#line 449 "MediaInterfaces.c"
+#line 482 "MediaInterfaces.c"
 			}
 			{
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				transaction_controller_commit_impl (self, &_inner_error_);
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 456 "MediaInterfaces.c"
+#line 489 "MediaInterfaces.c"
 					goto __catch585_g_error;
 				}
 			}
@@ -469,13 +502,13 @@ void transaction_controller_commit (TransactionController* self) {
 				_tmp5_ = err;
 #line 95 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (_tmp5_->domain == DATABASE_ERROR) {
-#line 473 "MediaInterfaces.c"
+#line 506 "MediaInterfaces.c"
 					GError* _tmp6_;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp6_ = err;
 #line 96 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					app_window_database_error ((GError*) _tmp6_);
-#line 479 "MediaInterfaces.c"
+#line 512 "MediaInterfaces.c"
 				} else {
 					GError* _tmp7_;
 					const gchar* _tmp8_;
@@ -493,23 +526,23 @@ void transaction_controller_commit (TransactionController* self) {
 					app_window_panic (_tmp10_);
 #line 98 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_g_free0 (_tmp10_);
-#line 497 "MediaInterfaces.c"
+#line 530 "MediaInterfaces.c"
 				}
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_error_free0 (err);
-#line 501 "MediaInterfaces.c"
+#line 534 "MediaInterfaces.c"
 			}
 			__finally585:
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 506 "MediaInterfaces.c"
+#line 539 "MediaInterfaces.c"
 				{
 					gint _tmp11_;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					_tmp11_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 513 "MediaInterfaces.c"
+#line 546 "MediaInterfaces.c"
 				}
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -517,7 +550,7 @@ void transaction_controller_commit (TransactionController* self) {
 				g_clear_error (&_inner_error_);
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				return;
-#line 521 "MediaInterfaces.c"
+#line 554 "MediaInterfaces.c"
 			}
 		}
 		__finally584:
@@ -527,7 +560,7 @@ void transaction_controller_commit (TransactionController* self) {
 			_tmp12_ = self->priv->count;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 531 "MediaInterfaces.c"
+#line 564 "MediaInterfaces.c"
 		}
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -537,128 +570,159 @@ void transaction_controller_commit (TransactionController* self) {
 			g_clear_error (&_inner_error_);
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			return;
-#line 541 "MediaInterfaces.c"
+#line 574 "MediaInterfaces.c"
 		}
 	}
 }
 
 
-static void transaction_controller_real_commit_impl (TransactionController* self, GError** error) {
+static void
+transaction_controller_real_commit_impl (TransactionController* self,
+                                         GError** error)
+{
 #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_critical ("Type `%s' does not implement abstract method `transaction_controller_commit_impl'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return;
-#line 552 "MediaInterfaces.c"
+#line 588 "MediaInterfaces.c"
 }
 
 
-void transaction_controller_commit_impl (TransactionController* self, GError** error) {
+void
+transaction_controller_commit_impl (TransactionController* self,
+                                    GError** error)
+{
 #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (self));
 #line 104 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	TRANSACTION_CONTROLLER_GET_CLASS (self)->commit_impl (self, error);
-#line 561 "MediaInterfaces.c"
+#line 600 "MediaInterfaces.c"
 }
 
 
-static void value_transaction_controller_init (GValue* value) {
+static void
+value_transaction_controller_init (GValue* value)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	value->data[0].v_pointer = NULL;
-#line 568 "MediaInterfaces.c"
+#line 609 "MediaInterfaces.c"
 }
 
 
-static void value_transaction_controller_free_value (GValue* value) {
+static void
+value_transaction_controller_free_value (GValue* value)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (value->data[0].v_pointer) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		transaction_controller_unref (value->data[0].v_pointer);
-#line 577 "MediaInterfaces.c"
+#line 620 "MediaInterfaces.c"
 	}
 }
 
 
-static void value_transaction_controller_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_transaction_controller_copy_value (const GValue* src_value,
+                                         GValue* dest_value)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (src_value->data[0].v_pointer) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		dest_value->data[0].v_pointer = transaction_controller_ref (src_value->data[0].v_pointer);
-#line 587 "MediaInterfaces.c"
+#line 633 "MediaInterfaces.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 591 "MediaInterfaces.c"
+#line 637 "MediaInterfaces.c"
 	}
 }
 
 
-static gpointer value_transaction_controller_peek_pointer (const GValue* value) {
+static gpointer
+value_transaction_controller_peek_pointer (const GValue* value)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return value->data[0].v_pointer;
-#line 599 "MediaInterfaces.c"
+#line 647 "MediaInterfaces.c"
 }
 
 
-static gchar* value_transaction_controller_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_transaction_controller_collect_value (GValue* value,
+                                            guint n_collect_values,
+                                            GTypeCValue* collect_values,
+                                            guint collect_flags)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (collect_values[0].v_pointer) {
-#line 606 "MediaInterfaces.c"
+#line 659 "MediaInterfaces.c"
 		TransactionController * object;
 		object = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 613 "MediaInterfaces.c"
+#line 666 "MediaInterfaces.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.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 617 "MediaInterfaces.c"
+#line 670 "MediaInterfaces.c"
 		}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		value->data[0].v_pointer = transaction_controller_ref (object);
-#line 621 "MediaInterfaces.c"
+#line 674 "MediaInterfaces.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		value->data[0].v_pointer = NULL;
-#line 625 "MediaInterfaces.c"
+#line 678 "MediaInterfaces.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return NULL;
-#line 629 "MediaInterfaces.c"
+#line 682 "MediaInterfaces.c"
 }
 
 
-static gchar* value_transaction_controller_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_transaction_controller_lcopy_value (const GValue* value,
+                                          guint n_collect_values,
+                                          GTypeCValue* collect_values,
+                                          guint collect_flags)
+{
 	TransactionController ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!object_p) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 640 "MediaInterfaces.c"
+#line 698 "MediaInterfaces.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!value->data[0].v_pointer) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		*object_p = NULL;
-#line 646 "MediaInterfaces.c"
+#line 704 "MediaInterfaces.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		*object_p = value->data[0].v_pointer;
-#line 650 "MediaInterfaces.c"
+#line 708 "MediaInterfaces.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		*object_p = transaction_controller_ref (value->data[0].v_pointer);
-#line 654 "MediaInterfaces.c"
+#line 712 "MediaInterfaces.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return NULL;
-#line 658 "MediaInterfaces.c"
+#line 716 "MediaInterfaces.c"
 }
 
 
-GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_transaction_controller (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags)
+{
 	ParamSpecTransactionController* spec;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TRANSACTION_CONTROLLER), NULL);
@@ -668,20 +732,25 @@ GParamSpec* param_spec_transaction_controller (const gchar* name, const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return G_PARAM_SPEC (spec);
-#line 672 "MediaInterfaces.c"
+#line 736 "MediaInterfaces.c"
 }
 
 
-gpointer value_get_transaction_controller (const GValue* value) {
+gpointer
+value_get_transaction_controller (const GValue* value)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER), NULL);
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return value->data[0].v_pointer;
-#line 681 "MediaInterfaces.c"
+#line 747 "MediaInterfaces.c"
 }
 
 
-void value_set_transaction_controller (GValue* value, gpointer v_object) {
+void
+value_set_transaction_controller (GValue* value,
+                                  gpointer v_object)
+{
 	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
@@ -697,22 +766,25 @@ void value_set_transaction_controller (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		transaction_controller_ref (value->data[0].v_pointer);
-#line 701 "MediaInterfaces.c"
+#line 770 "MediaInterfaces.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		value->data[0].v_pointer = NULL;
-#line 705 "MediaInterfaces.c"
+#line 774 "MediaInterfaces.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (old) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		transaction_controller_unref (old);
-#line 711 "MediaInterfaces.c"
+#line 780 "MediaInterfaces.c"
 	}
 }
 
 
-void value_take_transaction_controller (GValue* value, gpointer v_object) {
+void
+value_take_transaction_controller (GValue* value,
+                                   gpointer v_object)
+{
 	TransactionController * old;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TRANSACTION_CONTROLLER));
@@ -726,22 +798,24 @@ void value_take_transaction_controller (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		value->data[0].v_pointer = v_object;
-#line 730 "MediaInterfaces.c"
+#line 802 "MediaInterfaces.c"
 	} else {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		value->data[0].v_pointer = NULL;
-#line 734 "MediaInterfaces.c"
+#line 806 "MediaInterfaces.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (old) {
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		transaction_controller_unref (old);
-#line 740 "MediaInterfaces.c"
+#line 812 "MediaInterfaces.c"
 	}
 }
 
 
-static void transaction_controller_class_init (TransactionControllerClass * klass) {
+static void
+transaction_controller_class_init (TransactionControllerClass * klass)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	transaction_controller_parent_class = g_type_class_peek_parent (klass);
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -752,11 +826,13 @@ static void transaction_controller_class_init (TransactionControllerClass * klas
 	((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_begin_impl;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) transaction_controller_real_commit_impl;
-#line 756 "MediaInterfaces.c"
+#line 830 "MediaInterfaces.c"
 }
 
 
-static void transaction_controller_instance_init (TransactionController * self) {
+static void
+transaction_controller_instance_init (TransactionController * self)
+{
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	self->priv = TRANSACTION_CONTROLLER_GET_PRIVATE (self);
 #line 52 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -765,32 +841,34 @@ static void transaction_controller_instance_init (TransactionController * self)
 	self->priv->count = 0;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	self->ref_count = 1;
-#line 769 "MediaInterfaces.c"
+#line 845 "MediaInterfaces.c"
 }
 
 
-static void transaction_controller_finalize (TransactionController * obj) {
+static void
+transaction_controller_finalize (TransactionController * obj)
+{
 	TransactionController * self;
 	GError * _inner_error_ = NULL;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRANSACTION_CONTROLLER, TransactionController);
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_signal_handlers_destroy (self);
-#line 780 "MediaInterfaces.c"
+#line 858 "MediaInterfaces.c"
 	{
 		gint _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_tmp0_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_rec_mutex_lock (&self->priv->__lock_count);
-#line 787 "MediaInterfaces.c"
+#line 865 "MediaInterfaces.c"
 		{
 			gint _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_tmp1_ = self->priv->count;
 #line 59 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_vala_assert (_tmp1_ == 0, "count == 0");
-#line 794 "MediaInterfaces.c"
+#line 872 "MediaInterfaces.c"
 		}
 		__finally581:
 		{
@@ -799,7 +877,7 @@ static void transaction_controller_finalize (TransactionController * obj) {
 			_tmp2_ = self->priv->count;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_count);
-#line 803 "MediaInterfaces.c"
+#line 881 "MediaInterfaces.c"
 		}
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -807,16 +885,18 @@ static void transaction_controller_finalize (TransactionController * obj) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 811 "MediaInterfaces.c"
+#line 889 "MediaInterfaces.c"
 		}
 	}
 #line 52 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_rec_mutex_clear (&self->priv->__lock_count);
-#line 816 "MediaInterfaces.c"
+#line 894 "MediaInterfaces.c"
 }
 
 
-GType transaction_controller_get_type (void) {
+GType
+transaction_controller_get_type (void)
+{
 	static volatile gsize transaction_controller_type_id__volatile = 0;
 	if (g_once_init_enter (&transaction_controller_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_transaction_controller_init, value_transaction_controller_free_value, value_transaction_controller_copy_value, value_transaction_controller_peek_pointer, "p", value_transaction_controller_collect_value, "p", value_transaction_controller_lcopy_value };
@@ -830,18 +910,22 @@ GType transaction_controller_get_type (void) {
 }
 
 
-gpointer transaction_controller_ref (gpointer instance) {
+gpointer
+transaction_controller_ref (gpointer instance)
+{
 	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return instance;
-#line 841 "MediaInterfaces.c"
+#line 923 "MediaInterfaces.c"
 }
 
 
-void transaction_controller_unref (gpointer instance) {
+void
+transaction_controller_unref (gpointer instance)
+{
 	TransactionController * self;
 	self = instance;
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -850,43 +934,50 @@ void transaction_controller_unref (gpointer instance) {
 		TRANSACTION_CONTROLLER_GET_CLASS (self)->finalize (self);
 #line 51 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 854 "MediaInterfaces.c"
+#line 938 "MediaInterfaces.c"
 	}
 }
 
 
-gboolean flaggable_is_flagged (Flaggable* self) {
+gboolean
+flaggable_is_flagged (Flaggable* self)
+{
 #line 115 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_val_if_fail (IS_FLAGGABLE (self), FALSE);
 #line 115 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return FLAGGABLE_GET_INTERFACE (self)->is_flagged (self);
-#line 864 "MediaInterfaces.c"
+#line 950 "MediaInterfaces.c"
 }
 
 
-void flaggable_mark_flagged (Flaggable* self) {
+void
+flaggable_mark_flagged (Flaggable* self)
+{
 #line 117 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_FLAGGABLE (self));
 #line 117 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	FLAGGABLE_GET_INTERFACE (self)->mark_flagged (self);
-#line 873 "MediaInterfaces.c"
+#line 961 "MediaInterfaces.c"
 }
 
 
-void flaggable_mark_unflagged (Flaggable* self) {
+void
+flaggable_mark_unflagged (Flaggable* self)
+{
 #line 119 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_FLAGGABLE (self));
 #line 119 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	FLAGGABLE_GET_INTERFACE (self)->mark_unflagged (self);
-#line 882 "MediaInterfaces.c"
+#line 972 "MediaInterfaces.c"
 }
 
 
-void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection* unflag, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_;
-	GeeCollection* _tmp1_;
-	GeeCollection* _tmp9_;
-	TransactionController* _tmp17_;
+void
+flaggable_mark_many_flagged_unflagged (GeeCollection* flag,
+                                       GeeCollection* unflag,
+                                       TransactionController* controller,
+                                       GError** error)
+{
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((flag == NULL) || GEE_IS_COLLECTION (flag));
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -894,136 +985,120 @@ void flaggable_mark_many_flagged_unflagged (GeeCollection* flag, GeeCollection*
 #line 121 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
 #line 123 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp0_ = controller;
-#line 123 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_begin (_tmp0_);
+	transaction_controller_begin (controller);
 #line 125 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp1_ = flag;
-#line 125 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	if (_tmp1_ != NULL) {
-#line 905 "MediaInterfaces.c"
+	if (flag != NULL) {
+#line 992 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp2_;
-			GeeIterator* _tmp3_;
-#line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp2_ = flag;
+			GeeIterator* _tmp0_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (flag, GEE_TYPE_ITERABLE, GeeIterable));
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_flaggable_it = _tmp3_;
+			_flaggable_it = _tmp0_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
-#line 918 "MediaInterfaces.c"
-				GeeIterator* _tmp4_;
-				gboolean _tmp5_;
+#line 1002 "MediaInterfaces.c"
+				GeeIterator* _tmp1_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp6_;
-				gpointer _tmp7_;
-				Flaggable* _tmp8_;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				Flaggable* _tmp4_;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp4_ = _flaggable_it;
+				_tmp1_ = _flaggable_it;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp5_ = gee_iterator_next (_tmp4_);
-#line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				if (!_tmp5_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					break;
-#line 933 "MediaInterfaces.c"
+#line 1014 "MediaInterfaces.c"
 				}
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp6_ = _flaggable_it;
+				_tmp2_ = _flaggable_it;
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp7_ = gee_iterator_get (_tmp6_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				flaggable = (Flaggable*) _tmp7_;
+				flaggable = (Flaggable*) _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp8_ = flaggable;
+				_tmp4_ = flaggable;
 #line 127 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				flaggable_mark_flagged (_tmp8_);
+				flaggable_mark_flagged (_tmp4_);
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_object_unref0 (flaggable);
-#line 947 "MediaInterfaces.c"
+#line 1028 "MediaInterfaces.c"
 			}
 #line 126 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_g_object_unref0 (_flaggable_it);
-#line 951 "MediaInterfaces.c"
+#line 1032 "MediaInterfaces.c"
 		}
 	}
 #line 130 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp9_ = unflag;
-#line 130 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	if (_tmp9_ != NULL) {
-#line 958 "MediaInterfaces.c"
+	if (unflag != NULL) {
+#line 1037 "MediaInterfaces.c"
 		{
 			GeeIterator* _flaggable_it = NULL;
-			GeeCollection* _tmp10_;
-			GeeIterator* _tmp11_;
+			GeeIterator* _tmp5_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp10_ = unflag;
+			_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (unflag, GEE_TYPE_ITERABLE, GeeIterable));
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_flaggable_it = _tmp11_;
+			_flaggable_it = _tmp5_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
-#line 971 "MediaInterfaces.c"
-				GeeIterator* _tmp12_;
-				gboolean _tmp13_;
+#line 1047 "MediaInterfaces.c"
+				GeeIterator* _tmp6_;
 				Flaggable* flaggable = NULL;
-				GeeIterator* _tmp14_;
-				gpointer _tmp15_;
-				Flaggable* _tmp16_;
-#line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp12_ = _flaggable_it;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
+				Flaggable* _tmp9_;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp13_ = gee_iterator_next (_tmp12_);
+				_tmp6_ = _flaggable_it;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				if (!_tmp13_) {
+				if (!gee_iterator_next (_tmp6_)) {
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					break;
-#line 986 "MediaInterfaces.c"
+#line 1059 "MediaInterfaces.c"
 				}
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp14_ = _flaggable_it;
+				_tmp7_ = _flaggable_it;
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp15_ = gee_iterator_get (_tmp14_);
+				_tmp8_ = gee_iterator_get (_tmp7_);
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				flaggable = (Flaggable*) _tmp15_;
+				flaggable = (Flaggable*) _tmp8_;
 #line 132 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp16_ = flaggable;
+				_tmp9_ = flaggable;
 #line 132 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				flaggable_mark_unflagged (_tmp16_);
+				flaggable_mark_unflagged (_tmp9_);
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_object_unref0 (flaggable);
-#line 1000 "MediaInterfaces.c"
+#line 1073 "MediaInterfaces.c"
 			}
 #line 131 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_g_object_unref0 (_flaggable_it);
-#line 1004 "MediaInterfaces.c"
+#line 1077 "MediaInterfaces.c"
 		}
 	}
 #line 135 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp17_ = controller;
-#line 135 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_commit (_tmp17_);
-#line 1011 "MediaInterfaces.c"
+	transaction_controller_commit (controller);
+#line 1082 "MediaInterfaces.c"
 }
 
 
-static void flaggable_base_init (FlaggableIface * iface) {
+static void
+flaggable_base_init (FlaggableIface * iface)
+{
 #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!initialized) {
 #line 114 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		initialized = TRUE;
-#line 1022 "MediaInterfaces.c"
+#line 1095 "MediaInterfaces.c"
 	}
 }
 
 
-GType flaggable_get_type (void) {
+GType
+flaggable_get_type (void)
+{
 	static volatile gsize flaggable_type_id__volatile = 0;
 	if (g_once_init_enter (&flaggable_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggableIface), (GBaseInitFunc) flaggable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -1036,38 +1111,45 @@ GType flaggable_get_type (void) {
 }
 
 
-gboolean monitorable_is_offline (Monitorable* self) {
+gboolean
+monitorable_is_offline (Monitorable* self)
+{
 #line 153 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_val_if_fail (IS_MONITORABLE (self), FALSE);
 #line 153 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return MONITORABLE_GET_INTERFACE (self)->is_offline (self);
-#line 1045 "MediaInterfaces.c"
+#line 1122 "MediaInterfaces.c"
 }
 
 
-void monitorable_mark_online (Monitorable* self) {
+void
+monitorable_mark_online (Monitorable* self)
+{
 #line 155 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_MONITORABLE (self));
 #line 155 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	MONITORABLE_GET_INTERFACE (self)->mark_online (self);
-#line 1054 "MediaInterfaces.c"
+#line 1133 "MediaInterfaces.c"
 }
 
 
-void monitorable_mark_offline (Monitorable* self) {
+void
+monitorable_mark_offline (Monitorable* self)
+{
 #line 157 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_MONITORABLE (self));
 #line 157 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	MONITORABLE_GET_INTERFACE (self)->mark_offline (self);
-#line 1063 "MediaInterfaces.c"
+#line 1144 "MediaInterfaces.c"
 }
 
 
-void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection* offline, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_;
-	GeeCollection* _tmp1_;
-	GeeCollection* _tmp9_;
-	TransactionController* _tmp17_;
+void
+monitorable_mark_many_online_offline (GeeCollection* online,
+                                      GeeCollection* offline,
+                                      TransactionController* controller,
+                                      GError** error)
+{
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail ((online == NULL) || GEE_IS_COLLECTION (online));
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -1075,296 +1157,270 @@ void monitorable_mark_many_online_offline (GeeCollection* online, GeeCollection*
 #line 159 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
 #line 161 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp0_ = controller;
-#line 161 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_begin (_tmp0_);
+	transaction_controller_begin (controller);
 #line 163 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp1_ = online;
-#line 163 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	if (_tmp1_ != NULL) {
-#line 1086 "MediaInterfaces.c"
+	if (online != NULL) {
+#line 1164 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp2_;
-			GeeIterator* _tmp3_;
-#line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp2_ = online;
+			GeeIterator* _tmp0_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (online, GEE_TYPE_ITERABLE, GeeIterable));
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_monitorable_it = _tmp3_;
+			_monitorable_it = _tmp0_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
-#line 1099 "MediaInterfaces.c"
-				GeeIterator* _tmp4_;
-				gboolean _tmp5_;
+#line 1174 "MediaInterfaces.c"
+				GeeIterator* _tmp1_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp6_;
-				gpointer _tmp7_;
-				Monitorable* _tmp8_;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				Monitorable* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp4_ = _monitorable_it;
+				_tmp1_ = _monitorable_it;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp5_ = gee_iterator_next (_tmp4_);
-#line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				if (!_tmp5_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					break;
-#line 1114 "MediaInterfaces.c"
+#line 1186 "MediaInterfaces.c"
 				}
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp6_ = _monitorable_it;
+				_tmp2_ = _monitorable_it;
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp7_ = gee_iterator_get (_tmp6_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				monitorable = (Monitorable*) _tmp7_;
+				monitorable = (Monitorable*) _tmp3_;
 #line 165 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp8_ = monitorable;
+				_tmp4_ = monitorable;
 #line 165 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				monitorable_mark_online (_tmp8_);
+				monitorable_mark_online (_tmp4_);
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_object_unref0 (monitorable);
-#line 1128 "MediaInterfaces.c"
+#line 1200 "MediaInterfaces.c"
 			}
 #line 164 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_g_object_unref0 (_monitorable_it);
-#line 1132 "MediaInterfaces.c"
+#line 1204 "MediaInterfaces.c"
 		}
 	}
 #line 168 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp9_ = offline;
-#line 168 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	if (_tmp9_ != NULL) {
-#line 1139 "MediaInterfaces.c"
+	if (offline != NULL) {
+#line 1209 "MediaInterfaces.c"
 		{
 			GeeIterator* _monitorable_it = NULL;
-			GeeCollection* _tmp10_;
-			GeeIterator* _tmp11_;
+			GeeIterator* _tmp5_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp10_ = offline;
+			_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (offline, GEE_TYPE_ITERABLE, GeeIterable));
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-			_monitorable_it = _tmp11_;
+			_monitorable_it = _tmp5_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			while (TRUE) {
-#line 1152 "MediaInterfaces.c"
-				GeeIterator* _tmp12_;
-				gboolean _tmp13_;
+#line 1219 "MediaInterfaces.c"
+				GeeIterator* _tmp6_;
 				Monitorable* monitorable = NULL;
-				GeeIterator* _tmp14_;
-				gpointer _tmp15_;
-				Monitorable* _tmp16_;
-#line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp12_ = _monitorable_it;
+				GeeIterator* _tmp7_;
+				gpointer _tmp8_;
+				Monitorable* _tmp9_;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp13_ = gee_iterator_next (_tmp12_);
+				_tmp6_ = _monitorable_it;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				if (!_tmp13_) {
+				if (!gee_iterator_next (_tmp6_)) {
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 					break;
-#line 1167 "MediaInterfaces.c"
+#line 1231 "MediaInterfaces.c"
 				}
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp14_ = _monitorable_it;
+				_tmp7_ = _monitorable_it;
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp15_ = gee_iterator_get (_tmp14_);
+				_tmp8_ = gee_iterator_get (_tmp7_);
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				monitorable = (Monitorable*) _tmp15_;
+				monitorable = (Monitorable*) _tmp8_;
 #line 170 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				_tmp16_ = monitorable;
+				_tmp9_ = monitorable;
 #line 170 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-				monitorable_mark_offline (_tmp16_);
+				monitorable_mark_offline (_tmp9_);
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				_g_object_unref0 (monitorable);
-#line 1181 "MediaInterfaces.c"
+#line 1245 "MediaInterfaces.c"
 			}
 #line 169 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			_g_object_unref0 (_monitorable_it);
-#line 1185 "MediaInterfaces.c"
+#line 1249 "MediaInterfaces.c"
 		}
 	}
 #line 173 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp17_ = controller;
-#line 173 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_commit (_tmp17_);
-#line 1192 "MediaInterfaces.c"
+	transaction_controller_commit (controller);
+#line 1254 "MediaInterfaces.c"
 }
 
 
-void monitorable_set_master_file (Monitorable* self, GFile* file) {
+void
+monitorable_set_master_file (Monitorable* self,
+                             GFile* file)
+{
 #line 176 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_MONITORABLE (self));
 #line 176 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	MONITORABLE_GET_INTERFACE (self)->set_master_file (self, file);
-#line 1201 "MediaInterfaces.c"
+#line 1266 "MediaInterfaces.c"
 }
 
 
-void monitorable_set_many_master_file (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_;
+void
+monitorable_set_many_master_file (GeeMap* map,
+                                  TransactionController* controller,
+                                  GError** error)
+{
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_;
-	GeeMapIterator* _tmp2_;
-	TransactionController* _tmp11_;
+	GeeMapIterator* _tmp0_;
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
 #line 180 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp0_ = controller;
-#line 180 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_begin (_tmp0_);
+	transaction_controller_begin (controller);
 #line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp1_ = map;
+	_tmp0_ = gee_map_map_iterator (map);
 #line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp2_ = gee_map_map_iterator (_tmp1_);
-#line 182 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	map_iter = _tmp2_;
+	map_iter = _tmp0_;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
-#line 1227 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_;
-		gboolean _tmp4_;
+#line 1289 "MediaInterfaces.c"
+		GeeMapIterator* _tmp1_;
+		GeeMapIterator* _tmp2_;
+		gpointer _tmp3_;
+		Monitorable* _tmp4_;
 		GeeMapIterator* _tmp5_;
 		gpointer _tmp6_;
-		Monitorable* _tmp7_;
-		GeeMapIterator* _tmp8_;
-		gpointer _tmp9_;
-		GFile* _tmp10_;
-#line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp3_ = map_iter;
+		GFile* _tmp7_;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp4_ = gee_map_iterator_next (_tmp3_);
+		_tmp1_ = map_iter;
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		if (!_tmp4_) {
+		if (!gee_map_iterator_next (_tmp1_)) {
 #line 183 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			break;
-#line 1244 "MediaInterfaces.c"
+#line 1303 "MediaInterfaces.c"
 		}
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp5_ = map_iter;
-#line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp6_ = gee_map_iterator_get_key (_tmp5_);
+		_tmp2_ = map_iter;
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp7_ = (Monitorable*) _tmp6_;
+		_tmp3_ = gee_map_iterator_get_key (_tmp2_);
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp8_ = map_iter;
+		_tmp4_ = (Monitorable*) _tmp3_;
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp9_ = gee_map_iterator_get_value (_tmp8_);
+		_tmp5_ = map_iter;
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp10_ = (GFile*) _tmp9_;
+		_tmp6_ = gee_map_iterator_get_value (_tmp5_);
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		monitorable_set_master_file (_tmp7_, _tmp10_);
+		_tmp7_ = (GFile*) _tmp6_;
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_g_object_unref0 (_tmp10_);
+		monitorable_set_master_file (_tmp4_, _tmp7_);
 #line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1264 "MediaInterfaces.c"
+#line 184 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
+		_g_object_unref0 (_tmp4_);
+#line 1323 "MediaInterfaces.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp11_ = controller;
-#line 186 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_commit (_tmp11_);
+	transaction_controller_commit (controller);
 #line 178 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	_g_object_unref0 (map_iter);
-#line 1272 "MediaInterfaces.c"
+#line 1329 "MediaInterfaces.c"
 }
 
 
-void monitorable_set_master_timestamp (Monitorable* self, GFileInfo* info) {
+void
+monitorable_set_master_timestamp (Monitorable* self,
+                                  GFileInfo* info)
+{
 #line 189 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_MONITORABLE (self));
 #line 189 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	MONITORABLE_GET_INTERFACE (self)->set_master_timestamp (self, info);
-#line 1281 "MediaInterfaces.c"
+#line 1341 "MediaInterfaces.c"
 }
 
 
-void monitorable_set_many_master_timestamp (GeeMap* map, TransactionController* controller, GError** error) {
-	TransactionController* _tmp0_;
+void
+monitorable_set_many_master_timestamp (GeeMap* map,
+                                       TransactionController* controller,
+                                       GError** error)
+{
 	GeeMapIterator* map_iter = NULL;
-	GeeMap* _tmp1_;
-	GeeMapIterator* _tmp2_;
-	TransactionController* _tmp11_;
+	GeeMapIterator* _tmp0_;
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
 #line 193 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp0_ = controller;
-#line 193 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_begin (_tmp0_);
-#line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp1_ = map;
+	transaction_controller_begin (controller);
 #line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp2_ = gee_map_map_iterator (_tmp1_);
+	_tmp0_ = gee_map_map_iterator (map);
 #line 195 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	map_iter = _tmp2_;
+	map_iter = _tmp0_;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	while (TRUE) {
-#line 1307 "MediaInterfaces.c"
-		GeeMapIterator* _tmp3_;
-		gboolean _tmp4_;
+#line 1364 "MediaInterfaces.c"
+		GeeMapIterator* _tmp1_;
+		GeeMapIterator* _tmp2_;
+		gpointer _tmp3_;
+		Monitorable* _tmp4_;
 		GeeMapIterator* _tmp5_;
 		gpointer _tmp6_;
-		Monitorable* _tmp7_;
-		GeeMapIterator* _tmp8_;
-		gpointer _tmp9_;
-		GFileInfo* _tmp10_;
+		GFileInfo* _tmp7_;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp3_ = map_iter;
+		_tmp1_ = map_iter;
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp4_ = gee_map_iterator_next (_tmp3_);
-#line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		if (!_tmp4_) {
+		if (!gee_map_iterator_next (_tmp1_)) {
 #line 196 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			break;
-#line 1324 "MediaInterfaces.c"
+#line 1378 "MediaInterfaces.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp5_ = map_iter;
-#line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp6_ = gee_map_iterator_get_key (_tmp5_);
+		_tmp2_ = map_iter;
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp7_ = (Monitorable*) _tmp6_;
+		_tmp3_ = gee_map_iterator_get_key (_tmp2_);
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp8_ = map_iter;
+		_tmp4_ = (Monitorable*) _tmp3_;
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp9_ = gee_map_iterator_get_value (_tmp8_);
+		_tmp5_ = map_iter;
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_tmp10_ = (GFileInfo*) _tmp9_;
+		_tmp6_ = gee_map_iterator_get_value (_tmp5_);
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		monitorable_set_master_timestamp (_tmp7_, _tmp10_);
+		_tmp7_ = (GFileInfo*) _tmp6_;
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-		_g_object_unref0 (_tmp10_);
+		monitorable_set_master_timestamp (_tmp4_, _tmp7_);
 #line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1344 "MediaInterfaces.c"
+#line 197 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
+		_g_object_unref0 (_tmp4_);
+#line 1398 "MediaInterfaces.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	_tmp11_ = controller;
-#line 199 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
-	transaction_controller_commit (_tmp11_);
+	transaction_controller_commit (controller);
 #line 191 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	_g_object_unref0 (map_iter);
-#line 1352 "MediaInterfaces.c"
+#line 1404 "MediaInterfaces.c"
 }
 
 
-static void monitorable_base_init (MonitorableIface * iface) {
+static void
+monitorable_base_init (MonitorableIface * iface)
+{
 #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!initialized) {
 #line 152 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		initialized = TRUE;
-#line 1363 "MediaInterfaces.c"
+#line 1417 "MediaInterfaces.c"
 	}
 }
 
 
-GType monitorable_get_type (void) {
+GType
+monitorable_get_type (void)
+{
 	static volatile gsize monitorable_type_id__volatile = 0;
 	if (g_once_init_enter (&monitorable_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (MonitorableIface), (GBaseInitFunc) monitorable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
@@ -1377,37 +1433,46 @@ GType monitorable_get_type (void) {
 }
 
 
-void dateable_set_exposure_time (Dateable* self, time_t target_time) {
+void
+dateable_set_exposure_time (Dateable* self,
+                            time_t target_time)
+{
 #line 212 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_if_fail (IS_DATEABLE (self));
 #line 212 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	DATEABLE_GET_INTERFACE (self)->set_exposure_time (self, target_time);
-#line 1386 "MediaInterfaces.c"
+#line 1445 "MediaInterfaces.c"
 }
 
 
-time_t dateable_get_exposure_time (Dateable* self) {
+time_t
+dateable_get_exposure_time (Dateable* self)
+{
 #line 214 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	g_return_val_if_fail (IS_DATEABLE (self), 0);
 #line 214 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	return DATEABLE_GET_INTERFACE (self)->get_exposure_time (self);
-#line 1395 "MediaInterfaces.c"
+#line 1456 "MediaInterfaces.c"
 }
 
 
-static void dateable_base_init (DateableIface * iface) {
+static void
+dateable_base_init (DateableIface * iface)
+{
 #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	static gboolean initialized = FALSE;
 #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 	if (!initialized) {
 #line 211 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 		initialized = TRUE;
-#line 1406 "MediaInterfaces.c"
+#line 1469 "MediaInterfaces.c"
 	}
 }
 
 
-GType dateable_get_type (void) {
+GType
+dateable_get_type (void)
+{
 	static volatile gsize dateable_type_id__volatile = 0;
 	if (g_once_init_enter (&dateable_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DateableIface), (GBaseInitFunc) dateable_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };