Merge branch 'feature/upstream' into develop

1 files changed, 30 insertions, 25 deletions

diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index fd91e7b..84c32c0 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.36.6, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _LibraryInternals.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>
 
@@ -55,7 +56,9 @@ void data_imports_terminate_entry (void);
 void folders_terminate_entry (void);
 
 
-void library_init_entry (GError** error) {
+void
+library_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
@@ -66,7 +69,7 @@ void library_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 70 "_LibraryInternals.c"
+#line 73 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -76,7 +79,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 80 "_LibraryInternals.c"
+#line 83 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	util_init_entry (&_inner_error_);
@@ -86,7 +89,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 90 "_LibraryInternals.c"
+#line 93 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	threads_init_entry (&_inner_error_);
@@ -96,7 +99,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 100 "_LibraryInternals.c"
+#line 103 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	db_init_entry (&_inner_error_);
@@ -106,7 +109,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 110 "_LibraryInternals.c"
+#line 113 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	plugins_init_entry (&_inner_error_);
@@ -116,7 +119,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 120 "_LibraryInternals.c"
+#line 123 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	slideshow_init_entry (&_inner_error_);
@@ -126,7 +129,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 130 "_LibraryInternals.c"
+#line 133 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	photos_init_entry (&_inner_error_);
@@ -136,7 +139,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 140 "_LibraryInternals.c"
+#line 143 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	publishing_init_entry (&_inner_error_);
@@ -146,7 +149,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 150 "_LibraryInternals.c"
+#line 153 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	core_init_entry (&_inner_error_);
@@ -156,7 +159,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 160 "_LibraryInternals.c"
+#line 163 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -166,7 +169,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 170 "_LibraryInternals.c"
+#line 173 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	events_init_entry (&_inner_error_);
@@ -176,7 +179,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 180 "_LibraryInternals.c"
+#line 183 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	tags_init_entry (&_inner_error_);
@@ -186,7 +189,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 190 "_LibraryInternals.c"
+#line 193 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	camera_init_entry (&_inner_error_);
@@ -196,7 +199,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 200 "_LibraryInternals.c"
+#line 203 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	searches_init_entry (&_inner_error_);
@@ -206,7 +209,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 210 "_LibraryInternals.c"
+#line 213 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	data_imports_init_entry (&_inner_error_);
@@ -216,7 +219,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 220 "_LibraryInternals.c"
+#line 223 "_LibraryInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	folders_init_entry (&_inner_error_);
@@ -226,7 +229,7 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 230 "_LibraryInternals.c"
+#line 233 "_LibraryInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	library_init (&_inner_error_);
@@ -236,12 +239,14 @@ void library_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 240 "_LibraryInternals.c"
+#line 243 "_LibraryInternals.c"
 	}
 }
 
 
-void library_terminate_entry (void) {
+void
+library_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
@@ -250,7 +255,7 @@ void library_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		_tmp0_ = TRUE;
-#line 254 "_LibraryInternals.c"
+#line 259 "_LibraryInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -262,13 +267,13 @@ void library_terminate_entry (void) {
 		_tmp3_ = library__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 266 "_LibraryInternals.c"
+#line 271 "_LibraryInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 		return;
-#line 272 "_LibraryInternals.c"
+#line 277 "_LibraryInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	library_terminate ();
@@ -304,7 +309,7 @@ void library_terminate_entry (void) {
 	data_imports_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_LibraryInternals.vala"
 	folders_terminate_entry ();
-#line 308 "_LibraryInternals.c"
+#line 313 "_LibraryInternals.c"
 }