Merge tag 'upstream/0.23.5'

Upstream version 0.23.5

1 files changed, 115 insertions, 0 deletions

diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
new file mode 100644
index 0000000..9a9ee42
--- /dev/null
+++ b/src/.unitize/_PluginsInternals.c
@@ -0,0 +1,115 @@
+/* _PluginsInternals.c generated by valac 0.32.1, the Vala compiler
+ * generated from _PluginsInternals.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 plugins__unit_init_count;
+gint plugins__unit_init_count = 0;
+
+void plugins_init_entry (GError** error);
+void unit_init_entry (GError** error);
+void util_init_entry (GError** error);
+void plugins_init (GError** error);
+void plugins_terminate_entry (void);
+void plugins_terminate (void);
+void unit_terminate_entry (void);
+void util_terminate_entry (void);
+
+
+void plugins_init_entry (GError** error) {
+	gint _tmp0_ = 0;
+	GError * _inner_error_ = NULL;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	_tmp0_ = plugins__unit_init_count;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins__unit_init_count = _tmp0_ + 1;
+#line 14 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp0_ != 0) {
+#line 15 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 42 "_PluginsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	unit_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 52 "_PluginsInternals.c"
+	}
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	util_init_entry (&_inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 17 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 62 "_PluginsInternals.c"
+	}
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins_init (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		g_propagate_error (error, _inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 72 "_PluginsInternals.c"
+	}
+}
+
+
+void plugins_terminate_entry (void) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	_tmp1_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp1_ == 0) {
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp0_ = TRUE;
+#line 86 "_PluginsInternals.c"
+	} else {
+		gint _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp2_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		plugins__unit_init_count = _tmp2_ - 1;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp3_ = plugins__unit_init_count;
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		_tmp0_ = _tmp3_ != 0;
+#line 98 "_PluginsInternals.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	if (_tmp0_) {
+#line 24 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+		return;
+#line 104 "_PluginsInternals.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	plugins_terminate ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	unit_terminate_entry ();
+#line 28 "/home/jens/Source/shotwell/src/.unitize/_PluginsInternals.vala"
+	util_terminate_entry ();
+#line 112 "_PluginsInternals.c"
+}
+
+
+