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

1 files changed, 192 insertions, 137 deletions

diff --git a/src/core/DataView.c b/src/core/DataView.c
index 004d364..7267434 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.36.6, the Vala compiler
+/* DataView.c generated by valac 0.40.4, the Vala compiler
  * generated from DataView.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>
@@ -64,6 +65,11 @@ typedef struct _DataViewPrivate DataViewPrivate;
 
 typedef struct _DataSource DataSource;
 typedef struct _DataSourceClass DataSourceClass;
+enum  {
+	DATA_VIEW_0_PROPERTY,
+	DATA_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* data_view_properties[DATA_VIEW_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 
@@ -83,9 +89,9 @@ enum  {
 	DATA_VIEW_VIEW_ALTERED_SIGNAL,
 	DATA_VIEW_GEOMETRY_ALTERED_SIGNAL,
 	DATA_VIEW_UNSUBSCRIBED_SIGNAL,
-	DATA_VIEW_LAST_SIGNAL
+	DATA_VIEW_NUM_SIGNALS
 };
-static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0};
+static guint data_view_signals[DATA_VIEW_NUM_SIGNALS] = {0};
 
 struct _DataObject {
 	GObject parent_instance;
@@ -131,101 +137,126 @@ static gpointer data_view_parent_class = NULL;
 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;
 GType data_view_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 #define DATA_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DATA_VIEW, DataViewPrivate))
-enum  {
-	DATA_VIEW_DUMMY_PROPERTY
-};
-void data_source_internal_unsubscribe (DataSource* self, DataView* view);
+void data_source_internal_unsubscribe (DataSource* self,
+                                       DataView* view);
 DataView* data_view_new (DataSource* source);
-DataView* data_view_construct (GType object_type, DataSource* source);
+DataView* data_view_construct (GType object_type,
+                               DataSource* source);
 #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1)
-DataObject* data_object_construct (GType object_type, gint64 object_id);
-void data_source_internal_subscribe (DataSource* self, DataView* view);
+DataObject* data_object_construct (GType object_type,
+                                   gint64 object_id);
+void data_source_internal_subscribe (DataSource* self,
+                                     DataView* view);
 static gchar* data_view_real_get_name (DataObject* base);
 gchar* data_object_get_name (DataObject* self);
 static gchar* data_view_real_to_string (DataObject* base);
 gchar* data_object_to_string (DataObject* self);
 DataSource* data_view_get_source (DataView* self);
 gboolean data_view_is_selected (DataView* self);
-void data_view_internal_set_selected (DataView* self, gboolean selected);
+void data_view_internal_set_selected (DataView* self,
+                                      gboolean selected);
 gboolean data_view_internal_toggle (DataView* self);
 gboolean data_view_is_visible (DataView* self);
-void data_view_internal_set_visible (DataView* self, gboolean visible);
+void data_view_internal_set_visible (DataView* self,
+                                     gboolean visible);
 void data_view_notify_view_altered (DataView* self);
 static void data_view_real_notify_view_altered (DataView* self);
 GType view_collection_get_type (void) G_GNUC_CONST;
 DataCollection* data_object_get_membership (DataObject* self);
 gboolean data_collection_are_notifications_frozen (DataCollection* self);
-void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view);
+void view_collection_internal_notify_view_altered (ViewCollection* self,
+                                                   DataView* view);
 void data_view_notify_geometry_altered (DataView* self);
 static void data_view_real_notify_geometry_altered (DataView* self);
-void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view);
-void data_view_notify_unsubscribed (DataView* self, DataSource* source);
-static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source);
-static void data_view_real_state_changed (DataView* self, gboolean selected);
-static void data_view_real_visibility_changed (DataView* self, gboolean visible);
+void view_collection_internal_notify_geometry_altered (ViewCollection* self,
+                                                       DataView* view);
+void data_view_notify_unsubscribed (DataView* self,
+                                    DataSource* source);
+static void data_view_real_notify_unsubscribed (DataView* self,
+                                         DataSource* source);
+static void data_view_real_state_changed (DataView* self,
+                                   gboolean selected);
+static void data_view_real_visibility_changed (DataView* self,
+                                        gboolean visible);
 static void data_view_real_view_altered (DataView* self);
 static void data_view_real_geometry_altered (DataView* self);
-static void data_view_real_unsubscribed (DataView* self, DataSource* source);
+static void data_view_real_unsubscribed (DataView* self,
+                                  DataSource* source);
 static void data_view_finalize (GObject * obj);
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 191 "DataView.c"
+#line 221 "DataView.c"
 }
 
 
-DataView* data_view_construct (GType object_type, DataSource* source) {
+DataView*
+data_view_construct (GType object_type,
+                     DataSource* source)
+{
 	DataView * self = NULL;
 	DataSource* _tmp0_;
-	DataSource* _tmp1_;
-	DataSource* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = (DataView*) data_object_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID);
 #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp0_ = source;
-#line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (source);
 #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_g_object_unref0 (self->priv->source);
 #line 33 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	self->priv->source = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp2_ = source;
+	self->priv->source = _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	data_source_internal_subscribe (_tmp2_, self);
+	data_source_internal_subscribe (source, self);
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return self;
-#line 218 "DataView.c"
+#line 245 "DataView.c"
 }
 
 
-DataView* data_view_new (DataSource* source) {
+DataView*
+data_view_new (DataSource* source)
+{
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return data_view_construct (TYPE_DATA_VIEW, source);
-#line 225 "DataView.c"
+#line 254 "DataView.c"
 }
 
 
-static gchar* data_view_real_get_name (DataObject* base) {
+static gchar*
+data_view_real_get_name (DataObject* base)
+{
 	DataView * self;
 	gchar* result = NULL;
 	DataSource* _tmp0_;
@@ -251,11 +282,13 @@ static gchar* data_view_real_get_name (DataObject* base) {
 	result = _tmp4_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 255 "DataView.c"
+#line 286 "DataView.c"
 }
 
 
-static gchar* data_view_real_to_string (DataObject* base) {
+static gchar*
+data_view_real_to_string (DataObject* base)
+{
 	DataView * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -289,11 +322,13 @@ static gchar* data_view_real_to_string (DataObject* base) {
 	result = _tmp6_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 293 "DataView.c"
+#line 326 "DataView.c"
 }
 
 
-DataSource* data_view_get_source (DataView* self) {
+DataSource*
+data_view_get_source (DataView* self)
+{
 	DataSource* result = NULL;
 	DataSource* _tmp0_;
 	DataSource* _tmp1_;
@@ -307,11 +342,13 @@ DataSource* data_view_get_source (DataView* self) {
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 311 "DataView.c"
+#line 346 "DataView.c"
 }
 
 
-gboolean data_view_is_selected (DataView* self) {
+gboolean
+data_view_is_selected (DataView* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -322,40 +359,36 @@ gboolean data_view_is_selected (DataView* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 326 "DataView.c"
+#line 363 "DataView.c"
 }
 
 
-void data_view_internal_set_selected (DataView* self, gboolean selected) {
+void
+data_view_internal_set_selected (DataView* self,
+                                 gboolean selected)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 64 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->selected;
 #line 65 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp1_ = selected;
-#line 65 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (_tmp0_ == selected) {
 #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 345 "DataView.c"
+#line 380 "DataView.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp2_ = selected;
-#line 68 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	self->priv->selected = _tmp2_;
+	self->priv->selected = selected;
 #line 69 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp3_ = selected;
-#line 69 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_);
-#line 355 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, selected);
+#line 386 "DataView.c"
 }
 
 
-gboolean data_view_internal_toggle (DataView* self) {
+gboolean
+data_view_internal_toggle (DataView* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
@@ -376,11 +409,13 @@ gboolean data_view_internal_toggle (DataView* self) {
 	result = _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 380 "DataView.c"
+#line 413 "DataView.c"
 }
 
 
-gboolean data_view_is_visible (DataView* self) {
+gboolean
+data_view_is_visible (DataView* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -391,40 +426,36 @@ gboolean data_view_is_visible (DataView* self) {
 	result = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 395 "DataView.c"
+#line 430 "DataView.c"
 }
 
 
-void data_view_internal_set_visible (DataView* self, gboolean visible) {
+void
+data_view_internal_set_visible (DataView* self,
+                                gboolean visible)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 85 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->visible;
 #line 86 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp1_ = visible;
-#line 86 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (_tmp0_ == visible) {
 #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 414 "DataView.c"
+#line 447 "DataView.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp2_ = visible;
-#line 89 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	self->priv->visible = _tmp2_;
+	self->priv->visible = visible;
 #line 90 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp3_ = visible;
-#line 90 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
-#line 424 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, visible);
+#line 453 "DataView.c"
 }
 
 
-static void data_view_real_notify_view_altered (DataView* self) {
+static void
+data_view_real_notify_view_altered (DataView* self)
+{
 	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
 	DataCollection* _tmp1_;
@@ -436,7 +467,7 @@ static void data_view_real_notify_view_altered (DataView* self) {
 	if (!_tmp0_) {
 #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 440 "DataView.c"
+#line 471 "DataView.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -446,7 +477,7 @@ static void data_view_real_notify_view_altered (DataView* self) {
 	if (_tmp2_ == NULL) {
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 450 "DataView.c"
+#line 481 "DataView.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -454,46 +485,47 @@ static void data_view_real_notify_view_altered (DataView* self) {
 	_tmp3_ = vc;
 #line 99 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (_tmp3_ != NULL) {
-#line 458 "DataView.c"
+#line 489 "DataView.c"
 		ViewCollection* _tmp4_;
-		gboolean _tmp5_;
-		ViewCollection* _tmp6_;
+		ViewCollection* _tmp5_;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		_tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection));
-#line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		if (!_tmp5_) {
+		if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) {
 #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala"
 			g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
-#line 470 "DataView.c"
+#line 498 "DataView.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		_tmp6_ = vc;
+		_tmp5_ = vc;
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		view_collection_internal_notify_view_altered (_tmp6_, self);
-#line 476 "DataView.c"
+		view_collection_internal_notify_view_altered (_tmp5_, self);
+#line 504 "DataView.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
-#line 480 "DataView.c"
+#line 508 "DataView.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 484 "DataView.c"
+#line 512 "DataView.c"
 }
 
 
-void data_view_notify_view_altered (DataView* self) {
+void
+data_view_notify_view_altered (DataView* self)
+{
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_view_altered (self);
-#line 493 "DataView.c"
+#line 523 "DataView.c"
 }
 
 
-static void data_view_real_notify_geometry_altered (DataView* self) {
+static void
+data_view_real_notify_geometry_altered (DataView* self)
+{
 	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
 	DataCollection* _tmp1_;
@@ -505,7 +537,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 	if (!_tmp0_) {
 #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 509 "DataView.c"
+#line 541 "DataView.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -515,7 +547,7 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 	if (_tmp2_ == NULL) {
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 519 "DataView.c"
+#line 551 "DataView.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -523,90 +555,107 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 	_tmp3_ = vc;
 #line 116 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (_tmp3_ != NULL) {
-#line 527 "DataView.c"
+#line 559 "DataView.c"
 		ViewCollection* _tmp4_;
-		gboolean _tmp5_;
-		ViewCollection* _tmp6_;
+		ViewCollection* _tmp5_;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		_tmp5_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection));
-#line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		if (!_tmp5_) {
+		if (!data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection))) {
 #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala"
 			g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
-#line 539 "DataView.c"
+#line 568 "DataView.c"
 		}
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		_tmp6_ = vc;
+		_tmp5_ = vc;
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		view_collection_internal_notify_geometry_altered (_tmp6_, self);
-#line 545 "DataView.c"
+		view_collection_internal_notify_geometry_altered (_tmp5_, self);
+#line 574 "DataView.c"
 	} else {
 #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
-#line 549 "DataView.c"
+#line 578 "DataView.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 553 "DataView.c"
+#line 582 "DataView.c"
 }
 
 
-void data_view_notify_geometry_altered (DataView* self) {
+void
+data_view_notify_geometry_altered (DataView* self)
+{
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_geometry_altered (self);
-#line 562 "DataView.c"
+#line 593 "DataView.c"
 }
 
 
-static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) {
-	DataSource* _tmp0_;
+static void
+data_view_real_notify_unsubscribed (DataView* self,
+                                    DataSource* source)
+{
 #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 129 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	_tmp0_ = source;
-#line 129 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_);
-#line 574 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, source);
+#line 605 "DataView.c"
 }
 
 
-void data_view_notify_unsubscribed (DataView* self, DataSource* source) {
+void
+data_view_notify_unsubscribed (DataView* self,
+                               DataSource* source)
+{
 #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_VIEW (self));
 #line 128 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	DATA_VIEW_GET_CLASS (self)->notify_unsubscribed (self, source);
-#line 583 "DataView.c"
+#line 617 "DataView.c"
 }
 
 
-static void data_view_real_state_changed (DataView* self, gboolean selected) {
+static void
+data_view_real_state_changed (DataView* self,
+                              gboolean selected)
+{
 }
 
 
-static void data_view_real_visibility_changed (DataView* self, gboolean visible) {
+static void
+data_view_real_visibility_changed (DataView* self,
+                                   gboolean visible)
+{
 }
 
 
-static void data_view_real_view_altered (DataView* self) {
+static void
+data_view_real_view_altered (DataView* self)
+{
 }
 
 
-static void data_view_real_geometry_altered (DataView* self) {
+static void
+data_view_real_geometry_altered (DataView* self)
+{
 }
 
 
-static void data_view_real_unsubscribed (DataView* self, DataSource* source) {
+static void
+data_view_real_unsubscribed (DataView* self,
+                             DataSource* source)
+{
 #line 29 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 606 "DataView.c"
+#line 653 "DataView.c"
 }
 
 
-static void data_view_class_init (DataViewClass * klass) {
+static void
+data_view_class_init (DataViewClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	data_view_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -643,22 +692,26 @@ static void data_view_class_init (DataViewClass * klass) {
 	data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL] = g_signal_new ("geometry-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, geometry_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL] = g_signal_new ("unsubscribed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, unsubscribed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_DATA_SOURCE);
-#line 647 "DataView.c"
+#line 696 "DataView.c"
 }
 
 
-static void data_view_instance_init (DataView * self) {
+static void
+data_view_instance_init (DataView * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self->priv = DATA_VIEW_GET_PRIVATE (self);
 #line 9 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self->priv->selected = FALSE;
 #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self->priv->visible = TRUE;
-#line 658 "DataView.c"
+#line 709 "DataView.c"
 }
 
 
-static void data_view_finalize (GObject * obj) {
+static void
+data_view_finalize (GObject * obj)
+{
 	DataView * self;
 	DataSource* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -671,11 +724,13 @@ static void data_view_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->source);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	G_OBJECT_CLASS (data_view_parent_class)->finalize (obj);
-#line 675 "DataView.c"
+#line 728 "DataView.c"
 }
 
 
-GType data_view_get_type (void) {
+GType
+data_view_get_type (void)
+{
 	static volatile gsize data_view_type_id__volatile = 0;
 	if (g_once_init_enter (&data_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DataViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataView), 0, (GInstanceInitFunc) data_view_instance_init, NULL };