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

1 files changed, 471 insertions, 508 deletions

diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index ff453c2..f1405c4 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.36.6, the Vala compiler
+/* KeyValueMap.c generated by valac 0.40.4, the Vala compiler
  * generated from KeyValueMap.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>
@@ -63,79 +64,109 @@ static gpointer key_value_map_parent_class = NULL;
 
 gpointer key_value_map_ref (gpointer instance);
 void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
+GParamSpec* param_spec_key_value_map (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags);
+void value_set_key_value_map (GValue* value,
+                              gpointer v_object);
+void value_take_key_value_map (GValue* value,
+                               gpointer v_object);
 gpointer value_get_key_value_map (const GValue* value);
 GType key_value_map_get_type (void) G_GNUC_CONST;
 #define KEY_VALUE_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_KEY_VALUE_MAP, KeyValueMapPrivate))
-enum  {
-	KEY_VALUE_MAP_DUMMY_PROPERTY
-};
 KeyValueMap* key_value_map_new (const gchar* group);
-KeyValueMap* key_value_map_construct (GType object_type, const gchar* group);
+KeyValueMap* key_value_map_construct (GType object_type,
+                                      const gchar* group);
 KeyValueMap* key_value_map_copy (KeyValueMap* self);
 gchar* key_value_map_get_group (KeyValueMap* self);
 GeeSet* key_value_map_get_keys (KeyValueMap* self);
-gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key);
-void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value);
-void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value);
-void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value);
-void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value);
-void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value);
-gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def);
-gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def);
-gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def);
-gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def);
-gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);
-void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
-void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
+gboolean key_value_map_has_key (KeyValueMap* self,
+                                const gchar* key);
+void key_value_map_set_string (KeyValueMap* self,
+                               const gchar* key,
+                               const gchar* value);
+void key_value_map_set_int (KeyValueMap* self,
+                            const gchar* key,
+                            gint value);
+void key_value_map_set_double (KeyValueMap* self,
+                               const gchar* key,
+                               gdouble value);
+void key_value_map_set_float (KeyValueMap* self,
+                              const gchar* key,
+                              gfloat value);
+void key_value_map_set_bool (KeyValueMap* self,
+                             const gchar* key,
+                             gboolean value);
+gchar* key_value_map_get_string (KeyValueMap* self,
+                                 const gchar* key,
+                                 const gchar* def);
+gint key_value_map_get_int (KeyValueMap* self,
+                            const gchar* key,
+                            gint def);
+gdouble key_value_map_get_double (KeyValueMap* self,
+                                  const gchar* key,
+                                  gdouble def);
+gfloat key_value_map_get_float (KeyValueMap* self,
+                                const gchar* key,
+                                gfloat def);
+gboolean key_value_map_get_bool (KeyValueMap* self,
+                                 const gchar* key,
+                                 gboolean def);
+void key_value_map_get_point (KeyValueMap* self,
+                              const gchar* key,
+                              GdkPoint* def,
+                              GdkPoint* result);
+void key_value_map_set_point (KeyValueMap* self,
+                              const gchar* key,
+                              GdkPoint* point);
 static void key_value_map_finalize (KeyValueMap * obj);
 
 
-KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {
+KeyValueMap*
+key_value_map_construct (GType object_type,
+                         const gchar* group)
+{
 	KeyValueMap* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (group != NULL, NULL);
+	gchar* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self = (KeyValueMap*) g_type_create_instance (object_type);
 #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = group;
-#line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (group);
 #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (self->priv->group);
 #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	self->priv->group = _tmp1_;
+	self->priv->group = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return self;
-#line 115 "KeyValueMap.c"
+#line 144 "KeyValueMap.c"
 }
 
 
-KeyValueMap* key_value_map_new (const gchar* group) {
+KeyValueMap*
+key_value_map_new (const gchar* group)
+{
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return key_value_map_construct (TYPE_KEY_VALUE_MAP, group);
-#line 122 "KeyValueMap.c"
+#line 153 "KeyValueMap.c"
 }
 
 
-KeyValueMap* key_value_map_copy (KeyValueMap* self) {
+KeyValueMap*
+key_value_map_copy (KeyValueMap* self)
+{
 	KeyValueMap* result = NULL;
 	KeyValueMap* clone = NULL;
 	const gchar* _tmp0_;
 	KeyValueMap* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->group;
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp1_ = key_value_map_new (_tmp0_);
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	clone = _tmp1_;
-#line 139 "KeyValueMap.c"
+#line 170 "KeyValueMap.c"
 	{
 		GeeIterator* _key_it = NULL;
 		GeeHashMap* _tmp2_;
@@ -162,75 +193,72 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 		_key_it = _tmp7_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		while (TRUE) {
-#line 166 "KeyValueMap.c"
+#line 197 "KeyValueMap.c"
 			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
 			gchar* key = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
-			KeyValueMap* _tmp12_;
-			GeeHashMap* _tmp13_;
-			const gchar* _tmp14_;
-			GeeHashMap* _tmp15_;
-			const gchar* _tmp16_;
-			gpointer _tmp17_;
-			gchar* _tmp18_;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			KeyValueMap* _tmp11_;
+			GeeHashMap* _tmp12_;
+			const gchar* _tmp13_;
+			GeeHashMap* _tmp14_;
+			const gchar* _tmp15_;
+			gpointer _tmp16_;
+			gchar* _tmp17_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_tmp8_ = _key_it;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			if (!_tmp9_) {
+			if (!gee_iterator_next (_tmp8_)) {
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 				break;
-#line 187 "KeyValueMap.c"
+#line 215 "KeyValueMap.c"
 			}
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp10_ = _key_it;
+			_tmp9_ = _key_it;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			key = (gchar*) _tmp11_;
+			key = (gchar*) _tmp10_;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp12_ = clone;
+			_tmp11_ = clone;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp13_ = _tmp12_->priv->map;
+			_tmp12_ = _tmp11_->priv->map;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp14_ = key;
+			_tmp13_ = key;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp15_ = self->priv->map;
+			_tmp14_ = self->priv->map;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp16_ = key;
+			_tmp15_ = key;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_);
+			_tmp16_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_);
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp18_ = (gchar*) _tmp17_;
+			_tmp17_ = (gchar*) _tmp16_;
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp18_);
+			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp17_);
 #line 18 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_g_free0 (_tmp18_);
+			_g_free0 (_tmp17_);
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_g_free0 (key);
-#line 215 "KeyValueMap.c"
+#line 243 "KeyValueMap.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_g_object_unref0 (_key_it);
-#line 219 "KeyValueMap.c"
+#line 247 "KeyValueMap.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = clone;
 #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 225 "KeyValueMap.c"
+#line 253 "KeyValueMap.c"
 }
 
 
-gchar* key_value_map_get_group (KeyValueMap* self) {
+gchar*
+key_value_map_get_group (KeyValueMap* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->group;
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -239,17 +267,17 @@ gchar* key_value_map_get_group (KeyValueMap* self) {
 	result = _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 243 "KeyValueMap.c"
+#line 271 "KeyValueMap.c"
 }
 
 
-GeeSet* key_value_map_get_keys (KeyValueMap* self) {
+GeeSet*
+key_value_map_get_keys (KeyValueMap* self)
+{
 	GeeSet* result = NULL;
 	GeeHashMap* _tmp0_;
 	GeeSet* _tmp1_;
 	GeeSet* _tmp2_;
-#line 27 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -260,94 +288,69 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 	result = _tmp2_;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 264 "KeyValueMap.c"
+#line 292 "KeyValueMap.c"
 }
 
 
-gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
+gboolean
+key_value_map_has_key (KeyValueMap* self,
+                       const gchar* key)
+{
 	gboolean result = FALSE;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
-#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
-#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
-#line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp2_;
+	result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 287 "KeyValueMap.c"
+#line 308 "KeyValueMap.c"
 }
 
 
-void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value) {
-	const gchar* _tmp0_;
-	GeeHashMap* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (value != NULL);
-#line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = key;
+void
+key_value_map_set_string (KeyValueMap* self,
+                          const gchar* key,
+                          const gchar* value)
+{
+	GeeHashMap* _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_vala_assert (_tmp0_ != NULL, "key != null");
-#line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = self->priv->map;
-#line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = key;
+	_vala_assert (key != NULL, "key != null");
 #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp0_ = self->priv->map;
 #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_);
-#line 314 "KeyValueMap.c"
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, value);
+#line 324 "KeyValueMap.c"
 }
 
 
-void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
-	const gchar* _tmp0_;
-	GeeHashMap* _tmp1_;
-	const gchar* _tmp2_;
-	gint _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = key;
+void
+key_value_map_set_int (KeyValueMap* self,
+                       const gchar* key,
+                       gint value)
+{
+	GeeHashMap* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_vala_assert (_tmp0_ != NULL, "key != null");
+	_vala_assert (key != NULL, "key != null");
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = self->priv->map;
-#line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = key;
-#line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp0_ = self->priv->map;
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = g_strdup_printf ("%i", _tmp3_);
+	_tmp1_ = g_strdup_printf ("%i", value);
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_);
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_g_free0 (_tmp5_);
-#line 347 "KeyValueMap.c"
+	_g_free0 (_tmp2_);
+#line 348 "KeyValueMap.c"
 }
 
 
-static gchar* double_to_string (gdouble self) {
+static gchar*
+double_to_string (gdouble self)
+{
 	gchar* result = NULL;
 	gchar* _tmp0_;
 	gchar* _tmp1_;
@@ -355,668 +358,608 @@ static gchar* double_to_string (gdouble self) {
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = (g_free (_tmp1_), NULL);
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 883 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 377 "KeyValueMap.c"
+#line 380 "KeyValueMap.c"
 }
 
 
-void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value) {
-	const gchar* _tmp0_;
-	GeeHashMap* _tmp1_;
-	const gchar* _tmp2_;
-	gdouble _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = key;
+void
+key_value_map_set_double (KeyValueMap* self,
+                          const gchar* key,
+                          gdouble value)
+{
+	GeeHashMap* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_vala_assert (_tmp0_ != NULL, "key != null");
-#line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = self->priv->map;
+	_vala_assert (key != NULL, "key != null");
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = key;
-#line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp0_ = self->priv->map;
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = double_to_string (_tmp3_);
+	_tmp1_ = double_to_string (value);
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_);
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_g_free0 (_tmp5_);
-#line 410 "KeyValueMap.c"
+	_g_free0 (_tmp2_);
+#line 404 "KeyValueMap.c"
 }
 
 
-void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) {
-	const gchar* _tmp0_;
-	GeeHashMap* _tmp1_;
-	const gchar* _tmp2_;
-	gfloat _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = key;
+void
+key_value_map_set_float (KeyValueMap* self,
+                         const gchar* key,
+                         gfloat value)
+{
+	GeeHashMap* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_vala_assert (_tmp0_ != NULL, "key != null");
-#line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = self->priv->map;
+	_vala_assert (key != NULL, "key != null");
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = key;
-#line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp0_ = self->priv->map;
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = g_strdup_printf ("%g", _tmp3_);
+	_tmp1_ = g_strdup_printf ("%g", value);
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_);
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_g_free0 (_tmp5_);
-#line 443 "KeyValueMap.c"
+	_g_free0 (_tmp2_);
+#line 428 "KeyValueMap.c"
 }
 
 
-static gchar* bool_to_string (gboolean self) {
+static gchar*
+bool_to_string (gboolean self)
+{
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (self) {
-#line 451 "KeyValueMap.c"
+#line 438 "KeyValueMap.c"
 		gchar* _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 459 "KeyValueMap.c"
+#line 446 "KeyValueMap.c"
 	} else {
 		gchar* _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 468 "KeyValueMap.c"
+#line 455 "KeyValueMap.c"
 	}
 }
 
 
-void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value) {
-	const gchar* _tmp0_;
-	GeeHashMap* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = key;
+void
+key_value_map_set_bool (KeyValueMap* self,
+                        const gchar* key,
+                        gboolean value)
+{
+	GeeHashMap* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_vala_assert (_tmp0_ != NULL, "key != null");
+	_vala_assert (key != NULL, "key != null");
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = self->priv->map;
-#line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = key;
-#line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp0_ = self->priv->map;
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = bool_to_string (_tmp3_);
+	_tmp1_ = bool_to_string (value);
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp2_);
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_g_free0 (_tmp5_);
-#line 502 "KeyValueMap.c"
+	_g_free0 (_tmp2_);
+#line 480 "KeyValueMap.c"
 }
 
 
-gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def) {
+gchar*
+key_value_map_get_string (KeyValueMap* self,
+                          const gchar* key,
+                          const gchar* def)
+{
 	gchar* result = NULL;
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_;
-	gchar* _tmp7_;
-#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, NULL);
+	gpointer _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_;
+	gchar* _tmp5_;
 #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
+	value = (gchar*) _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = value;
+	_tmp3_ = value;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp4_ != NULL) {
-#line 531 "KeyValueMap.c"
-		const gchar* _tmp5_;
+	if (_tmp3_ != NULL) {
+#line 506 "KeyValueMap.c"
+		const gchar* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_ = value;
+		_tmp4_ = value;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp5_;
-#line 537 "KeyValueMap.c"
+		_tmp2_ = _tmp4_;
+#line 512 "KeyValueMap.c"
 	} else {
-		const gchar* _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = def;
-#line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp6_;
-#line 544 "KeyValueMap.c"
+		_tmp2_ = def;
+#line 516 "KeyValueMap.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp7_ = g_strdup (_tmp3_);
+	_tmp5_ = g_strdup (_tmp2_);
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp7_;
+	result = _tmp5_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 554 "KeyValueMap.c"
+#line 526 "KeyValueMap.c"
 }
 
 
-gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
+gint
+key_value_map_get_int (KeyValueMap* self,
+                       const gchar* key,
+                       gint def)
+{
 	gint result = 0;
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gint _tmp3_ = 0;
-	const gchar* _tmp4_;
-#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0);
-#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0);
+	gpointer _tmp1_;
+	gint _tmp2_ = 0;
+	const gchar* _tmp3_;
 #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
-#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = value;
+	value = (gchar*) _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp4_ != NULL) {
-#line 582 "KeyValueMap.c"
-		const gchar* _tmp5_;
-		gint _tmp6_;
+	_tmp3_ = value;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_ = value;
+	if (_tmp3_ != NULL) {
+#line 551 "KeyValueMap.c"
+		const gchar* _tmp4_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = atoi (_tmp5_);
+		_tmp4_ = value;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp6_;
-#line 591 "KeyValueMap.c"
+		_tmp2_ = atoi (_tmp4_);
+#line 557 "KeyValueMap.c"
 	} else {
-		gint _tmp7_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp7_ = def;
-#line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp7_;
-#line 598 "KeyValueMap.c"
+		_tmp2_ = def;
+#line 561 "KeyValueMap.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 606 "KeyValueMap.c"
+#line 569 "KeyValueMap.c"
 }
 
 
-static gdouble double_parse (const gchar* str) {
+static gdouble
+double_parse (const gchar* str)
+{
 	gdouble result = 0.0;
-	const gchar* _tmp0_;
-	gdouble _tmp1_;
-#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (str != NULL, 0.0);
-#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gdouble _tmp0_;
+#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = g_ascii_strtod (str, NULL);
+#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_;
+#line 890 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 624 "KeyValueMap.c"
+#line 584 "KeyValueMap.c"
 }
 
 
-gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def) {
+gdouble
+key_value_map_get_double (KeyValueMap* self,
+                          const gchar* key,
+                          gdouble def)
+{
 	gdouble result = 0.0;
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gdouble _tmp3_ = 0.0;
-	const gchar* _tmp4_;
-#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0);
-#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0.0);
+	gpointer _tmp1_;
+	gdouble _tmp2_ = 0.0;
+	const gchar* _tmp3_;
 #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
-#line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
-#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = value;
+	value = (gchar*) _tmp1_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp4_ != NULL) {
-#line 652 "KeyValueMap.c"
-		const gchar* _tmp5_;
-		gdouble _tmp6_;
+	_tmp3_ = value;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_ = value;
+	if (_tmp3_ != NULL) {
+#line 609 "KeyValueMap.c"
+		const gchar* _tmp4_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = double_parse (_tmp5_);
+		_tmp4_ = value;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp6_;
-#line 661 "KeyValueMap.c"
+		_tmp2_ = double_parse (_tmp4_);
+#line 615 "KeyValueMap.c"
 	} else {
-		gdouble _tmp7_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp7_ = def;
-#line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp7_;
-#line 668 "KeyValueMap.c"
+		_tmp2_ = def;
+#line 619 "KeyValueMap.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 676 "KeyValueMap.c"
+#line 627 "KeyValueMap.c"
 }
 
 
-gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) {
+gfloat
+key_value_map_get_float (KeyValueMap* self,
+                         const gchar* key,
+                         gfloat def)
+{
 	gfloat result = 0.0F;
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gfloat _tmp3_ = 0.0F;
-	const gchar* _tmp4_;
-#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0F);
-#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0.0F);
+	gpointer _tmp1_;
+	gfloat _tmp2_ = 0.0F;
+	const gchar* _tmp3_;
 #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
-#line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
-#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = value;
+	value = (gchar*) _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp4_ != NULL) {
-#line 704 "KeyValueMap.c"
-		const gchar* _tmp5_;
-		gdouble _tmp6_;
+	_tmp3_ = value;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_ = value;
+	if (_tmp3_ != NULL) {
+#line 652 "KeyValueMap.c"
+		const gchar* _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = double_parse (_tmp5_);
+		_tmp4_ = value;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = (gfloat) _tmp6_;
-#line 713 "KeyValueMap.c"
+		_tmp2_ = (gfloat) double_parse (_tmp4_);
+#line 658 "KeyValueMap.c"
 	} else {
-		gfloat _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp7_ = def;
-#line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp7_;
-#line 720 "KeyValueMap.c"
+		_tmp2_ = def;
+#line 662 "KeyValueMap.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 728 "KeyValueMap.c"
+#line 670 "KeyValueMap.c"
 }
 
 
-static gboolean bool_parse (const gchar* str) {
+static gboolean
+bool_parse (const gchar* str)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-#line 44 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (g_strcmp0 (str, "true") == 0) {
+#line 46 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = TRUE;
-#line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 745 "KeyValueMap.c"
+#line 684 "KeyValueMap.c"
 	} else {
-#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		result = FALSE;
-#line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 751 "KeyValueMap.c"
+#line 690 "KeyValueMap.c"
 	}
 }
 
 
-gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def) {
+gboolean
+key_value_map_get_bool (KeyValueMap* self,
+                        const gchar* key,
+                        gboolean def)
+{
 	gboolean result = FALSE;
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
-#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
+	gpointer _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp3_;
 #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
-#line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
+	value = (gchar*) _tmp1_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = value;
-#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp4_ != NULL) {
-#line 780 "KeyValueMap.c"
-		const gchar* _tmp5_;
-		gboolean _tmp6_;
+	_tmp3_ = value;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_ = value;
+	if (_tmp3_ != NULL) {
+#line 716 "KeyValueMap.c"
+		const gchar* _tmp4_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = bool_parse (_tmp5_);
+		_tmp4_ = value;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp6_;
-#line 789 "KeyValueMap.c"
+		_tmp2_ = bool_parse (_tmp4_);
+#line 722 "KeyValueMap.c"
 	} else {
-		gboolean _tmp7_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp7_ = def;
-#line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = _tmp7_;
-#line 796 "KeyValueMap.c"
+		_tmp2_ = def;
+#line 726 "KeyValueMap.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 804 "KeyValueMap.c"
+#line 734 "KeyValueMap.c"
 }
 
 
-void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result) {
+void
+key_value_map_get_point (KeyValueMap* self,
+                         const gchar* key,
+                         GdkPoint* def,
+                         GdkPoint* result)
+{
 	gchar* value = NULL;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	const gchar* _tmp3_;
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (def != NULL);
+	gpointer _tmp1_;
+	const gchar* _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key);
 #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	value = (gchar*) _tmp2_;
+	value = (gchar*) _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = value;
+	_tmp2_ = value;
 #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	if (_tmp3_ == NULL) {
-#line 832 "KeyValueMap.c"
-		GdkPoint _tmp4_;
+	if (_tmp2_ == NULL) {
+#line 758 "KeyValueMap.c"
+		GdkPoint _tmp3_;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp4_ = *def;
+		_tmp3_ = *def;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		*result = _tmp4_;
+		*result = _tmp3_;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_g_free0 (value);
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		return;
-#line 842 "KeyValueMap.c"
+#line 768 "KeyValueMap.c"
 	} else {
 		GdkPoint _result_ = {0};
-		GdkPoint _tmp5_ = {0};
-		const gchar* _tmp6_;
-		gint _tmp7_;
+		GdkPoint _tmp4_ = {0};
+		const gchar* _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp5_.x = 0;
+		_tmp4_.x = 0;
 #line 106 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_result_ = _tmp5_;
-#line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp6_ = value;
+		_result_ = _tmp4_;
 #line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp7_ = sscanf (_tmp6_, "(%d, %d)", &_result_.x, &_result_.y);
+		_tmp5_ = value;
 #line 107 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		if (_tmp7_ == 2) {
+		if (sscanf (_tmp5_, "(%d, %d)", &_result_.x, &_result_.y) == 2) {
 #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			*result = _result_;
 #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_g_free0 (value);
 #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return;
-#line 864 "KeyValueMap.c"
+#line 787 "KeyValueMap.c"
 		} else {
-			GdkPoint _tmp8_;
+			GdkPoint _tmp6_;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			_tmp8_ = *def;
+			_tmp6_ = *def;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-			*result = _tmp8_;
+			*result = _tmp6_;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_g_free0 (value);
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return;
-#line 875 "KeyValueMap.c"
+#line 798 "KeyValueMap.c"
 		}
 	}
 #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
-#line 880 "KeyValueMap.c"
+#line 803 "KeyValueMap.c"
 }
 
 
-void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point) {
+void
+key_value_map_set_point (KeyValueMap* self,
+                         const gchar* key,
+                         GdkPoint* point)
+{
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	GdkPoint _tmp2_;
-	gint _tmp3_;
-	GdkPoint _tmp4_;
-	gint _tmp5_;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
-	gchar* _tmp7_;
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (point != NULL);
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = key;
-#line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp2_ = *point;
+	_tmp1_ = *point;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp3_ = _tmp2_.x;
+	_tmp2_ = _tmp1_.x;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp4_ = *point;
+	_tmp3_ = *point;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp5_ = _tmp4_.y;
+	_tmp4_ = _tmp3_.y;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp6_ = g_strdup_printf ("(%d, %d)", _tmp3_, _tmp5_);
+	_tmp5_ = g_strdup_printf ("(%d, %d)", _tmp2_, _tmp4_);
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp7_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), key, _tmp6_);
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_g_free0 (_tmp7_);
-#line 919 "KeyValueMap.c"
+	_g_free0 (_tmp6_);
+#line 837 "KeyValueMap.c"
 }
 
 
-static void value_key_value_map_init (GValue* value) {
+static void
+value_key_value_map_init (GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	value->data[0].v_pointer = NULL;
-#line 926 "KeyValueMap.c"
+#line 846 "KeyValueMap.c"
 }
 
 
-static void value_key_value_map_free_value (GValue* value) {
+static void
+value_key_value_map_free_value (GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (value->data[0].v_pointer);
-#line 935 "KeyValueMap.c"
+#line 857 "KeyValueMap.c"
 	}
 }
 
 
-static void value_key_value_map_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_key_value_map_copy_value (const GValue* src_value,
+                                GValue* dest_value)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		dest_value->data[0].v_pointer = key_value_map_ref (src_value->data[0].v_pointer);
-#line 945 "KeyValueMap.c"
+#line 870 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 949 "KeyValueMap.c"
+#line 874 "KeyValueMap.c"
 	}
 }
 
 
-static gpointer value_key_value_map_peek_pointer (const GValue* value) {
+static gpointer
+value_key_value_map_peek_pointer (const GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return value->data[0].v_pointer;
-#line 957 "KeyValueMap.c"
+#line 884 "KeyValueMap.c"
 }
 
 
-static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_key_value_map_collect_value (GValue* value,
+                                   guint n_collect_values,
+                                   GTypeCValue* collect_values,
+                                   guint collect_flags)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (collect_values[0].v_pointer) {
-#line 964 "KeyValueMap.c"
+#line 896 "KeyValueMap.c"
 		KeyValueMap * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 971 "KeyValueMap.c"
+#line 903 "KeyValueMap.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.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 975 "KeyValueMap.c"
+#line 907 "KeyValueMap.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = key_value_map_ref (object);
-#line 979 "KeyValueMap.c"
+#line 911 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 983 "KeyValueMap.c"
+#line 915 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return NULL;
-#line 987 "KeyValueMap.c"
+#line 919 "KeyValueMap.c"
 }
 
 
-static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_key_value_map_lcopy_value (const GValue* value,
+                                 guint n_collect_values,
+                                 GTypeCValue* collect_values,
+                                 guint collect_flags)
+{
 	KeyValueMap ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 998 "KeyValueMap.c"
+#line 935 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = NULL;
-#line 1004 "KeyValueMap.c"
+#line 941 "KeyValueMap.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1008 "KeyValueMap.c"
+#line 945 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = key_value_map_ref (value->data[0].v_pointer);
-#line 1012 "KeyValueMap.c"
+#line 949 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return NULL;
-#line 1016 "KeyValueMap.c"
+#line 953 "KeyValueMap.c"
 }
 
 
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_key_value_map (const gchar* name,
+                          const gchar* nick,
+                          const gchar* blurb,
+                          GType object_type,
+                          GParamFlags flags)
+{
 	ParamSpecKeyValueMap* spec;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_KEY_VALUE_MAP), NULL);
@@ -1026,20 +969,25 @@ GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return G_PARAM_SPEC (spec);
-#line 1030 "KeyValueMap.c"
+#line 973 "KeyValueMap.c"
 }
 
 
-gpointer value_get_key_value_map (const GValue* value) {
+gpointer
+value_get_key_value_map (const GValue* value)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP), NULL);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return value->data[0].v_pointer;
-#line 1039 "KeyValueMap.c"
+#line 984 "KeyValueMap.c"
 }
 
 
-void value_set_key_value_map (GValue* value, gpointer v_object) {
+void
+value_set_key_value_map (GValue* value,
+                         gpointer v_object)
+{
 	KeyValueMap * old;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
@@ -1055,22 +1003,25 @@ void value_set_key_value_map (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_ref (value->data[0].v_pointer);
-#line 1059 "KeyValueMap.c"
+#line 1007 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 1063 "KeyValueMap.c"
+#line 1011 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (old);
-#line 1069 "KeyValueMap.c"
+#line 1017 "KeyValueMap.c"
 	}
 }
 
 
-void value_take_key_value_map (GValue* value, gpointer v_object) {
+void
+value_take_key_value_map (GValue* value,
+                          gpointer v_object)
+{
 	KeyValueMap * old;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP));
@@ -1084,33 +1035,37 @@ void value_take_key_value_map (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = v_object;
-#line 1088 "KeyValueMap.c"
+#line 1039 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 1092 "KeyValueMap.c"
+#line 1043 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (old);
-#line 1098 "KeyValueMap.c"
+#line 1049 "KeyValueMap.c"
 	}
 }
 
 
-static void key_value_map_class_init (KeyValueMapClass * klass) {
+static void
+key_value_map_class_init (KeyValueMapClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	key_value_map_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	((KeyValueMapClass *) klass)->finalize = key_value_map_finalize;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_type_class_add_private (klass, sizeof (KeyValueMapPrivate));
-#line 1110 "KeyValueMap.c"
+#line 1063 "KeyValueMap.c"
 }
 
 
-static void key_value_map_instance_init (KeyValueMap * self) {
+static void
+key_value_map_instance_init (KeyValueMap * self)
+{
 	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->priv = KEY_VALUE_MAP_GET_PRIVATE (self);
@@ -1120,11 +1075,13 @@ static void key_value_map_instance_init (KeyValueMap * self) {
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->ref_count = 1;
-#line 1124 "KeyValueMap.c"
+#line 1079 "KeyValueMap.c"
 }
 
 
-static void key_value_map_finalize (KeyValueMap * obj) {
+static void
+key_value_map_finalize (KeyValueMap * obj)
+{
 	KeyValueMap * self;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEY_VALUE_MAP, KeyValueMap);
@@ -1134,11 +1091,13 @@ static void key_value_map_finalize (KeyValueMap * obj) {
 	_g_free0 (self->priv->group);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_object_unref0 (self->priv->map);
-#line 1138 "KeyValueMap.c"
+#line 1095 "KeyValueMap.c"
 }
 
 
-GType key_value_map_get_type (void) {
+GType
+key_value_map_get_type (void)
+{
 	static volatile gsize key_value_map_type_id__volatile = 0;
 	if (g_once_init_enter (&key_value_map_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_key_value_map_init, value_key_value_map_free_value, value_key_value_map_copy_value, value_key_value_map_peek_pointer, "p", value_key_value_map_collect_value, "p", value_key_value_map_lcopy_value };
@@ -1152,18 +1111,22 @@ GType key_value_map_get_type (void) {
 }
 
 
-gpointer key_value_map_ref (gpointer instance) {
+gpointer
+key_value_map_ref (gpointer instance)
+{
 	KeyValueMap * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return instance;
-#line 1163 "KeyValueMap.c"
+#line 1124 "KeyValueMap.c"
 }
 
 
-void key_value_map_unref (gpointer instance) {
+void
+key_value_map_unref (gpointer instance)
+{
 	KeyValueMap * self;
 	self = instance;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1172,7 +1135,7 @@ void key_value_map_unref (gpointer instance) {
 		KEY_VALUE_MAP_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1176 "KeyValueMap.c"
+#line 1139 "KeyValueMap.c"
 	}
 }