Merge branch 'feature/upstream' into develop

1 files changed, 15 insertions, 10 deletions

diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
index 29ec24b..0bce746 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.36.6, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _EditingToolsInternals.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>
 
@@ -25,7 +26,9 @@ void editing_tools_terminate (void);
 void unit_terminate_entry (void);
 
 
-void editing_tools_init_entry (GError** error) {
+void
+editing_tools_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
@@ -36,7 +39,7 @@ void editing_tools_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 40 "_EditingToolsInternals.c"
+#line 43 "_EditingToolsInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -46,7 +49,7 @@ void editing_tools_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 50 "_EditingToolsInternals.c"
+#line 53 "_EditingToolsInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	editing_tools_init (&_inner_error_);
@@ -56,12 +59,14 @@ void editing_tools_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 60 "_EditingToolsInternals.c"
+#line 63 "_EditingToolsInternals.c"
 	}
 }
 
 
-void editing_tools_terminate_entry (void) {
+void
+editing_tools_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
@@ -70,7 +75,7 @@ void editing_tools_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		_tmp0_ = TRUE;
-#line 74 "_EditingToolsInternals.c"
+#line 79 "_EditingToolsInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -82,19 +87,19 @@ void editing_tools_terminate_entry (void) {
 		_tmp3_ = editing_tools__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 86 "_EditingToolsInternals.c"
+#line 91 "_EditingToolsInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 		return;
-#line 92 "_EditingToolsInternals.c"
+#line 97 "_EditingToolsInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	editing_tools_terminate ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_EditingToolsInternals.vala"
 	unit_terminate_entry ();
-#line 98 "_EditingToolsInternals.c"
+#line 103 "_EditingToolsInternals.c"
 }