Merge branch 'release/0.28.3-1'0.28.3-1

1 files changed, 357 insertions, 479 deletions

diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index cc78916..b5c4fdb 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,7 +1,8 @@
-/* NaturalCollate.c generated by valac 0.36.6, the Vala compiler
+/* NaturalCollate.c generated by valac 0.40.4, the Vala compiler
  * generated from NaturalCollate.vala, do not modify */
 
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -18,216 +19,165 @@
 #define NATURAL_COLLATE_SUPERDIGIT ((gunichar) ':')
 #define NATURAL_COLLATE_NUM_SENTINEL ((gunichar) 0x2)
 #define NATURAL_COLLATE_COLLATION_SENTINEL "\x01\x01\x01"
-gint natural_collate_read_number (gchar* s, gint* byte_index);
-gint natural_collate_compare (const gchar* str1, const gchar* str2);
+gint natural_collate_read_number (gchar* s,
+                                  gint* byte_index);
+gint natural_collate_compare (const gchar* str1,
+                              const gchar* str2);
 gchar* natural_collate_collate_key (gchar* str);
 
 
-static gunichar string_get_char (const gchar* self, glong index) {
+static gunichar
+string_get_char (const gchar* self,
+                 glong index)
+{
 	gunichar result = 0U;
-	glong _tmp0_;
-	gunichar _tmp1_;
-#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1154 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = g_utf8_get_char (((gchar*) self) + index);
+#line 1155 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
 #line 41 "NaturalCollate.c"
 }
 
 
-static gint string_index_of_nth_char (const gchar* self, glong c) {
+static gint
+string_index_of_nth_char (const gchar* self,
+                          glong c)
+{
 	gint result = 0;
-	glong _tmp0_;
-	gchar* _tmp1_;
-#line 1160 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 1174 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = c;
-#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_);
-#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = (gint) (_tmp1_ - ((gchar*) self));
-#line 1161 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = g_utf8_offset_to_pointer (self, c);
+#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = (gint) (_tmp0_ - ((gchar*) self));
+#line 1175 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
 #line 59 "NaturalCollate.c"
 }
 
 
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+                glong maxlen)
+{
 	glong result = 0L;
 	gchar* end = NULL;
 	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 82 "NaturalCollate.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 90 "NaturalCollate.c"
+#line 83 "NaturalCollate.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 102 "NaturalCollate.c"
+#line 92 "NaturalCollate.c"
 	}
 }
 
 
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+                  glong offset,
+                  glong len)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	glong _tmp6_;
+	gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 126 "NaturalCollate.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 132 "NaturalCollate.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = len >= ((glong) 0);
+#line 113 "NaturalCollate.c"
 	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 136 "NaturalCollate.c"
+#line 117 "NaturalCollate.c"
 	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 140 "NaturalCollate.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 152 "NaturalCollate.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = string_strnlen ((gchar*) self, offset + len);
+#line 123 "NaturalCollate.c"
 	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 162 "NaturalCollate.c"
