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

1 files changed, 189 insertions, 114 deletions

diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index 7ad6acd..407d555 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.36.6, the Vala compiler
+/* DirectView.c generated by valac 0.40.4, the Vala compiler
  * generated from DirectView.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>
@@ -77,6 +78,11 @@ typedef struct _DataSourceClass DataSourceClass;
 typedef struct _DirectView DirectView;
 typedef struct _DirectViewClass DirectViewClass;
 typedef struct _DirectViewPrivate DirectViewPrivate;
+enum  {
+	DIRECT_VIEW_0_PROPERTY,
+	DIRECT_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* direct_view_properties[DIRECT_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))
 
@@ -417,34 +423,45 @@ static gpointer direct_view_collection_direct_view_manager_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;
 GType direct_view_get_type (void) G_GNUC_CONST;
 #define DIRECT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_VIEW, DirectViewPrivate))
-enum  {
-	DIRECT_VIEW_DUMMY_PROPERTY
-};
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType direct_photo_get_type (void) G_GNUC_CONST;
 DirectView* direct_view_new (DirectPhoto* source);
-DirectView* direct_view_construct (GType object_type, DirectPhoto* source);
+DirectView* direct_view_construct (GType object_type,
+                                   DirectPhoto* source);
 DataView* data_view_new (DataSource* source);
-DataView* data_view_construct (GType object_type, DataSource* source);
+DataView* data_view_construct (GType object_type,
+                               DataSource* source);
 GFile* media_source_get_file (MediaSource* self);
 GFile* direct_view_get_file (DirectView* self);
 gchar* direct_view_get_collate_key (DirectView* self);
@@ -453,90 +470,120 @@ GType marker_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 GType direct_view_collection_get_type (void) G_GNUC_CONST;
-enum  {
-	DIRECT_VIEW_COLLECTION_DUMMY_PROPERTY
-};
 DirectViewCollection* direct_view_collection_new (void);
 DirectViewCollection* direct_view_collection_construct (GType object_type);
 ViewCollection* view_collection_new (const gchar* name);
-ViewCollection* view_collection_construct (GType object_type, const gchar* name);
-void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-static gint64 direct_view_collection_filename_comparator (void* a, void* b);
-static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self);
+ViewCollection* view_collection_construct (GType object_type,
+                                           const gchar* name);
+void data_collection_set_comparator (DataCollection* self,
+                                     Comparator comparator,
+                                     void* comparator_target,
+                                     ComparatorPredicate predicate,
+                                     void* predicate_target);
+static gint64 direct_view_collection_filename_comparator (void* a,
+                                                   void* b);
+static gint64 _direct_view_collection_filename_comparator_comparator (void* a,
+                                                               void* b,
+                                                               gpointer self);
 GType source_collection_get_type (void) G_GNUC_CONST;
 gpointer view_manager_ref (gpointer instance);
 void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_view_manager (GValue* value,
+                             gpointer v_object);
+void value_take_view_manager (GValue* value,
+                              gpointer v_object);
 gpointer value_get_view_manager (const GValue* value);
 GType view_manager_get_type (void) G_GNUC_CONST;
 gpointer view_collection_monitor_ref (gpointer instance);
 void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+                                        gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+                                         gpointer v_object);
 gpointer view_collection_value_get_monitor (const GValue* value);
 GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType direct_photo_source_collection_get_type (void) G_GNUC_CONST;
 static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void);
 static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type);
 static GType direct_view_collection_direct_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-enum  {
-	DIRECT_VIEW_COLLECTION_DIRECT_VIEW_MANAGER_DUMMY_PROPERTY
-};
-static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source);
+static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base,
+                                                                       DataSource* source);
 ViewManager* view_manager_construct (GType object_type);
 
 
-DirectView* direct_view_construct (GType object_type, DirectPhoto* source) {
+DirectView*
+direct_view_construct (GType object_type,
+                       DirectPhoto* source)
+{
 	DirectView * self = NULL;
-	DirectPhoto* _tmp0_;
-	DirectPhoto* _tmp1_;
-	GFile* _tmp2_;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
-#line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp1_ = source;
+	self = (DirectView*) data_view_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_SOURCE, DataSource));
 #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
 #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	_g_object_unref0 (self->priv->file);
 #line 14 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	self->priv->file = _tmp2_;
+	self->priv->file = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return self;
-#line 522 "DirectView.c"
+#line 563 "DirectView.c"
 }
 
 
-DirectView* direct_view_new (DirectPhoto* source) {
+DirectView*
+direct_view_new (DirectPhoto* source)
+{
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return direct_view_construct (TYPE_DIRECT_VIEW, source);
-#line 529 "DirectView.c"
+#line 572 "DirectView.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 536 "DirectView.c"
+#line 581 "DirectView.c"
 }
 
 
-GFile* direct_view_get_file (DirectView* self) {
+GFile*
+direct_view_get_file (DirectView* self)
+{
 	GFile* result = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
@@ -550,11 +597,13 @@ GFile* direct_view_get_file (DirectView* self) {
 	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return result;
-#line 554 "DirectView.c"
+#line 601 "DirectView.c"
 }
 
 
-gchar* direct_view_get_collate_key (DirectView* self) {
+gchar*
+direct_view_get_collate_key (DirectView* self)
+{
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	const gchar* _tmp5_;
@@ -565,7 +614,7 @@ gchar* direct_view_get_collate_key (DirectView* self) {
 	_tmp0_ = self->priv->collate_key;
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	if (_tmp0_ == NULL) {
-#line 569 "DirectView.c"
+#line 618 "DirectView.c"
 		GFile* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
@@ -584,7 +633,7 @@ gchar* direct_view_get_collate_key (DirectView* self) {
 		self->priv->collate_key = _tmp4_;
 #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 		_g_free0 (_tmp3_);
-#line 588 "DirectView.c"
+#line 637 "DirectView.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	_tmp5_ = self->priv->collate_key;
@@ -594,31 +643,37 @@ gchar* direct_view_get_collate_key (DirectView* self) {
 	result = _tmp6_;
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return result;
-#line 598 "DirectView.c"
+#line 647 "DirectView.c"
 }
 
 
-static void direct_view_class_init (DirectViewClass * klass) {
+static void
+direct_view_class_init (DirectViewClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	direct_view_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_type_class_add_private (klass, sizeof (DirectViewPrivate));
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_view_finalize;
-#line 609 "DirectView.c"
+#line 660 "DirectView.c"
 }
 
 
-static void direct_view_instance_init (DirectView * self) {
+static void
+direct_view_instance_init (DirectView * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self->priv = DIRECT_VIEW_GET_PRIVATE (self);
 #line 9 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self->priv->collate_key = NULL;
-#line 618 "DirectView.c"
+#line 671 "DirectView.c"
 }
 
 
-static void direct_view_finalize (GObject * obj) {
+static void
+direct_view_finalize (GObject * obj)
+{
 	DirectView * self;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView);
@@ -628,11 +683,13 @@ static void direct_view_finalize (GObject * obj) {
 	_g_free0 (self->priv->collate_key);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	G_OBJECT_CLASS (direct_view_parent_class)->finalize (obj);
-#line 632 "DirectView.c"
+#line 687 "DirectView.c"
 }
 
 
-GType direct_view_get_type (void) {
+GType
+direct_view_get_type (void)
+{
 	static volatile gsize direct_view_type_id__volatile = 0;
 	if (g_once_init_enter (&direct_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DirectViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectView), 0, (GInstanceInitFunc) direct_view_instance_init, NULL };
@@ -644,16 +701,22 @@ GType direct_view_get_type (void) {
 }
 
 
-static gint64 _direct_view_collection_filename_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_direct_view_collection_filename_comparator_comparator (void* a,
+                                                        void* b,
+                                                        gpointer self)
+{
 	gint64 result;
 	result = direct_view_collection_filename_comparator (a, b);
 #line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return result;
-#line 653 "DirectView.c"
+#line 714 "DirectView.c"
 }
 
 
-DirectViewCollection* direct_view_collection_construct (GType object_type) {
+DirectViewCollection*
+direct_view_collection_construct (GType object_type)
+{
 	DirectViewCollection* self = NULL;
 	DirectPhotoSourceCollection* _tmp0_;
 	DirectViewCollectionDirectViewManager* _tmp1_;
@@ -680,116 +743,122 @@ DirectViewCollection* direct_view_collection_construct (GType object_type) {
 	_view_manager_unref0 (_tmp2_);
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return self;
-#line 684 "DirectView.c"
+#line 747 "DirectView.c"
 }
 
 
-DirectViewCollection* direct_view_collection_new (void) {
+DirectViewCollection*
+direct_view_collection_new (void)
+{
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return direct_view_collection_construct (TYPE_DIRECT_VIEW_COLLECTION);
-#line 691 "DirectView.c"
+#line 756 "DirectView.c"
 }
 
 
-static gint64 direct_view_collection_filename_comparator (void* a, void* b) {
+static gint64
+direct_view_collection_filename_comparator (void* a,
+                                            void* b)
+{
 	gint64 result = 0LL;
 	DirectView* aview = NULL;
-	void* _tmp0_;
 	DirectView* bview = NULL;
-	void* _tmp1_;
-	GCompareFunc _tmp2_;
+	GCompareFunc _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
+	gint64 _tmp5_;
 #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp0_ = a;
-#line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	aview = (DirectView*) _tmp0_;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp1_ = b;
+	aview = (DirectView*) a;
 #line 45 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	bview = (DirectView*) _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp2_ = g_strcmp0;
+	bview = (DirectView*) b;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView));
+	_tmp0_ = g_strcmp0;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp4_ = _tmp3_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp5_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView));
+	_tmp1_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (aview, TYPE_DIRECT_VIEW, DirectView));
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp6_ = _tmp5_;
+	_tmp2_ = _tmp1_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp7_ = _tmp2_ (_tmp4_, _tmp6_);
+	_tmp3_ = direct_view_get_collate_key (G_TYPE_CHECK_INSTANCE_CAST (bview, TYPE_DIRECT_VIEW, DirectView));
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp8_ = (gint64) _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_g_free0 (_tmp6_);
+	_tmp5_ = (gint64) _tmp0_ (_tmp2_, _tmp4_);
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	_g_free0 (_tmp4_);
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	result = _tmp8_;
+	_g_free0 (_tmp2_);
+#line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
+	result = _tmp5_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return result;
-#line 738 "DirectView.c"
+#line 797 "DirectView.c"
 }
 
 
-static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) {
+static DataView*
+direct_view_collection_direct_view_manager_real_create_view (ViewManager* base,
+                                                             DataSource* source)
+{
 	DirectViewCollectionDirectViewManager * self;
 	DataView* result = NULL;
-	DataSource* _tmp0_;
-	DirectView* _tmp1_;
+	DirectView* _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager);
 #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp0_ = source;
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	_tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
+	_tmp0_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto));
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return result;
-#line 759 "DirectView.c"
+#line 818 "DirectView.c"
 }
 
 
-static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_construct (GType object_type) {
+static DirectViewCollectionDirectViewManager*
+direct_view_collection_direct_view_manager_construct (GType object_type)
+{
 	DirectViewCollectionDirectViewManager* self = NULL;
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	self = (DirectViewCollectionDirectViewManager*) view_manager_construct (object_type);
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return self;
-#line 769 "DirectView.c"
+#line 830 "DirectView.c"
 }
 
 
-static DirectViewCollectionDirectViewManager* direct_view_collection_direct_view_manager_new (void) {
+static DirectViewCollectionDirectViewManager*
+direct_view_collection_direct_view_manager_new (void)
+{
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	return direct_view_collection_direct_view_manager_construct (DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER);
-#line 776 "DirectView.c"
+#line 839 "DirectView.c"
 }
 
 
-static void direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass) {
+static void
+direct_view_collection_direct_view_manager_class_init (DirectViewCollectionDirectViewManagerClass * klass)
+{
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view;
-#line 785 "DirectView.c"
+#line 850 "DirectView.c"
 }
 
 
-static void direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self) {
+static void
+direct_view_collection_direct_view_manager_instance_init (DirectViewCollectionDirectViewManager * self)
+{
 }
 
 
-static GType direct_view_collection_direct_view_manager_get_type (void) {
+static GType
+direct_view_collection_direct_view_manager_get_type (void)
+{
 	static volatile gsize direct_view_collection_direct_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&direct_view_collection_direct_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionDirectViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_direct_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollectionDirectViewManager), 0, (GInstanceInitFunc) direct_view_collection_direct_view_manager_instance_init, NULL };
@@ -801,18 +870,24 @@ static GType direct_view_collection_direct_view_manager_get_type (void) {
 }
 
 
-static void direct_view_collection_class_init (DirectViewCollectionClass * klass) {
+static void
+direct_view_collection_class_init (DirectViewCollectionClass * klass)
+{
 #line 29 "/home/jens/Source/shotwell/src/direct/DirectView.vala"
 	direct_view_collection_parent_class = g_type_class_peek_parent (klass);
-#line 808 "DirectView.c"
+#line 879 "DirectView.c"
 }
 
 
-static void direct_view_collection_instance_init (DirectViewCollection * self) {
+static void
+direct_view_collection_instance_init (DirectViewCollection * self)
+{
 }
 
 
-GType direct_view_collection_get_type (void) {
+GType
+direct_view_collection_get_type (void)
+{
 	static volatile gsize direct_view_collection_type_id__volatile = 0;
 	if (g_once_init_enter (&direct_view_collection_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (DirectViewCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_view_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectViewCollection), 0, (GInstanceInitFunc) direct_view_collection_instance_init, NULL };