Merge branch 'feature/upstream' into develop

1 files changed, 17 insertions, 12 deletions

diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index 3e32a79..74a8652 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.36.6, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _FoldersInternals.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>
 
@@ -29,7 +30,9 @@ void sidebar_terminate_entry (void);
 void photos_terminate_entry (void);
 
 
-void folders_init_entry (GError** error) {
+void
+folders_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
@@ -40,7 +43,7 @@ void folders_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 44 "_FoldersInternals.c"
+#line 47 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -50,7 +53,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 54 "_FoldersInternals.c"
+#line 57 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -60,7 +63,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 64 "_FoldersInternals.c"
+#line 67 "_FoldersInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -70,7 +73,7 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 74 "_FoldersInternals.c"
+#line 77 "_FoldersInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	folders_init (&_inner_error_);
@@ -80,12 +83,14 @@ void folders_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 84 "_FoldersInternals.c"
+#line 87 "_FoldersInternals.c"
 	}
 }
 
 
-void folders_terminate_entry (void) {
+void
+folders_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
@@ -94,7 +99,7 @@ void folders_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		_tmp0_ = TRUE;
-#line 98 "_FoldersInternals.c"
+#line 103 "_FoldersInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -106,13 +111,13 @@ void folders_terminate_entry (void) {
 		_tmp3_ = folders__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 110 "_FoldersInternals.c"
+#line 115 "_FoldersInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 		return;
-#line 116 "_FoldersInternals.c"
+#line 121 "_FoldersInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	folders_terminate ();
@@ -122,7 +127,7 @@ void folders_terminate_entry (void) {
 	sidebar_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_FoldersInternals.vala"
 	photos_terminate_entry ();
-#line 126 "_FoldersInternals.c"
+#line 131 "_FoldersInternals.c"
 }