Merge branch 'feature/upstream' into develop

1 files changed, 39 insertions, 39 deletions

diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index f65f3e2..cc43f4e 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.34.7, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.36.6, the Vala compiler
  * generated from SourceInterfaces.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -80,13 +80,13 @@ const gchar* indexable_get_indexable_keywords (Indexable* self) {
 
 gchar* indexable_prepare_indexable_string (const gchar* str) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	_tmp0_ = str;
 #line 22 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -122,16 +122,16 @@ gchar* indexable_prepare_indexable_string (const gchar* str) {
 gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 	GString* builder = NULL;
-	GString* _tmp3_ = NULL;
+	GString* _tmp3_;
 	gint ctr = 0;
 	const gchar* _tmp21_ = NULL;
-	GString* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	gchar* _tmp27_ = NULL;
+	GString* _tmp22_;
+	const gchar* _tmp23_;
+	gboolean _tmp24_;
+	gchar* _tmp27_;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	_tmp1_ = strs;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -142,8 +142,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 		_tmp0_ = TRUE;
 #line 144 "SourceInterfaces.c"
 	} else {
-		gchar** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+		gchar** _tmp2_;
+		gint _tmp2__length1;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		_tmp2_ = strs;
 #line 28 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -174,18 +174,18 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		while (TRUE) {
 #line 177 "SourceInterfaces.c"
-			gchar** _tmp8_ = NULL;
-			gint _tmp8__length1 = 0;
-			gint _tmp9_ = 0;
-			const gchar* _tmp10_ = NULL;
-			gboolean _tmp11_ = FALSE;
+			gchar** _tmp8_;
+			gint _tmp8__length1;
+			gint _tmp9_;
+			const gchar* _tmp10_;
+			gboolean _tmp11_;
 #line 33 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 			if (!_tmp4_) {
 #line 185 "SourceInterfaces.c"
-				gint _tmp5_ = 0;
-				gint _tmp6_ = 0;
-				gchar** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
+				gint _tmp5_;
+				gint _tmp6_;
+				gchar** _tmp7_;
+				gint _tmp7__length1;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				_tmp5_ = ctr;
 #line 39 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -218,16 +218,16 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 34 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 			if (!_tmp11_) {
 #line 221 "SourceInterfaces.c"
-				GString* _tmp12_ = NULL;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				gint _tmp14_ = 0;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-				gint _tmp18_ = 0;
-				gchar** _tmp19_ = NULL;
-				gint _tmp19__length1 = 0;
+				GString* _tmp12_;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp14_;
+				const gchar* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				gint _tmp18_;
+				gchar** _tmp19_;
+				gint _tmp19__length1;
 #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				_tmp12_ = builder;
 #line 35 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -255,7 +255,7 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 36 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 				if (_tmp18_ < (_tmp19__length1 - 1)) {
 #line 258 "SourceInterfaces.c"
-					GString* _tmp20_ = NULL;
+					GString* _tmp20_;
 #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 					_tmp20_ = builder;
 #line 37 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
@@ -274,8 +274,8 @@ gchar* indexable_prepare_indexable_strings (gchar** strs, int strs_length1) {
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 	if (!_tmp24_) {
 #line 277 "SourceInterfaces.c"
-		GString* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
+		GString* _tmp25_;
+		const gchar* _tmp26_;
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"
 		_tmp25_ = builder;
 #line 41 "/home/jens/Source/shotwell/src/core/SourceInterfaces.vala"