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

1 files changed, 20 insertions, 15 deletions

diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 1031b9a..e9b9492 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.36.6, the Vala compiler
+/* _DirectInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _DirectInternals.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9,6 +9,7 @@
  * Auto-generated file.  Do not modify!
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -35,7 +36,9 @@ void slideshow_terminate_entry (void);
 void core_terminate_entry (void);
 
 
-void direct_init_entry (GError** error) {
+void
+direct_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
@@ -46,7 +49,7 @@ void direct_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 50 "_DirectInternals.c"
+#line 53 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -56,7 +59,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 60 "_DirectInternals.c"
+#line 63 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	db_init_entry (&_inner_error_);
@@ -66,7 +69,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 70 "_DirectInternals.c"
+#line 73 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	util_init_entry (&_inner_error_);
@@ -76,7 +79,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 80 "_DirectInternals.c"
+#line 83 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -86,7 +89,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 90 "_DirectInternals.c"
+#line 93 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	slideshow_init_entry (&_inner_error_);
@@ -96,7 +99,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 100 "_DirectInternals.c"
+#line 103 "_DirectInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	core_init_entry (&_inner_error_);
@@ -106,7 +109,7 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 110 "_DirectInternals.c"
+#line 113 "_DirectInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	direct_init (&_inner_error_);
@@ -116,12 +119,14 @@ void direct_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 120 "_DirectInternals.c"
+#line 123 "_DirectInternals.c"
 	}
 }
 
 
-void direct_terminate_entry (void) {
+void
+direct_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
@@ -130,7 +135,7 @@ void direct_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		_tmp0_ = TRUE;
-#line 134 "_DirectInternals.c"
+#line 139 "_DirectInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -142,13 +147,13 @@ void direct_terminate_entry (void) {
 		_tmp3_ = direct__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 146 "_DirectInternals.c"
+#line 151 "_DirectInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 		return;
-#line 152 "_DirectInternals.c"
+#line 157 "_DirectInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	direct_terminate ();
@@ -164,7 +169,7 @@ void direct_terminate_entry (void) {
 	slideshow_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_DirectInternals.vala"
 	core_terminate_entry ();
-#line 168 "_DirectInternals.c"
+#line 173 "_DirectInternals.c"
 }