Merge branch 'feature/upstream' into develop

1 files changed, 14 insertions, 9 deletions

diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index ee8e879..998da34 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.36.6, the Vala compiler
+/* _UnitInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _UnitInternals.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>
 
@@ -23,7 +24,9 @@ void unit_terminate_entry (void);
 void unit_terminate (void);
 
 
-void unit_init_entry (GError** error) {
+void
+unit_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
@@ -34,7 +37,7 @@ void unit_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 38 "_UnitInternals.c"
+#line 41 "_UnitInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	unit_init (&_inner_error_);
@@ -44,12 +47,14 @@ void unit_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 48 "_UnitInternals.c"
+#line 51 "_UnitInternals.c"
 	}
 }
 
 
-void unit_terminate_entry (void) {
+void
+unit_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
@@ -58,7 +63,7 @@ void unit_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		_tmp0_ = TRUE;
-#line 62 "_UnitInternals.c"
+#line 67 "_UnitInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -70,17 +75,17 @@ void unit_terminate_entry (void) {
 		_tmp3_ = unit__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 74 "_UnitInternals.c"
+#line 79 "_UnitInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 		return;
-#line 80 "_UnitInternals.c"
+#line 85 "_UnitInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_UnitInternals.vala"
 	unit_terminate ();
-#line 84 "_UnitInternals.c"
+#line 89 "_UnitInternals.c"
 }