Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

1 files changed, 101 insertions, 0 deletions

diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
new file mode 100644
index 0000000..ddfb022
--- /dev/null
+++ b/src/.unitize/_UtilInternals.c
@@ -0,0 +1,101 @@
+/* _UtilInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _UtilInternals.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+
+
+extern gint util__unit_init_count;
+gint util__unit_init_count = 0;
+
+void util_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void util_init (GError** error);
+void util_terminate_entry (void);
+void util_terminate (void);
+void unit_terminate_entry (void);
+
+
+void util_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	_tmp0_ = util__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 40 "_UtilInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 50 "_UtilInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 60 "_UtilInternals.c"
+	}
+}
+
+
+void util_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	_tmp1_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp0_ = TRUE;
+#line 74 "_UtilInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp2_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		util__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp3_ = util__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 86 "_UtilInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+		return;
+#line 92 "_UtilInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	util_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_UtilInternals.vala"
+	unit_terminate_entry ();
+#line 98 "_UtilInternals.c"
+}
+
+
+