Merge branch 'feature/upstream' into develop

1 files changed, 268 insertions, 178 deletions

diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index a34dc93..1f966d2 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.36.6, the Vala compiler
+/* DataObject.c generated by valac 0.40.4, the Vala compiler
  * generated from DataObject.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -20,6 +20,7 @@
 /* Have to inherit from Object due to ContainerSource and this bug:*/
 /* https://bugzilla.gnome.org/show_bug.cgi?id=615904*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -56,6 +57,11 @@ typedef struct _AlterationClass AlterationClass;
 
 typedef struct _DataCollection DataCollection;
 typedef struct _DataCollectionClass DataCollectionClass;
+enum  {
+	DATA_OBJECT_0_PROPERTY,
+	DATA_OBJECT_NUM_PROPERTIES
+};
+static GParamSpec* data_object_properties[DATA_OBJECT_NUM_PROPERTIES];
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
 #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL)))
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -93,91 +99,132 @@ static gint64 data_object_object_id_generator = (gint64) 0;
 GType data_object_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 #define DATA_OBJECT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_OBJECT, DataObjectPrivate))
-enum  {
-	DATA_OBJECT_DUMMY_PROPERTY
-};
 #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1)
 #define DATA_COLLECTION_INVALID_OBJECT_ORDINAL ((gint64) -1)
-DataObject* data_object_construct (GType object_type, gint64 object_id);
-void data_object_notify_altered (DataObject* self, Alteration* alteration);
-static void data_object_real_notify_altered (DataObject* self, Alteration* alteration);
-void data_collection_internal_notify_altered (DataCollection* self, DataObject* object, Alteration* alteration);
-void data_object_notify_membership_changed (DataObject* self, DataCollection* collection);
-static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection);
-void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val);
-static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val);
-void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name);
-static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name);
+DataObject* data_object_construct (GType object_type,
+                                   gint64 object_id);
+void data_object_notify_altered (DataObject* self,
+                                 Alteration* alteration);
+static void data_object_real_notify_altered (DataObject* self,
+                                      Alteration* alteration);
+void data_collection_internal_notify_altered (DataCollection* self,
+                                              DataObject* object,
+                                              Alteration* alteration);
+void data_object_notify_membership_changed (DataObject* self,
+                                            DataCollection* collection);
+static void data_object_real_notify_membership_changed (DataObject* self,
+                                                 DataCollection* collection);
+void data_object_notify_collection_property_set (DataObject* self,
+                                                 const gchar* name,
+                                                 GValue* old,
+                                                 GValue* val);
+static void data_object_real_notify_collection_property_set (DataObject* self,
+                                                      const gchar* name,
+                                                      GValue* old,
+                                                      GValue* val);
+void data_object_notify_collection_property_cleared (DataObject* self,
+                                                     const gchar* name);
+static void data_object_real_notify_collection_property_cleared (DataObject* self,
+                                                          const gchar* name);
 gchar* data_object_get_name (DataObject* self);
 static gchar* data_object_real_get_name (DataObject* self);
 gchar* data_object_to_string (DataObject* self);
 static gchar* data_object_real_to_string (DataObject* self);
 DataCollection* data_object_get_membership (DataObject* self);
 gboolean data_object_has_membership (DataObject* self);
-void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal);
-void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal);
+void data_object_internal_set_membership (DataObject* self,
+                                          DataCollection* collection,
+                                          gint64 ordinal);
+void data_object_internal_set_ordinal (DataObject* self,
+                                       gint64 ordinal);
 void data_object_internal_clear_membership (DataObject* self);
 gint64 data_object_internal_get_ordinal (DataObject* self);
 gint64 data_object_get_object_id (DataObject* self);
-void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result);
-GValue* data_collection_get_property (DataCollection* self, const gchar* name);
+void data_object_get_collection_property (DataObject* self,
+                                          const gchar* name,
+                                          GValue* def,
+                                          GValue* result);
+GValue* data_collection_get_property (DataCollection* self,
+                                      const gchar* name);
 static void _vala_GValue_free (GValue* self);
-void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target);
-void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target);
-void data_object_clear_collection_property (DataObject* self, const gchar* name);
-void data_collection_clear_property (DataCollection* self, const gchar* name);
+void data_object_set_collection_property (DataObject* self,
+                                          const gchar* name,
+                                          GValue* val,
+                                          ValueEqualFunc value_equals,
+                                          void* value_equals_target);
+void data_collection_set_property (DataCollection* self,
+                                   const gchar* name,
+                                   GValue* val,
+                                   ValueEqualFunc value_equals,
+                                   void* value_equals_target);
+void data_object_clear_collection_property (DataObject* self,
+                                            const gchar* name);
+void data_collection_clear_property (DataCollection* self,
+                                     const gchar* name);
 static void data_object_finalize (GObject * obj);
 
 
-DataObject* data_object_construct (GType object_type, gint64 object_id) {
+DataObject*
+data_object_construct (GType object_type,
+                       gint64 object_id)
+{
 	DataObject * self = NULL;
 	gint64 _tmp0_ = 0LL;
-	gint64 _tmp1_;
 #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self = (DataObject*) g_object_new (object_type, NULL);
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp1_ = object_id;
-#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	if (_tmp1_ == DATA_OBJECT_INVALID_OBJECT_ID) {
-#line 156 "DataObject.c"
-		gint64 _tmp2_;
+	if (object_id == DATA_OBJECT_INVALID_OBJECT_ID) {
+#line 203 "DataObject.c"
+		gint64 _tmp1_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp2_ = data_object_object_id_generator;
+		_tmp1_ = data_object_object_id_generator;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		data_object_object_id_generator = _tmp2_ + 1;
+		data_object_object_id_generator = _tmp1_ + 1;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp0_ = _tmp2_;
-#line 164 "DataObject.c"
+		_tmp0_ = _tmp1_;
+#line 211 "DataObject.c"
 	} else {
-		gint64 _tmp3_;
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp3_ = object_id;
-#line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp0_ = _tmp3_;
-#line 171 "DataObject.c"
+		_tmp0_ = object_id;
+#line 215 "DataObject.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self->priv->object_id = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return self;
-#line 177 "DataObject.c"
+#line 221 "DataObject.c"
 }
 
 
-static void data_object_real_notify_altered (DataObject* self, Alteration* alteration) {
+static void
+data_object_real_notify_altered (DataObject* self,
+                                 Alteration* alteration)
+{
 	DataCollection* _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_ALTERATION (alteration));
@@ -185,123 +232,157 @@ static void data_object_real_notify_altered (DataObject* self, Alteration* alter
 	_tmp0_ = self->priv->member_of;
 #line 43 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
-#line 189 "DataObject.c"
+#line 236 "DataObject.c"
 		DataCollection* _tmp1_;
-		Alteration* _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp2_ = alteration;
-#line 44 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		data_collection_internal_notify_altered (_tmp1_, self, _tmp2_);
-#line 198 "DataObject.c"
+		data_collection_internal_notify_altered (_tmp1_, self, alteration);
+#line 242 "DataObject.c"
 	}
 }
 
 
-void data_object_notify_altered (DataObject* self, Alteration* alteration) {
+void
+data_object_notify_altered (DataObject* self,
+                            Alteration* alteration)
+{
 #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 42 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	DATA_OBJECT_GET_CLASS (self)->notify_altered (self, alteration);
-#line 208 "DataObject.c"
+#line 255 "DataObject.c"
 }
 
 
-static void data_object_real_notify_membership_changed (DataObject* self, DataCollection* collection) {
+static void
+data_object_real_notify_membership_changed (DataObject* self,
+                                            DataCollection* collection)
+{
 #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection));
-#line 215 "DataObject.c"
+#line 265 "DataObject.c"
 }
 
 
-void data_object_notify_membership_changed (DataObject* self, DataCollection* collection) {
+void
+data_object_notify_membership_changed (DataObject* self,
+                                       DataCollection* collection)
+{
 #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 56 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	DATA_OBJECT_GET_CLASS (self)->notify_membership_changed (self, collection);
-#line 224 "DataObject.c"
+#line 277 "DataObject.c"
 }
 
 
-static void data_object_real_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) {
+static void
+data_object_real_notify_collection_property_set (DataObject* self,
+                                                 const gchar* name,
+                                                 GValue* old,
+                                                 GValue* val)
+{
 #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (name != NULL);
 #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (val != NULL);
-#line 233 "DataObject.c"
+#line 291 "DataObject.c"
 }
 
 
-void data_object_notify_collection_property_set (DataObject* self, const gchar* name, GValue* old, GValue* val) {
+void
+data_object_notify_collection_property_set (DataObject* self,
+                                            const gchar* name,
+                                            GValue* old,
+                                            GValue* val)
+{
 #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 61 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	DATA_OBJECT_GET_CLASS (self)->notify_collection_property_set (self, name, old, val);
-#line 242 "DataObject.c"
+#line 305 "DataObject.c"
 }
 
 
-static void data_object_real_notify_collection_property_cleared (DataObject* self, const gchar* name) {
+static void
+data_object_real_notify_collection_property_cleared (DataObject* self,
+                                                     const gchar* name)
+{
 #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (name != NULL);
-#line 249 "DataObject.c"
+#line 315 "DataObject.c"
 }
 
 
-void data_object_notify_collection_property_cleared (DataObject* self, const gchar* name) {
+void
+data_object_notify_collection_property_cleared (DataObject* self,
+                                                const gchar* name)
+{
 #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 66 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	DATA_OBJECT_GET_CLASS (self)->notify_collection_property_cleared (self, name);
-#line 258 "DataObject.c"
+#line 327 "DataObject.c"
 }
 
 
-static gchar* data_object_real_get_name (DataObject* self) {
+static gchar*
+data_object_real_get_name (DataObject* self)
+{
 #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_critical ("Type `%s' does not implement abstract method `data_object_get_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return NULL;
-#line 267 "DataObject.c"
+#line 338 "DataObject.c"
 }
 
 
-gchar* data_object_get_name (DataObject* self) {
+gchar*
+data_object_get_name (DataObject* self)
+{
 #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), NULL);
 #line 69 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return DATA_OBJECT_GET_CLASS (self)->get_name (self);
-#line 276 "DataObject.c"
+#line 349 "DataObject.c"
 }
 
 
-static gchar* data_object_real_to_string (DataObject* self) {
+static gchar*
+data_object_real_to_string (DataObject* self)
+{
 #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_critical ("Type `%s' does not implement abstract method `data_object_to_string'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return NULL;
-#line 285 "DataObject.c"
+#line 360 "DataObject.c"
 }
 
 
-gchar* data_object_to_string (DataObject* self) {
+gchar*
+data_object_to_string (DataObject* self)
+{
 #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (self), NULL);
 #line 71 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return DATA_OBJECT_GET_CLASS (self)->to_string (self);
-#line 294 "DataObject.c"
+#line 371 "DataObject.c"
 }
 
 
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
 #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 301 "DataObject.c"
+#line 380 "DataObject.c"
 }
 
 
-DataCollection* data_object_get_membership (DataObject* self) {
+DataCollection*
+data_object_get_membership (DataObject* self)
+{
 	DataCollection* result = NULL;
 	DataCollection* _tmp0_;
 	DataCollection* _tmp1_;
@@ -315,11 +396,13 @@ DataCollection* data_object_get_membership (DataObject* self) {
 	result = _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return result;
-#line 319 "DataObject.c"
+#line 400 "DataObject.c"
 }
 
 
-gboolean data_object_has_membership (DataObject* self) {
+gboolean
+data_object_has_membership (DataObject* self)
+{
 	gboolean result = FALSE;
 	DataCollection* _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -330,15 +413,17 @@ gboolean data_object_has_membership (DataObject* self) {
 	result = _tmp0_ != NULL;
 #line 78 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return result;
-#line 334 "DataObject.c"
+#line 417 "DataObject.c"
 }
 
 
-void data_object_internal_set_membership (DataObject* self, DataCollection* collection, gint64 ordinal) {
+void
+data_object_internal_set_membership (DataObject* self,
+                                     DataCollection* collection,
+                                     gint64 ordinal)
+{
 	DataCollection* _tmp0_;
 	DataCollection* _tmp1_;
-	DataCollection* _tmp2_;
-	gint64 _tmp3_;
 #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 83 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -348,24 +433,22 @@ void data_object_internal_set_membership (DataObject* self, DataCollection* coll
 #line 84 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	_vala_assert (_tmp0_ == NULL, "member_of == null");
 #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp1_ = collection;
-#line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp2_ = _data_collection_ref0 (_tmp1_);
+	_tmp1_ = _data_collection_ref0 (collection);
 #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	_data_collection_unref0 (self->priv->member_of);
 #line 86 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	self->priv->member_of = _tmp2_;
+	self->priv->member_of = _tmp1_;
 #line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp3_ = ordinal;
-#line 87 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	self->priv->ordinal = _tmp3_;
-#line 363 "DataObject.c"
+	self->priv->ordinal = ordinal;
+#line 444 "DataObject.c"
 }
 
 
-void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) {
+void
+data_object_internal_set_ordinal (DataObject* self,
+                                  gint64 ordinal)
+{
 	DataCollection* _tmp0_;
-	gint64 _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -373,14 +456,14 @@ void data_object_internal_set_ordinal (DataObject* self, gint64 ordinal) {
 #line 97 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	_vala_assert (_tmp0_ == NULL, "member_of == null");
 #line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp1_ = ordinal;
-#line 99 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	self->priv->ordinal = _tmp1_;
-#line 380 "DataObject.c"
+	self->priv->ordinal = ordinal;
+#line 461 "DataObject.c"
 }
 
 
-void data_object_internal_clear_membership (DataObject* self) {
+void
+data_object_internal_clear_membership (DataObject* self)
+{
 #line 104 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 105 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -389,11 +472,13 @@ void data_object_internal_clear_membership (DataObject* self) {
 	self->priv->member_of = NULL;
 #line 106 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL;
-#line 393 "DataObject.c"
+#line 476 "DataObject.c"
 }
 
 
-inline gint64 data_object_internal_get_ordinal (DataObject* self) {
+inline gint64
+data_object_internal_get_ordinal (DataObject* self)
+{
 	gint64 result = 0LL;
 	gint64 _tmp0_;
 #line 110 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -404,11 +489,13 @@ inline gint64 data_object_internal_get_ordinal (DataObject* self) {
 	result = _tmp0_;
 #line 111 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return result;
-#line 408 "DataObject.c"
+#line 493 "DataObject.c"
 }
 
 
-inline gint64 data_object_get_object_id (DataObject* self) {
+inline gint64
+data_object_get_object_id (DataObject* self)
+{
 	gint64 result = 0LL;
 	gint64 _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -419,28 +506,34 @@ inline gint64 data_object_get_object_id (DataObject* self) {
 	result = _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return result;
-#line 423 "DataObject.c"
+#line 510 "DataObject.c"
 }
 
 
-static void _vala_GValue_free (GValue* self) {
+static void
+_vala_GValue_free (GValue* self)
+{
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_value_unset (self);
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_free (self);
-#line 432 "DataObject.c"
+#line 521 "DataObject.c"
 }
 
 
-void data_object_get_collection_property (DataObject* self, const gchar* name, GValue* def, GValue* result) {
+void
+data_object_get_collection_property (DataObject* self,
+                                     const gchar* name,
+                                     GValue* def,
+                                     GValue* result)
+{
 	DataCollection* _tmp0_;
 	GValue* _result_ = NULL;
-	DataCollection* _tmp3_;
-	const gchar* _tmp4_;
+	DataCollection* _tmp2_;
+	GValue* _tmp3_;
+	GValue* _tmp4_ = NULL;
 	GValue* _tmp5_;
-	GValue* _tmp6_ = NULL;
-	GValue* _tmp7_;
-	GValue _tmp10_ = {0};
+	GValue _tmp7_ = {0};
 #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
 #line 118 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -449,79 +542,77 @@ void data_object_get_collection_property (DataObject* self, const gchar* name, G
 	_tmp0_ = self->priv->member_of;
 #line 119 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ == NULL) {
-#line 453 "DataObject.c"
-		GValue* _tmp1_;
-		GValue _tmp2_ = {0};
-#line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp1_ = def;
+#line 546 "DataObject.c"
+		GValue _tmp1_ = {0};
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		if (G_IS_VALUE (_tmp1_)) {
+		if (G_IS_VALUE (def)) {
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-			g_value_init (&_tmp2_, G_VALUE_TYPE (_tmp1_));
+			g_value_init (&_tmp1_, G_VALUE_TYPE (def));
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-			g_value_copy (_tmp1_, &_tmp2_);
-#line 464 "DataObject.c"
+			g_value_copy (def, &_tmp1_);
+#line 554 "DataObject.c"
 		} else {
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-			_tmp2_ = *_tmp1_;
-#line 468 "DataObject.c"
+			_tmp1_ = *def;
+#line 558 "DataObject.c"
 		}
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		*result = _tmp2_;
+		*result = _tmp1_;
 #line 120 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		return;
-#line 474 "DataObject.c"
+#line 564 "DataObject.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp3_ = self->priv->member_of;
+	_tmp2_ = self->priv->member_of;
 #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp4_ = name;
+	_tmp3_ = data_collection_get_property (_tmp2_, name);
 #line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp5_ = data_collection_get_property (_tmp3_, _tmp4_);
-#line 122 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_result_ = _tmp5_;
+	_result_ = _tmp3_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	_tmp7_ = _result_;
+	_tmp5_ = _result_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	if (_tmp7_ != NULL) {
-#line 488 "DataObject.c"
-		GValue* _tmp8_;
+	if (_tmp5_ != NULL) {
+#line 576 "DataObject.c"
+		GValue* _tmp6_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp8_ = _result_;
+		_tmp6_ = _result_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp6_ = _tmp8_;
-#line 494 "DataObject.c"
+		_tmp4_ = _tmp6_;
+#line 582 "DataObject.c"
 	} else {
-		GValue* _tmp9_;
-#line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp9_ = def;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp6_ = _tmp9_;
-#line 501 "DataObject.c"
+		_tmp4_ = def;
+#line 586 "DataObject.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	if (G_IS_VALUE (_tmp6_)) {
+	if (G_IS_VALUE (_tmp4_)) {
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		g_value_init (&_tmp10_, G_VALUE_TYPE (_tmp6_));
+		g_value_init (&_tmp7_, G_VALUE_TYPE (_tmp4_));
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		g_value_copy (_tmp6_, &_tmp10_);
-#line 509 "DataObject.c"
+		g_value_copy (_tmp4_, &_tmp7_);
+#line 594 "DataObject.c"
 	} else {
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp10_ = *_tmp6_;
-#line 513 "DataObject.c"
+		_tmp7_ = *_tmp4_;
+#line 598 "DataObject.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-	*result = _tmp10_;
+	*result = _tmp7_;
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	__vala_GValue_free0 (_result_);
 #line 124 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	return;
-#line 521 "DataObject.c"
+#line 606 "DataObject.c"
 }
 
 
-void data_object_set_collection_property (DataObject* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target) {
+void
+data_object_set_collection_property (DataObject* self,
+                                     const gchar* name,
+                                     GValue* val,
+                                     ValueEqualFunc value_equals,
+                                     void* value_equals_target)
+{
 	DataCollection* _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
@@ -533,30 +624,24 @@ void data_object_set_collection_property (DataObject* self, const gchar* name, G
 	_tmp0_ = self->priv->member_of;
 #line 128 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
-#line 537 "DataObject.c"
+#line 628 "DataObject.c"
 		DataCollection* _tmp1_;
-		const gchar* _tmp2_;
-		GValue _tmp3_;
-		ValueEqualFunc _tmp4_;
-		void* _tmp4__target;
+		GValue _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp2_ = name;
-#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp3_ = *val;
-#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp4_ = value_equals;
+		_tmp2_ = *val;
 #line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp4__target = value_equals_target;
-#line 129 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		data_collection_set_property (_tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
-#line 555 "DataObject.c"
+		data_collection_set_property (_tmp1_, name, &_tmp2_, value_equals, value_equals_target);
+#line 637 "DataObject.c"
 	}
 }
 
 
-void data_object_clear_collection_property (DataObject* self, const gchar* name) {
+void
+data_object_clear_collection_property (DataObject* self,
+                                       const gchar* name)
+{
 	DataCollection* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	g_return_if_fail (IS_DATA_OBJECT (self));
@@ -566,21 +651,20 @@ void data_object_clear_collection_property (DataObject* self, const gchar* name)
 	_tmp0_ = self->priv->member_of;
 #line 133 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	if (_tmp0_ != NULL) {
-#line 570 "DataObject.c"
+#line 655 "DataObject.c"
 		DataCollection* _tmp1_;
-		const gchar* _tmp2_;
 #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 		_tmp1_ = self->priv->member_of;
 #line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		_tmp2_ = name;
-#line 134 "/home/jens/Source/shotwell/src/core/DataObject.vala"
-		data_collection_clear_property (_tmp1_, _tmp2_);
-#line 579 "DataObject.c"
+		data_collection_clear_property (_tmp1_, name);
+#line 661 "DataObject.c"
 	}
 }
 
 
-static void data_object_class_init (DataObjectClass * klass) {
+static void
+data_object_class_init (DataObjectClass * klass)
+{
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	data_object_parent_class = g_type_class_peek_parent (klass);
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -599,11 +683,13 @@ static void data_object_class_init (DataObjectClass * klass) {
 	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_object_real_to_string;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_object_finalize;
-#line 603 "DataObject.c"
+#line 687 "DataObject.c"
 }
 
 
-static void data_object_instance_init (DataObject * self) {
+static void
+data_object_instance_init (DataObject * self)
+{
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self->priv = DATA_OBJECT_GET_PRIVATE (self);
 #line 32 "/home/jens/Source/shotwell/src/core/DataObject.vala"
@@ -612,11 +698,13 @@ static void data_object_instance_init (DataObject * self) {
 	self->priv->member_of = NULL;
 #line 34 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self->priv->ordinal = DATA_COLLECTION_INVALID_OBJECT_ORDINAL;
-#line 616 "DataObject.c"
+#line 702 "DataObject.c"
 }
 
 
-static void data_object_finalize (GObject * obj) {
+static void
+data_object_finalize (GObject * obj)
+{
 	DataObject * self;
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_OBJECT, DataObject);
@@ -624,11 +712,13 @@ static void data_object_finalize (GObject * obj) {
 	_data_collection_unref0 (self->priv->member_of);
 #line 21 "/home/jens/Source/shotwell/src/core/DataObject.vala"
 	G_OBJECT_CLASS (data_object_parent_class)->finalize (obj);
-#line 628 "DataObject.c"
+#line 716 "DataObject.c"
 }
 
 
-GType data_object_get_type (void) {
+GType
+data_object_get_type (void)
+{
 	static volatile gsize data_object_type_id__volatile = 0;
 	if (g_once_init_enter (&data_object_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataObjectClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_object_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataObject), 0, (GInstanceInitFunc) data_object_instance_init, NULL };