Merge branch 'feature/upstream' into develop

1 files changed, 111 insertions, 102 deletions

diff --git a/src/core/DataView.c b/src/core/DataView.c
index b25fa1e..004d364 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.34.7, the Vala compiler
+/* DataView.c generated by valac 0.36.6, the Vala compiler
  * generated from DataView.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -77,6 +77,15 @@ typedef struct _DataSourceClass DataSourceClass;
 typedef struct _ViewCollection ViewCollection;
 typedef struct _ViewCollectionClass ViewCollectionClass;
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
+enum  {
+	DATA_VIEW_STATE_CHANGED_SIGNAL,
+	DATA_VIEW_VISIBILITY_CHANGED_SIGNAL,
+	DATA_VIEW_VIEW_ALTERED_SIGNAL,
+	DATA_VIEW_GEOMETRY_ALTERED_SIGNAL,
+	DATA_VIEW_UNSUBSCRIBED_SIGNAL,
+	DATA_VIEW_LAST_SIGNAL
+};
+static guint data_view_signals[DATA_VIEW_LAST_SIGNAL] = {0};
 
 struct _DataObject {
 	GObject parent_instance;
@@ -172,21 +181,21 @@ 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_finalize (GObject* obj);
+static void data_view_finalize (GObject * obj);
 
 
 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 182 "DataView.c"
+#line 191 "DataView.c"
 }
 
 
 DataView* data_view_construct (GType object_type, DataSource* source) {
 	DataView * self = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	DataSource* _tmp2_ = 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"
@@ -205,25 +214,25 @@ DataView* data_view_construct (GType object_type, DataSource* source) {
 	data_source_internal_subscribe (_tmp2_, self);
 #line 32 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return self;
-#line 209 "DataView.c"
+#line 218 "DataView.c"
 }
 
 
 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 216 "DataView.c"
+#line 225 "DataView.c"
 }
 
 
 static gchar* data_view_real_get_name (DataObject* base) {
 	DataView * self;
 	gchar* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DataSource* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 47 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView);
 #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -242,20 +251,20 @@ static gchar* data_view_real_get_name (DataObject* base) {
 	result = _tmp4_;
 #line 48 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 246 "DataView.c"
+#line 255 "DataView.c"
 }
 
 
 static gchar* data_view_real_to_string (DataObject* base) {
 	DataView * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	DataSource* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	DataSource* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 51 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DATA_VIEW, DataView);
 #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -280,14 +289,14 @@ static gchar* data_view_real_to_string (DataObject* base) {
 	result = _tmp6_;
 #line 52 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 284 "DataView.c"
+#line 293 "DataView.c"
 }
 
 
 DataSource* data_view_get_source (DataView* self) {
 	DataSource* result = NULL;
-	DataSource* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
+	DataSource* _tmp0_;
+	DataSource* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), NULL);
 #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -298,13 +307,13 @@ DataSource* data_view_get_source (DataView* self) {
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 302 "DataView.c"
+#line 311 "DataView.c"
 }
 
 
 gboolean data_view_is_selected (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -313,15 +322,15 @@ gboolean data_view_is_selected (DataView* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 317 "DataView.c"
+#line 326 "DataView.c"
 }
 
 
 void data_view_internal_set_selected (DataView* self, gboolean selected) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	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"
@@ -332,7 +341,7 @@ void data_view_internal_set_selected (DataView* self, gboolean selected) {
 	if (_tmp0_ == _tmp1_) {
 #line 66 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 336 "DataView.c"
+#line 345 "DataView.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = selected;
@@ -341,16 +350,16 @@ void data_view_internal_set_selected (DataView* self, gboolean 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_by_name (self, "state-changed", _tmp3_);
-#line 346 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp3_);
+#line 355 "DataView.c"
 }
 
 
 gboolean data_view_internal_toggle (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 74 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -360,20 +369,20 @@ gboolean data_view_internal_toggle (DataView* self) {
 #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp1_ = self->priv->selected;
 #line 75 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_emit_by_name (self, "state-changed", _tmp1_);
+	g_signal_emit (self, data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL], 0, _tmp1_);
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = self->priv->selected;
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	result = _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 371 "DataView.c"
+#line 380 "DataView.c"
 }
 
 
 gboolean data_view_is_visible (DataView* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (self), FALSE);
 #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -382,15 +391,15 @@ gboolean data_view_is_visible (DataView* self) {
 	result = _tmp0_;
 #line 81 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	return result;
-#line 386 "DataView.c"
+#line 395 "DataView.c"
 }
 
 
 void data_view_internal_set_visible (DataView* self, gboolean visible) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	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"
@@ -401,7 +410,7 @@ void data_view_internal_set_visible (DataView* self, gboolean visible) {
 	if (_tmp0_ == _tmp1_) {
 #line 87 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 405 "DataView.c"
+#line 414 "DataView.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp2_ = visible;
@@ -410,24 +419,24 @@ void data_view_internal_set_visible (DataView* self, gboolean 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_by_name (self, "visibility-changed", _tmp3_);
-#line 415 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
+#line 424 "DataView.c"
 }
 
 
 static void data_view_real_notify_view_altered (DataView* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
-	DataCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
+	DataCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->visible;
 #line 95 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (!_tmp0_) {
 #line 96 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 431 "DataView.c"
+#line 440 "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));
@@ -437,7 +446,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 441 "DataView.c"
+#line 450 "DataView.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -445,10 +454,10 @@ 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 449 "DataView.c"
-		ViewCollection* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		ViewCollection* _tmp6_ = NULL;
+#line 458 "DataView.c"
+		ViewCollection* _tmp4_;
+		gboolean _tmp5_;
+		ViewCollection* _tmp6_;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -456,22 +465,22 @@ static void data_view_real_notify_view_altered (DataView* self) {
 #line 100 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		if (!_tmp5_) {
 #line 101 "/home/jens/Source/shotwell/src/core/DataView.vala"
-			g_signal_emit_by_name (self, "view-altered");
-#line 461 "DataView.c"
+			g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
+#line 470 "DataView.c"
 		}
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp6_ = vc;
 #line 104 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		view_collection_internal_notify_view_altered (_tmp6_, self);
-#line 467 "DataView.c"
+#line 476 "DataView.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		g_signal_emit_by_name (self, "view-altered");
-#line 471 "DataView.c"
+		g_signal_emit (self, data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL], 0);
+#line 480 "DataView.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 475 "DataView.c"
+#line 484 "DataView.c"
 }
 
 
@@ -480,23 +489,23 @@ void data_view_notify_view_altered (DataView* self) {
 	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 484 "DataView.c"
+#line 493 "DataView.c"
 }
 
 
 static void data_view_real_notify_geometry_altered (DataView* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	ViewCollection* vc = NULL;
-	DataCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
+	DataCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_tmp0_ = self->priv->visible;
 #line 112 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	if (!_tmp0_) {
 #line 113 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		return;
-#line 500 "DataView.c"
+#line 509 "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));
@@ -506,7 +515,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 510 "DataView.c"
+#line 519 "DataView.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	vc = _tmp2_;
@@ -514,10 +523,10 @@ 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 518 "DataView.c"
-		ViewCollection* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		ViewCollection* _tmp6_ = NULL;
+#line 527 "DataView.c"
+		ViewCollection* _tmp4_;
+		gboolean _tmp5_;
+		ViewCollection* _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp4_ = vc;
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -525,22 +534,22 @@ static void data_view_real_notify_geometry_altered (DataView* self) {
 #line 117 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		if (!_tmp5_) {
 #line 118 "/home/jens/Source/shotwell/src/core/DataView.vala"
-			g_signal_emit_by_name (self, "geometry-altered");
-#line 530 "DataView.c"
+			g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
+#line 539 "DataView.c"
 		}
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		_tmp6_ = vc;
 #line 121 "/home/jens/Source/shotwell/src/core/DataView.vala"
 		view_collection_internal_notify_geometry_altered (_tmp6_, self);
-#line 536 "DataView.c"
+#line 545 "DataView.c"
 	} else {
 #line 123 "/home/jens/Source/shotwell/src/core/DataView.vala"
-		g_signal_emit_by_name (self, "geometry-altered");
-#line 540 "DataView.c"
+		g_signal_emit (self, data_view_signals[DATA_VIEW_GEOMETRY_ALTERED_SIGNAL], 0);
+#line 549 "DataView.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	_data_collection_unref0 (vc);
-#line 544 "DataView.c"
+#line 553 "DataView.c"
 }
 
 
@@ -549,19 +558,19 @@ void data_view_notify_geometry_altered (DataView* self) {
 	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 553 "DataView.c"
+#line 562 "DataView.c"
 }
 
 
 static void data_view_real_notify_unsubscribed (DataView* self, DataSource* source) {
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #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_by_name (self, "unsubscribed", _tmp0_);
-#line 565 "DataView.c"
+	g_signal_emit (self, data_view_signals[DATA_VIEW_UNSUBSCRIBED_SIGNAL], 0, _tmp0_);
+#line 574 "DataView.c"
 }
 
 
@@ -570,7 +579,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source) {
 	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 574 "DataView.c"
+#line 583 "DataView.c"
 }
 
 
@@ -593,7 +602,7 @@ static void data_view_real_geometry_altered (DataView* self) {
 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 597 "DataView.c"
+#line 606 "DataView.c"
 }
 
 
@@ -603,15 +612,15 @@ static void data_view_class_init (DataViewClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	g_type_class_add_private (klass, sizeof (DataViewPrivate));
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) data_view_real_get_name;
+	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) data_view_real_get_name;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) data_view_real_to_string;
+	((DataObjectClass *) klass)->to_string = (gchar* (*) (DataObject *)) data_view_real_to_string;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_view_altered = (void (*)(DataView*)) data_view_real_notify_view_altered;
+	((DataViewClass *) klass)->notify_view_altered = (void (*) (DataView *)) data_view_real_notify_view_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_geometry_altered = (void (*)(DataView*)) data_view_real_notify_geometry_altered;
+	((DataViewClass *) klass)->notify_geometry_altered = (void (*) (DataView *)) data_view_real_notify_geometry_altered;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	((DataViewClass *) klass)->notify_unsubscribed = (void (*)(DataView*, DataSource*)) data_view_real_notify_unsubscribed;
+	((DataViewClass *) klass)->notify_unsubscribed = (void (*) (DataView *, DataSource*)) data_view_real_notify_unsubscribed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	((DataViewClass *) klass)->state_changed = data_view_real_state_changed;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -625,16 +634,16 @@ static void data_view_class_init (DataViewClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_view_finalize;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("state_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	data_view_signals[DATA_VIEW_STATE_CHANGED_SIGNAL] = g_signal_new ("state-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("visibility_changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+	data_view_signals[DATA_VIEW_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	g_signal_new ("view_altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	data_view_signals[DATA_VIEW_VIEW_ALTERED_SIGNAL] = g_signal_new ("view-altered", TYPE_DATA_VIEW, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DataViewClass, view_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
-	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);
+	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"
-	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 638 "DataView.c"
+	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"
 }
 
 
@@ -645,13 +654,13 @@ static void data_view_instance_init (DataView * self) {
 	self->priv->selected = FALSE;
 #line 10 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self->priv->visible = TRUE;
-#line 649 "DataView.c"
+#line 658 "DataView.c"
 }
 
 
-static void data_view_finalize (GObject* obj) {
+static void data_view_finalize (GObject * obj) {
 	DataView * self;
-	DataSource* _tmp0_ = NULL;
+	DataSource* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/core/DataView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DATA_VIEW, DataView);
 #line 44 "/home/jens/Source/shotwell/src/core/DataView.vala"
@@ -662,7 +671,7 @@ 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 666 "DataView.c"
+#line 675 "DataView.c"
 }