+		gint _tmp1_;
+		gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp2_;
+#line 133 "NaturalCollate.c"
 	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 168 "NaturalCollate.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 182 "NaturalCollate.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset < ((glong) 0)) {
+#line 137 "NaturalCollate.c"
+		glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 145 "NaturalCollate.c"
 	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 192 "NaturalCollate.c"
+		glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 152 "NaturalCollate.c"
 	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 198 "NaturalCollate.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 207 "NaturalCollate.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (len < ((glong) 0)) {
+#line 156 "NaturalCollate.c"
+		glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp5_ - offset;
+#line 162 "NaturalCollate.c"
 	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 227 "NaturalCollate.c"
+#line 174 "NaturalCollate.c"
 }
 
 
-gint natural_collate_read_number (gchar* s, gint* byte_index) {
+gint
+natural_collate_read_number (gchar* s,
+                             gint* byte_index)
+{
 	gint result = 0;
 	gint number = 0;
 #line 23 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -236,93 +186,59 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) {
 	number = 0;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	while (TRUE) {
-#line 240 "NaturalCollate.c"
+#line 190 "NaturalCollate.c"
 		gboolean _tmp0_ = FALSE;
-		const gchar* _tmp1_;
+		gint _tmp1_;
 		gint _tmp2_;
 		gint _tmp3_;
-		gint _tmp7_;
-		gint _tmp8_;
-		const gchar* _tmp9_;
-		gunichar _tmp10_;
-		gint _tmp11_;
+		gint _tmp4_;
 		gint second_char = 0;
-		const gchar* _tmp12_;
-		gint _tmp13_;
-		const gchar* _tmp14_;
-		gint _tmp15_;
-		gchar* _tmp16_;
-		gint _tmp17_;
-		gint _tmp18_;
-#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp1_ = s;
-#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp2_ = strlen (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp3_ = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		if (_tmp3_ != 0) {
-#line 266 "NaturalCollate.c"
-			const gchar* _tmp4_;
-			gunichar _tmp5_;
-			gboolean _tmp6_;
+		gint _tmp5_;
+		gchar* _tmp6_;
+		gint _tmp7_;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp4_ = s;
+		_tmp1_ = strlen (s);
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp5_ = string_get_char (_tmp4_, (glong) 0);
+		_tmp2_ = _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp6_ = g_unichar_isdigit (_tmp5_);
+		if (_tmp2_ != 0) {
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp0_ = _tmp6_;
-#line 278 "NaturalCollate.c"
+			_tmp0_ = g_unichar_isdigit (string_get_char (s, (glong) 0));
+#line 208 "NaturalCollate.c"
 		} else {
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_tmp0_ = FALSE;
-#line 282 "NaturalCollate.c"
+#line 212 "NaturalCollate.c"
 		}
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		if (!_tmp0_) {
 #line 33 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			break;
-#line 288 "NaturalCollate.c"
+#line 218 "NaturalCollate.c"
 		}
 #line 34 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp7_ = number;
+		_tmp3_ = number;
 #line 34 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		number = _tmp7_ * 10;
-#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp8_ = number;
+		number = _tmp3_ * 10;
 #line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp9_ = s;
+		_tmp4_ = number;
 #line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp10_ = string_get_char (_tmp9_, (glong) 0);
-#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp11_ = g_unichar_digit_value (_tmp10_);
-#line 35 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		number = _tmp8_ + _tmp11_;
-#line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp12_ = s;
-#line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp13_ = string_index_of_nth_char (_tmp12_, (glong) 1);
+		number = _tmp4_ + g_unichar_digit_value (string_get_char (s, (glong) 0));
 #line 36 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		second_char = _tmp13_;
+		second_char = string_index_of_nth_char (s, (glong) 1);
 #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp14_ = s;
+		_tmp5_ = second_char;
 #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp15_ = second_char;
-#line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp16_ = string_substring (_tmp14_, (glong) _tmp15_, (glong) -1);
+		_tmp6_ = string_substring (s, (glong) _tmp5_, (glong) -1);
 #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		_g_free0 (s);
 #line 37 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		s = _tmp16_;
-#line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp17_ = *byte_index;
+		s = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp18_ = second_char;
+		_tmp7_ = second_char;
 #line 38 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		*byte_index = _tmp17_ + _tmp18_;
-#line 326 "NaturalCollate.c"
+		*byte_index = (*byte_index) + _tmp7_;
+#line 242 "NaturalCollate.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	result = number;
@@ -330,23 +246,23 @@ gint natural_collate_read_number (gchar* s, gint* byte_index) {
 	_g_free0 (s);
 #line 40 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	return result;
-#line 334 "NaturalCollate.c"
+#line 250 "NaturalCollate.c"
 }
 
 
-gint natural_collate_compare (const gchar* str1, const gchar* str2) {
+gint
+natural_collate_compare (const gchar* str1,
+                         const gchar* str2)
+{
 	gint result = 0;
 	GCompareFunc _tmp0_;
-	const gchar* _tmp1_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-	const gchar* _tmp5_;
+	gchar* _tmp5_;
 	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gint _tmp9_;
-	gint _tmp10_;
+	gint _tmp7_;
 #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	g_return_val_if_fail (str1 != NULL, 0);
 #line 43 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
@@ -354,447 +270,409 @@ gint natural_collate_compare (const gchar* str1, const gchar* str2) {
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	_tmp0_ = g_strcmp0;
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp1_ = str1;
+	_tmp1_ = g_strdup (str1);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp2_ = natural_collate_collate_key (_tmp1_);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp3_ = natural_collate_collate_key (_tmp2_);
+	_tmp3_ = _tmp2_;
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp4_ = _tmp3_;
+	_tmp4_ = g_strdup (str2);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp5_ = str2;
+	_tmp5_ = natural_collate_collate_key (_tmp4_);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp6_ = _tmp5_;
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp7_ = natural_collate_collate_key (_tmp6_);
+	_tmp7_ = _tmp0_ (_tmp3_, _tmp6_);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp8_ = _tmp7_;
+	_g_free0 (_tmp6_);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp9_ = _tmp0_ (_tmp4_, _tmp8_);
+	_g_free0 (_tmp3_);
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp10_ = _tmp9_;
-#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_g_free0 (_tmp8_);
-#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_g_free0 (_tmp4_);
-#line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	result = _tmp10_;
+	result = _tmp7_;
 #line 44 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	return result;
-#line 385 "NaturalCollate.c"
+#line 295 "NaturalCollate.c"
 }
 
 
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+                 const gchar* needle)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 405 "NaturalCollate.c"
+#line 315 "NaturalCollate.c"
 }
 
 
-static gchar* g_unichar_to_string (gunichar self) {
+static gchar*
+g_unichar_to_string (gunichar self)
+{
 	gchar* result = NULL;
 	gchar* str = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 963 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 7);
-#line 949 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 963 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	str = (gchar*) _tmp0_;
-#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 964 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = str;
-#line 950 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 964 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_unichar_to_utf8 (self, _tmp1_);
-#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 965 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = str;
-#line 951 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 965 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 426 "NaturalCollate.c"
+#line 338 "NaturalCollate.c"
 }
 
 
-gchar* natural_collate_collate_key (gchar* str) {
+gchar*
+natural_collate_collate_key (gchar* str)
+{
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_;
+	gboolean _tmp0_;
 	gchar* _result_ = NULL;
-	gchar* _tmp2_;
+	gchar* _tmp1_;
 	gboolean eos = FALSE;
-	const gchar* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	const gchar* _tmp70_;
-	gchar* _tmp71_;
-	gchar* _tmp72_;
-	gchar* _tmp73_;
+	gint _tmp2_;
+	gint _tmp3_;
+	const gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
 #line 47 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	g_return_val_if_fail (str != NULL, NULL);
 #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp0_ = str;
-#line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp1_ = g_utf8_validate (_tmp0_, (gssize) -1, NULL);
+	_tmp0_ = g_utf8_validate (str, (gssize) -1, NULL);
 #line 53 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_vala_assert (_tmp1_, "str.validate()");
+	_vala_assert (_tmp0_, "str.validate()");
 #line 54 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp2_ = g_strdup ("");
+	_tmp1_ = g_strdup ("");
 #line 54 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_result_ = _tmp2_;
+	_result_ = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp3_ = str;
+	_tmp2_ = strlen (str);
 #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp4_ = strlen (_tmp3_);
+	_tmp3_ = _tmp2_;
 #line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp5_ = _tmp4_;
-#line 55 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	eos = _tmp5_ == 0;
+	eos = _tmp3_ == 0;
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	while (TRUE) {
-#line 466 "NaturalCollate.c"
-		gboolean _tmp6_;
-		const gchar* _tmp7_;
-		gboolean _tmp8_;
+#line 374 "NaturalCollate.c"
+		gboolean _tmp4_;
+		gboolean _tmp5_;
 		gint position = 0;
-		const gchar* _tmp17_;
-		const gchar* _tmp18_;
-		gint _tmp19_;
-		gchar* _tmp20_;
-		gchar* _tmp21_;
-		gchar* _tmp22_;
-		gchar* _tmp23_;
-		gchar* _tmp24_;
-		const gchar* _tmp25_;
-		gint _tmp26_;
-		gchar* _tmp27_;
-		const gchar* _tmp28_;
-		gint _tmp29_;
-		gint _tmp30_;
-		gboolean _tmp31_;
-		const gchar* _tmp67_;
-		gint _tmp68_;
-		gint _tmp69_;
+		const gchar* _tmp11_;
+		gint _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		gint _tmp18_;
+		gchar* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gboolean _tmp22_;
+		gint _tmp56_;
+		gint _tmp57_;
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp6_ = eos;
+		_tmp4_ = eos;
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		if (!(!_tmp6_)) {
+		if (!(!_tmp4_)) {
 #line 57 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			break;
-#line 495 "NaturalCollate.c"
+#line 398 "NaturalCollate.c"
 		}
 #line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp7_ = str;
-#line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp8_ = g_utf8_validate (_tmp7_, (gssize) -1, NULL);
+		_tmp5_ = g_utf8_validate (str, (gssize) -1, NULL);
 #line 58 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_vala_assert (_tmp8_, "str.validate()");
+		_vala_assert (_tmp5_, "str.validate()");
 #line 59 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		position = 0;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		while (TRUE) {
-#line 507 "NaturalCollate.c"
-			const gchar* _tmp9_;
+#line 408 "NaturalCollate.c"
+			gint _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			gboolean _tmp9_;
 			gint _tmp10_;
-			gunichar _tmp11_;
-			gchar* _tmp12_;
-			gchar* _tmp13_;
-			gboolean _tmp14_;
-			gboolean _tmp15_;
-			gint _tmp16_;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp9_ = str;
+			_tmp6_ = position;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp10_ = position;
-#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp11_ = string_get_char (_tmp9_, (glong) _tmp10_);
-#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp12_ = g_unichar_to_string (_tmp11_);
+			_tmp7_ = g_unichar_to_string (string_get_char (str, (glong) _tmp6_));
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp13_ = _tmp12_;
+			_tmp8_ = _tmp7_;
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp14_ = string_contains ("0123456789", _tmp13_);
+			_tmp9_ = !(!string_contains ("0123456789", _tmp8_));
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp15_ = !(!_tmp14_);
+			_g_free0 (_tmp8_);
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp13_);
-#line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			if (_tmp15_) {
+			if (_tmp9_) {
 #line 60 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 				break;
-#line 536 "NaturalCollate.c"
+#line 428 "NaturalCollate.c"
 			}
 #line 62 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp16_ = position;
+			_tmp10_ = position;
 #line 62 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			position = _tmp16_ + 1;
-#line 542 "NaturalCollate.c"
+			position = _tmp10_ + 1;
+#line 434 "NaturalCollate.c"
 		}
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp17_ = _result_;
+		_tmp11_ = _result_;
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp18_ = str;
+		_tmp12_ = position;
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp19_ = position;
+		_tmp13_ = string_substring (str, (glong) 0, (glong) _tmp12_);
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp20_ = string_substring (_tmp18_, (glong) 0, (glong) _tmp19_);
+		_tmp14_ = _tmp13_;
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp21_ = _tmp20_;
-#line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp22_ = g_utf8_collate_key (_tmp21_, (gssize) -1);
+		_tmp15_ = g_utf8_collate_key (_tmp14_, (gssize) -1);
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp23_ = _tmp22_;
+		_tmp16_ = _tmp15_;
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp24_ = g_strconcat (_tmp17_, _tmp23_, NULL);
+		_tmp17_ = g_strconcat (_tmp11_, _tmp16_, NULL);
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		_g_free0 (_result_);
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_result_ = _tmp24_;
+		_result_ = _tmp17_;
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_g_free0 (_tmp23_);
+		_g_free0 (_tmp16_);
 #line 66 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_g_free0 (_tmp21_);
+		_g_free0 (_tmp14_);
 #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp25_ = str;
+		_tmp18_ = position;
 #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp26_ = position;
-#line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp27_ = string_substring (_tmp25_, (glong) _tmp26_, (glong) -1);
+		_tmp19_ = string_substring (str, (glong) _tmp18_, (glong) -1);
 #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		_g_free0 (str);
 #line 69 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		str = _tmp27_;
-#line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp28_ = str;
+		str = _tmp19_;
 #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp29_ = strlen (_tmp28_);
+		_tmp20_ = strlen (str);
 #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp30_ = _tmp29_;
+		_tmp21_ = _tmp20_;
 #line 71 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		eos = _tmp30_ == 0;
+		eos = _tmp21_ == 0;
 #line 72 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 		position = 0;
 #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp31_ = eos;
+		_tmp22_ = eos;
 #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		if (!_tmp31_) {
-#line 592 "NaturalCollate.c"
+		if (!_tmp22_) {
+#line 478 "NaturalCollate.c"
 			gint number = 0;
-			const gchar* _tmp32_;
-			gchar* _tmp33_;
-			gint _tmp34_;
-			const gchar* _tmp35_;
-			gint _tmp36_;
-			gchar* _tmp37_;
+			gchar* _tmp23_;
+			gint _tmp24_;
+			gint _tmp25_;
+			gchar* _tmp26_;
 			gint number_of_superdigits = 0;
-			gint _tmp38_;
-			gchar* _tmp39_;
-			gchar* _tmp40_;
-			gint _tmp41_;
-			gint _tmp42_;
-			gint _tmp43_;
+			gint _tmp27_;
+			gchar* _tmp28_;
+			gchar* _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
+			gint _tmp32_;
 			gchar* to_append = NULL;
+			gchar* _tmp33_;
+			const gchar* _tmp42_;
+			gint _tmp43_;
 			gchar* _tmp44_;
-			const gchar* _tmp53_;
-			gint _tmp54_;
+			gchar* _tmp45_;
+			gchar* _tmp46_;
+			const gchar* _tmp47_;
+			gchar* _tmp48_;
+			gchar* _tmp49_;
+			gchar* _tmp50_;
+			gchar* _tmp51_;
+			gchar* _tmp52_;
+			gchar* _tmp53_;
+			const gchar* _tmp54_;
 			gchar* _tmp55_;
-			gchar* _tmp56_;
-			gchar* _tmp57_;
-			const gchar* _tmp58_;
-			gchar* _tmp59_;
-			gchar* _tmp60_;
-			gchar* _tmp61_;
-			gchar* _tmp62_;
-			gchar* _tmp63_;
-			gchar* _tmp64_;
-			const gchar* _tmp65_;
-			gchar* _tmp66_;
-#line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp32_ = str;
 #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp33_ = g_strdup (_tmp32_);
+			_tmp23_ = g_strdup (str);
 #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp34_ = natural_collate_read_number (_tmp33_, &position);
+			_tmp24_ = natural_collate_read_number (_tmp23_, &position);
 #line 76 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			number = _tmp34_;
+			number = _tmp24_;
 #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp35_ = str;
+			_tmp25_ = position;
 #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp36_ = position;
-#line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp37_ = string_substring (_tmp35_, (glong) _tmp36_, (glong) -1);
+			_tmp26_ = string_substring (str, (glong) _tmp25_, (glong) -1);
 #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_g_free0 (str);
 #line 77 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			str = _tmp37_;
+			str = _tmp26_;
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp38_ = number;
+			_tmp27_ = number;
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp39_ = g_strdup_printf ("%i", _tmp38_);
+			_tmp28_ = g_strdup_printf ("%i", _tmp27_);
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp40_ = _tmp39_;
+			_tmp29_ = _tmp28_;
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp41_ = strlen (_tmp40_);
+			_tmp30_ = strlen (_tmp29_);
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp42_ = _tmp41_;
+			_tmp31_ = _tmp30_;
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp43_ = _tmp42_;
+			_tmp32_ = _tmp31_;
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp40_);
+			_g_free0 (_tmp29_);
 #line 78 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			number_of_superdigits = _tmp43_;
+			number_of_superdigits = _tmp32_;
 #line 79 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp44_ = g_strdup ("");
+			_tmp33_ = g_strdup ("");
 #line 79 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			to_append = _tmp44_;
-#line 661 "NaturalCollate.c"
+			to_append = _tmp33_;
+#line 541 "NaturalCollate.c"
 			{
 				gint i = 0;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 				i = 1;
-#line 666 "NaturalCollate.c"
+#line 546 "NaturalCollate.c"
 				{
-					gboolean _tmp45_ = FALSE;
+					gboolean _tmp34_ = FALSE;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-					_tmp45_ = TRUE;
+					_tmp34_ = TRUE;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 					while (TRUE) {
-#line 673 "NaturalCollate.c"
-						gint _tmp47_;
-						gint _tmp48_;
-						const gchar* _tmp49_;
-						gchar* _tmp50_;
-						gchar* _tmp51_;
-						gchar* _tmp52_;
+#line 553 "NaturalCollate.c"
+						gint _tmp36_;
+						gint _tmp37_;
+						const gchar* _tmp38_;
+						gchar* _tmp39_;
+						gchar* _tmp40_;
+						gchar* _tmp41_;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						if (!_tmp45_) {
-#line 682 "NaturalCollate.c"
-							gint _tmp46_;
+						if (!_tmp34_) {
+#line 562 "NaturalCollate.c"
+							gint _tmp35_;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-							_tmp46_ = i;
+							_tmp35_ = i;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-							i = _tmp46_ + 1;
-#line 688 "NaturalCollate.c"
+							i = _tmp35_ + 1;
+#line 568 "NaturalCollate.c"
 						}
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp45_ = FALSE;
+						_tmp34_ = FALSE;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp47_ = i;
+						_tmp36_ = i;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp48_ = number_of_superdigits;
+						_tmp37_ = number_of_superdigits;
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						if (!(_tmp47_ < _tmp48_)) {
+						if (!(_tmp36_ < _tmp37_)) {
 #line 80 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 							break;
-#line 700 "NaturalCollate.c"
+#line 580 "NaturalCollate.c"
 						}
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp49_ = to_append;
+						_tmp38_ = to_append;
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp50_ = g_unichar_to_string (NATURAL_COLLATE_SUPERDIGIT);
+						_tmp39_ = g_unichar_to_string (NATURAL_COLLATE_SUPERDIGIT);
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp51_ = _tmp50_;
+						_tmp40_ = _tmp39_;
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_tmp52_ = g_strconcat (_tmp49_, _tmp51_, NULL);
+						_tmp41_ = g_strconcat (_tmp38_, _tmp40_, NULL);
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 						_g_free0 (to_append);
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						to_append = _tmp52_;
+						to_append = _tmp41_;
 #line 82 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-						_g_free0 (_tmp51_);
-#line 716 "NaturalCollate.c"
+						_g_free0 (_tmp40_);
+#line 596 "NaturalCollate.c"
 					}
 				}
 			}
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp53_ = to_append;
+			_tmp42_ = to_append;
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp54_ = number;
+			_tmp43_ = number;
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp55_ = g_strdup_printf ("%i", _tmp54_);
+			_tmp44_ = g_strdup_printf ("%i", _tmp43_);
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp56_ = _tmp55_;
+			_tmp45_ = _tmp44_;
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp57_ = g_strconcat (_tmp53_, _tmp56_, NULL);
+			_tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL);
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_g_free0 (to_append);
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			to_append = _tmp57_;
+			to_append = _tmp46_;
 #line 84 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp56_);
+			_g_free0 (_tmp45_);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp58_ = _result_;
+			_tmp47_ = _result_;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp59_ = g_strconcat (_tmp58_, NATURAL_COLLATE_COLLATION_SENTINEL, NULL);
+			_tmp48_ = g_strconcat (_tmp47_, NATURAL_COLLATE_COLLATION_SENTINEL, NULL);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp60_ = _tmp59_;
+			_tmp49_ = _tmp48_;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp61_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL);
+			_tmp50_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp62_ = _tmp61_;
+			_tmp51_ = _tmp50_;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp63_ = g_strconcat (_tmp60_, _tmp62_, NULL);
+			_tmp52_ = g_strconcat (_tmp49_, _tmp51_, NULL);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp64_ = _tmp63_;
+			_tmp53_ = _tmp52_;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp65_ = to_append;
+			_tmp54_ = to_append;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_tmp66_ = g_strconcat (_tmp64_, _tmp65_, NULL);
+			_tmp55_ = g_strconcat (_tmp53_, _tmp54_, NULL);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_g_free0 (_result_);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_result_ = _tmp66_;
+			_result_ = _tmp55_;
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp64_);
+			_g_free0 (_tmp53_);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp62_);
+			_g_free0 (_tmp51_);
 #line 85 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-			_g_free0 (_tmp60_);
+			_g_free0 (_tmp49_);
 #line 74 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 			_g_free0 (to_append);
-#line 766 "NaturalCollate.c"
+#line 646 "NaturalCollate.c"
 		}
 #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp67_ = str;
-#line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp68_ = strlen (_tmp67_);
+		_tmp56_ = strlen (str);
 #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		_tmp69_ = _tmp68_;
+		_tmp57_ = _tmp56_;
 #line 90 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-		eos = _tmp69_ == 0;
-#line 776 "NaturalCollate.c"
+		eos = _tmp57_ == 0;
+#line 654 "NaturalCollate.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp70_ = _result_;
+	_tmp58_ = _result_;
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp71_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL);
+	_tmp59_ = g_unichar_to_string (NATURAL_COLLATE_NUM_SENTINEL);
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp72_ = _tmp71_;
+	_tmp60_ = _tmp59_;
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_tmp73_ = g_strconcat (_tmp70_, _tmp72_, NULL);
+	_tmp61_ = g_strconcat (_tmp58_, _tmp60_, NULL);
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	_g_free0 (_result_);
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_result_ = _tmp73_;
+	_result_ = _tmp61_;
 #line 93 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
-	_g_free0 (_tmp72_);
+	_g_free0 (_tmp60_);
 #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	result = _result_;
 #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	_g_free0 (str);
 #line 96 "/home/jens/Source/shotwell/src/NaturalCollate.vala"
 	return result;
-#line 798 "NaturalCollate.c"
+#line 676 "NaturalCollate.c"
 }