Merge branch 'feature/upstream' into develop

1 files changed, 16 insertions, 11 deletions

diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index b1bd5f0..e3fa04d 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.36.6, the Vala compiler
+/* _CameraInternals.c generated by valac 0.40.4, the Vala compiler
  * generated from _CameraInternals.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>
 
@@ -27,7 +28,9 @@ void unit_terminate_entry (void);
 void sidebar_terminate_entry (void);
 
 
-void camera_init_entry (GError** error) {
+void
+camera_init_entry (GError** error)
+{
 	gint _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
@@ -38,7 +41,7 @@ void camera_init_entry (GError** error) {
 	if (_tmp0_ != 0) {
 #line 15 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 42 "_CameraInternals.c"
+#line 45 "_CameraInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	unit_init_entry (&_inner_error_);
@@ -48,7 +51,7 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 52 "_CameraInternals.c"
+#line 55 "_CameraInternals.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	sidebar_init_entry (&_inner_error_);
@@ -58,7 +61,7 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 17 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 62 "_CameraInternals.c"
+#line 65 "_CameraInternals.c"
 	}
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	camera_init (&_inner_error_);
@@ -68,12 +71,14 @@ void camera_init_entry (GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 72 "_CameraInternals.c"
+#line 75 "_CameraInternals.c"
 	}
 }
 
 
-void camera_terminate_entry (void) {
+void
+camera_terminate_entry (void)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
@@ -82,7 +87,7 @@ void camera_terminate_entry (void) {
 	if (_tmp1_ == 0) {
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		_tmp0_ = TRUE;
-#line 86 "_CameraInternals.c"
+#line 91 "_CameraInternals.c"
 	} else {
 		gint _tmp2_;
 		gint _tmp3_;
@@ -94,13 +99,13 @@ void camera_terminate_entry (void) {
 		_tmp3_ = camera__unit_init_count;
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		_tmp0_ = _tmp3_ != 0;
-#line 98 "_CameraInternals.c"
+#line 103 "_CameraInternals.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	if (_tmp0_) {
 #line 24 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 		return;
-#line 104 "_CameraInternals.c"
+#line 109 "_CameraInternals.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	camera_terminate ();
@@ -108,7 +113,7 @@ void camera_terminate_entry (void) {
 	unit_terminate_entry ();
 #line 28 "/home/jens/Source/shotwell/src/.unitize/_CameraInternals.vala"
 	sidebar_terminate_entry ();
-#line 112 "_CameraInternals.c"
+#line 117 "_CameraInternals.c"
 }