diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/KeyValueMap.c | 58 | ||||
| -rw-r--r-- | src/util/Util.c | 2 | ||||
| -rw-r--r-- | src/util/file.c | 104 | ||||
| -rw-r--r-- | src/util/image.c | 2 | ||||
| -rw-r--r-- | src/util/misc.c | 36 | ||||
| -rw-r--r-- | src/util/string.c | 1623 | ||||
| -rw-r--r-- | src/util/string.vala | 52 | ||||
| -rw-r--r-- | src/util/system.c | 2 | ||||
| -rw-r--r-- | src/util/ui.c | 2 |
9 files changed, 1102 insertions, 779 deletions
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c index 003f0ca..40ffa4d 100644 --- a/src/util/KeyValueMap.c +++ b/src/util/KeyValueMap.c @@ -1,4 +1,4 @@ -/* KeyValueMap.c generated by valac 0.32.1, the Vala compiler +/* KeyValueMap.c generated by valac 0.34.4, the Vala compiler * generated from KeyValueMap.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -355,23 +355,23 @@ static gchar* double_to_string (gdouble self) { const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE); -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE; -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self); -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_strdup (_tmp2_); -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = (g_free (_tmp1_), NULL); -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; -#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 377 "KeyValueMap.c" } @@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value) static gchar* bool_to_string (gboolean self) { gchar* result = NULL; -#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (self) { #line 451 "KeyValueMap.c" gchar* _tmp0_ = NULL; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 459 "KeyValueMap.c" } else { gchar* _tmp1_ = NULL; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 468 "KeyValueMap.c" } @@ -610,15 +610,15 @@ static gdouble double_parse (const gchar* str) { gdouble result = 0.0; const gchar* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; -#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0.0); -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtod (_tmp0_, NULL); -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 624 "KeyValueMap.c" } @@ -731,21 +731,21 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def) static gboolean bool_parse (const gchar* str) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; -#line 44 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, FALSE); -#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (g_strcmp0 (_tmp0_, "true") == 0) { -#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = TRUE; -#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 745 "KeyValueMap.c" } else { -#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = FALSE; -#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 751 "KeyValueMap.c" } diff --git a/src/util/Util.c b/src/util/Util.c index ec9f4ff..b7aff8f 100644 --- a/src/util/Util.c +++ b/src/util/Util.c @@ -1,4 +1,4 @@ -/* Util.c generated by valac 0.32.1, the Vala compiler +/* Util.c generated by valac 0.34.4, the Vala compiler * generated from Util.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/file.c b/src/util/file.c index b219fd2..211fbe3 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -1,4 +1,4 @@ -/* file.c generated by valac 0.32.1, the Vala compiler +/* file.c generated by valac 0.34.4, the Vala compiler * generated from file.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -411,37 +411,37 @@ static glong string_strnlen (gchar* str, glong maxlen) { glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 427 "file.c" glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 435 "file.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 447 "file.c" } @@ -461,112 +461,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 471 "file.c" glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 477 "file.c" } else { -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 481 "file.c" } -#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { #line 485 "file.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 497 "file.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 507 "file.c" } -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 513 "file.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 527 "file.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 537 "file.c" } -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 543 "file.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 552 "file.c" } -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 572 "file.c" } diff --git a/src/util/image.c b/src/util/image.c index a68553e..f6c82ec 100644 --- a/src/util/image.c +++ b/src/util/image.c @@ -1,4 +1,4 @@ -/* image.c generated by valac 0.32.1, the Vala compiler +/* image.c generated by valac 0.34.4, the Vala compiler * generated from image.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/misc.c b/src/util/misc.c index 848194e..65c37e5 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -1,4 +1,4 @@ -/* misc.c generated by valac 0.32.1, the Vala compiler +/* misc.c generated by valac 0.34.4, the Vala compiler * generated from misc.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -684,7 +684,7 @@ gchar* md5_file (GFile* file, GError** error) { #line 90 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp6__length1 = buffer_length1; #line 90 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_); + _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_); #line 90 "/home/jens/Source/shotwell/src/util/misc.vala" bytes_read = (gsize) _tmp7_; #line 90 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -727,7 +727,7 @@ gchar* md5_file (GFile* file, GError** error) { #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp12_ = fins; #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 734 "misc.c" @@ -1968,35 +1968,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gchar* _tmp3_ = NULL; gint _tmp3__length1 = 0; gchar* _tmp4_ = NULL; -#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = format; -#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = buffer; -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = buffer_length1; -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2002 "misc.c" } diff --git a/src/util/string.c b/src/util/string.c index 4cfeedd..931e58d 100644 --- a/src/util/string.c +++ b/src/util/string.c @@ -1,4 +1,4 @@ -/* string.c generated by valac 0.32.1, the Vala compiler +/* string.c generated by valac 0.34.4, the Vala compiler * generated from string.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -16,6 +16,7 @@ #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL))) #define TYPE_PREPARE_INPUT_TEXT_OPTIONS (prepare_input_text_options_get_type ()) +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef enum { PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL = 1 << 0, @@ -41,6 +42,7 @@ gchar* guarded_markup_escape_text (const gchar* plain); glong find_last_offset (const gchar* str, gchar c); gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1); GType prepare_input_text_options_get_type (void) G_GNUC_CONST; +gchar* guess_convert (const gchar* text); gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); gint64 parse_int64 (const gchar* str, gint num_base); gboolean string_contains_char (const gchar* haystack, gunichar needle); @@ -65,17 +67,17 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 79 "string.c" +#line 81 "string.c" } @@ -89,7 +91,7 @@ inline gboolean is_string_empty (const gchar* s) { if (_tmp1_ == NULL) { #line 12 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = TRUE; -#line 93 "string.c" +#line 95 "string.c" } else { const gchar* _tmp2_ = NULL; gchar _tmp3_ = '\0'; @@ -99,13 +101,13 @@ inline gboolean is_string_empty (const gchar* s) { _tmp3_ = string_get (_tmp2_, (glong) 0); #line 12 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = _tmp3_ == '\0'; -#line 103 "string.c" +#line 105 "string.c" } #line 12 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 109 "string.c" +#line 111 "string.c" } @@ -124,7 +126,7 @@ gint utf8_cs_compare (void* a, void* b) { result = _tmp2_; #line 17 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 128 "string.c" +#line 130 "string.c" } @@ -162,7 +164,7 @@ gint utf8_ci_compare (void* a, void* b) { result = _tmp7_; #line 22 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 166 "string.c" +#line 168 "string.c" } @@ -178,7 +180,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { _tmp0_ = length; #line 27 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp0_ < 0) { -#line 182 "string.c" +#line 184 "string.c" guchar* _tmp1_ = NULL; gint _tmp1__length1 = 0; #line 28 "/home/jens/Source/shotwell/src/util/string.vala" @@ -187,25 +189,25 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { _tmp1__length1 = data_length1; #line 28 "/home/jens/Source/shotwell/src/util/string.vala" length = _tmp1__length1; -#line 191 "string.c" +#line 193 "string.c" } #line 30 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = g_string_new (""); #line 30 "/home/jens/Source/shotwell/src/util/string.vala" builder = _tmp2_; -#line 197 "string.c" +#line 199 "string.c" { gint ctr = 0; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" ctr = 0; -#line 202 "string.c" +#line 204 "string.c" { gboolean _tmp3_ = FALSE; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = TRUE; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 209 "string.c" +#line 211 "string.c" gint _tmp5_ = 0; gint _tmp6_ = 0; guchar* _tmp7_ = NULL; @@ -214,13 +216,13 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { guchar _tmp9_ = '\0'; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp3_) { -#line 218 "string.c" +#line 220 "string.c" gint _tmp4_ = 0; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = ctr; #line 31 "/home/jens/Source/shotwell/src/util/string.vala" ctr = _tmp4_ + 1; -#line 224 "string.c" +#line 226 "string.c" } #line 31 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = FALSE; @@ -232,7 +234,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { if (!(_tmp5_ < _tmp6_)) { #line 31 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 236 "string.c" +#line 238 "string.c" } #line 32 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = data; @@ -244,7 +246,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { _tmp9_ = _tmp7_[_tmp8_]; #line 32 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp9_ != ((guchar) '\0')) { -#line 248 "string.c" +#line 250 "string.c" GString* _tmp10_ = NULL; guchar* _tmp11_ = NULL; gint _tmp11__length1 = 0; @@ -262,11 +264,11 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { _tmp13_ = _tmp11_[_tmp12_]; #line 33 "/home/jens/Source/shotwell/src/util/string.vala" g_string_append_c (_tmp10_, (gchar) _tmp13_); -#line 266 "string.c" +#line 268 "string.c" } else { #line 35 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 270 "string.c" +#line 272 "string.c" } } } @@ -283,7 +285,7 @@ gchar* uchar_array_to_string (guchar* data, int data_length1, gint length) { _g_string_free0 (builder); #line 38 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 287 "string.c" +#line 289 "string.c" } @@ -294,11 +296,11 @@ static void _vala_array_add1 (guchar** array, int* length, int* size, guchar val *size = (*size) ? (2 * (*size)) : 4; #line 45 "/home/jens/Source/shotwell/src/util/string.vala" *array = g_renew (guchar, *array, *size); -#line 298 "string.c" +#line 300 "string.c" } #line 45 "/home/jens/Source/shotwell/src/util/string.vala" (*array)[(*length)++] = value; -#line 302 "string.c" +#line 304 "string.c" } @@ -320,19 +322,19 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { data_length1 = 0; #line 43 "/home/jens/Source/shotwell/src/util/string.vala" _data_size_ = data_length1; -#line 324 "string.c" +#line 326 "string.c" { gint ctr = 0; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" ctr = 0; -#line 329 "string.c" +#line 331 "string.c" { gboolean _tmp1_ = FALSE; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = TRUE; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 336 "string.c" +#line 338 "string.c" gint _tmp3_ = 0; const gchar* _tmp4_ = NULL; gint _tmp5_ = 0; @@ -344,13 +346,13 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { gchar _tmp10_ = '\0'; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp1_) { -#line 348 "string.c" +#line 350 "string.c" gint _tmp2_ = 0; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = ctr; #line 44 "/home/jens/Source/shotwell/src/util/string.vala" ctr = _tmp2_ + 1; -#line 354 "string.c" +#line 356 "string.c" } #line 44 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = FALSE; @@ -366,7 +368,7 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { if (!(_tmp3_ < _tmp6_)) { #line 44 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 370 "string.c" +#line 372 "string.c" } #line 45 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = data; @@ -380,7 +382,7 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { _tmp10_ = string_get (_tmp8_, (glong) _tmp9_); #line 45 "/home/jens/Source/shotwell/src/util/string.vala" _vala_array_add1 (&data, &data_length1, &_data_size_, (guchar) _tmp10_); -#line 384 "string.c" +#line 386 "string.c" } } } @@ -392,13 +394,13 @@ guchar* string_to_uchar_array (const gchar* str, int* result_length1) { if (result_length1) { #line 47 "/home/jens/Source/shotwell/src/util/string.vala" *result_length1 = _tmp11__length1; -#line 396 "string.c" +#line 398 "string.c" } #line 47 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp11_; #line 47 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 402 "string.c" +#line 404 "string.c" } @@ -414,7 +416,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) { _tmp3_ = is_string_empty (_tmp2_); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp3_) { -#line 418 "string.c" +#line 420 "string.c" const gchar* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" @@ -423,15 +425,15 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) { _tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = _tmp5_; -#line 427 "string.c" +#line 429 "string.c" } else { #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = FALSE; -#line 431 "string.c" +#line 433 "string.c" } #line 58 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp1_) { -#line 435 "string.c" +#line 437 "string.c" const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" @@ -442,7 +444,7 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) { _g_free0 (_tmp0_); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = _tmp7_; -#line 446 "string.c" +#line 448 "string.c" } else { gchar* _tmp8_ = NULL; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" @@ -451,13 +453,13 @@ inline gchar* guarded_markup_escape_text (const gchar* plain) { _g_free0 (_tmp0_); #line 58 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = _tmp8_; -#line 455 "string.c" +#line 457 "string.c" } #line 58 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 461 "string.c" +#line 463 "string.c" } @@ -479,7 +481,7 @@ glong find_last_offset (const gchar* str, gchar c) { offset = (glong) _tmp2_; #line 63 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 483 "string.c" +#line 485 "string.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; const gchar* _tmp5_ = NULL; @@ -496,7 +498,7 @@ glong find_last_offset (const gchar* str, gchar c) { if (!(_tmp4_ >= ((glong) 0))) { #line 63 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 500 "string.c" +#line 502 "string.c" } #line 64 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = str; @@ -512,14 +514,14 @@ glong find_last_offset (const gchar* str, gchar c) { result = offset; #line 65 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 516 "string.c" +#line 518 "string.c" } } #line 68 "/home/jens/Source/shotwell/src/util/string.vala" result = (glong) -1; #line 68 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 523 "string.c" +#line 525 "string.c" } @@ -542,7 +544,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) _tmp2_ = strings; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2__length1 = strings_length1; -#line 546 "string.c" +#line 548 "string.c" { gchar** str_element_collection = NULL; gint str_element_collection_length1 = 0; @@ -554,14 +556,14 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) str_element_collection_length1 = _tmp2__length1; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" for (str_element_it = 0; str_element_it < _tmp2__length1; str_element_it = str_element_it + 1) { -#line 558 "string.c" +#line 560 "string.c" gchar* _tmp3_ = NULL; gchar* str_element = NULL; #line 75 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = g_strdup (str_element_collection[str_element_it]); #line 75 "/home/jens/Source/shotwell/src/util/string.vala" str_element = _tmp3_; -#line 565 "string.c" +#line 567 "string.c" { const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -579,11 +581,11 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) _g_free0 (strdown); #line 77 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 583 "string.c" +#line 585 "string.c" } #line 75 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (str_element); -#line 587 "string.c" +#line 589 "string.c" } } } @@ -593,7 +595,7 @@ gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1) _g_free0 (strdown); #line 80 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 597 "string.c" +#line 599 "string.c" } @@ -609,26 +611,294 @@ GType prepare_input_text_options_get_type (void) { } +gchar* guess_convert (const gchar* text) { + gchar* result = NULL; + gchar* output = NULL; + gsize bytes_read = 0UL; + const gchar* charset = NULL; + const gchar* _tmp0_ = NULL; + gboolean _tmp1_ = FALSE; + gsize _tmp30_ = 0UL; + const gchar* _tmp31_ = NULL; + gint _tmp32_ = 0; + gint _tmp33_ = 0; + GError * _inner_error_ = NULL; +#line 94 "/home/jens/Source/shotwell/src/util/string.vala" + g_return_val_if_fail (text != NULL, NULL); +#line 95 "/home/jens/Source/shotwell/src/util/string.vala" + output = NULL; +#line 96 "/home/jens/Source/shotwell/src/util/string.vala" + bytes_read = (gsize) 0; +#line 97 "/home/jens/Source/shotwell/src/util/string.vala" + charset = NULL; +#line 98 "/home/jens/Source/shotwell/src/util/string.vala" + g_debug ("string.vala:98: CONVERT: Text did not validate as UTF-8, trying conver" \ +"sion"); +#line 101 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp1_ = g_get_charset (&_tmp0_); +#line 101 "/home/jens/Source/shotwell/src/util/string.vala" + charset = _tmp0_; +#line 101 "/home/jens/Source/shotwell/src/util/string.vala" + if (!_tmp1_) { +#line 643 "string.c" + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_ = NULL; + gint _tmp4_ = 0; + gint _tmp5_ = 0; + gsize _tmp6_ = 0UL; + gchar* _tmp7_ = NULL; + gsize _tmp8_ = 0UL; + const gchar* _tmp9_ = NULL; + gint _tmp10_ = 0; + gint _tmp11_ = 0; +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp2_ = text; +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp3_ = text; +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp4_ = strlen (_tmp3_); +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp5_ = _tmp4_; +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp7_ = g_locale_to_utf8 (_tmp2_, (gssize) _tmp5_, &_tmp6_, NULL, NULL); +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + bytes_read = _tmp6_; +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 102 "/home/jens/Source/shotwell/src/util/string.vala" + output = _tmp7_; +#line 103 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp8_ = bytes_read; +#line 103 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp9_ = text; +#line 103 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp10_ = strlen (_tmp9_); +#line 103 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp11_ = _tmp10_; +#line 103 "/home/jens/Source/shotwell/src/util/string.vala" + if (_tmp8_ == ((gsize) _tmp11_)) { +#line 680 "string.c" + const gchar* _tmp12_ = NULL; +#line 104 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp12_ = charset; +#line 104 "/home/jens/Source/shotwell/src/util/string.vala" + g_debug ("string.vala:104: CONVERT: Locale is not UTF-8, convert from %s", _tmp12_); +#line 105 "/home/jens/Source/shotwell/src/util/string.vala" + result = output; +#line 105 "/home/jens/Source/shotwell/src/util/string.vala" + return result; +#line 690 "string.c" + } + } + { + gchar* _tmp13_ = NULL; + const gchar* _tmp14_ = NULL; + const gchar* _tmp15_ = NULL; + gint _tmp16_ = 0; + gint _tmp17_ = 0; + gsize _tmp18_ = 0UL; + gchar* _tmp19_ = NULL; + gchar* _tmp20_ = NULL; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp14_ = text; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp15_ = text; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp16_ = strlen (_tmp15_); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp17_ = _tmp16_; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp19_ = g_convert (_tmp14_, (gssize) _tmp17_, "UTF-8", "WINDOWS-1252", &_tmp18_, NULL, &_inner_error_); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + bytes_read = _tmp18_; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp13_ = _tmp19_; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + if (_inner_error_->domain == G_CONVERT_ERROR) { +#line 720 "string.c" + goto __catch6_g_convert_error; + } +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + g_clear_error (&_inner_error_); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + return NULL; +#line 731 "string.c" + } +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp20_ = _tmp13_; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp13_ = NULL; +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 110 "/home/jens/Source/shotwell/src/util/string.vala" + output = _tmp20_; +#line 111 "/home/jens/Source/shotwell/src/util/string.vala" + charset = "WINDOWS-1252"; +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (_tmp13_); +#line 745 "string.c" + } + goto __finally6; + __catch6_g_convert_error: + { + GError* _error_ = NULL; + GError* _tmp21_ = NULL; +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + _error_ = _inner_error_; +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + _inner_error_ = NULL; +#line 113 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp21_ = _error_; +#line 113 "/home/jens/Source/shotwell/src/util/string.vala" + if (g_error_matches (_tmp21_, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION)) { +#line 760 "string.c" + { + gchar* _tmp22_ = NULL; + const gchar* _tmp23_ = NULL; + const gchar* _tmp24_ = NULL; + gint _tmp25_ = 0; + gint _tmp26_ = 0; + gsize _tmp27_ = 0UL; + gchar* _tmp28_ = NULL; + gchar* _tmp29_ = NULL; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp23_ = text; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp24_ = text; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp25_ = strlen (_tmp24_); +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp26_ = _tmp25_; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp28_ = g_convert (_tmp23_, (gssize) _tmp26_, "UTF-8", "ISO-8859-1", &_tmp27_, NULL, &_inner_error_); +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + bytes_read = _tmp27_; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp22_ = _tmp28_; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 786 "string.c" + goto __catch7_g_error; + } +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp29_ = _tmp22_; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp22_ = NULL; +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 115 "/home/jens/Source/shotwell/src/util/string.vala" + output = _tmp29_; +#line 116 "/home/jens/Source/shotwell/src/util/string.vala" + charset = "ISO-8859-1"; +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (_tmp22_); +#line 801 "string.c" + } + goto __finally7; + __catch7_g_error: + { + GError* _error_ = NULL; +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _error_ = _inner_error_; +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _inner_error_ = NULL; +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _g_error_free0 (_error_); +#line 813 "string.c" + } + __finally7: +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _g_error_free0 (_error_); +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _g_error_free0 (_error_); +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + g_clear_error (&_inner_error_); +#line 114 "/home/jens/Source/shotwell/src/util/string.vala" + return NULL; +#line 830 "string.c" + } + } +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + _g_error_free0 (_error_); +#line 835 "string.c" + } + __finally6: +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + g_clear_error (&_inner_error_); +#line 109 "/home/jens/Source/shotwell/src/util/string.vala" + return NULL; +#line 848 "string.c" + } +#line 121 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp30_ = bytes_read; +#line 121 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp31_ = text; +#line 121 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp32_ = strlen (_tmp31_); +#line 121 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp33_ = _tmp32_; +#line 121 "/home/jens/Source/shotwell/src/util/string.vala" + if (_tmp30_ == ((gsize) _tmp33_)) { +#line 860 "string.c" + const gchar* _tmp34_ = NULL; +#line 122 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp34_ = charset; +#line 122 "/home/jens/Source/shotwell/src/util/string.vala" + g_debug ("string.vala:122: CONVERT: Guessed conversion from %s", _tmp34_); +#line 124 "/home/jens/Source/shotwell/src/util/string.vala" + result = output; +#line 124 "/home/jens/Source/shotwell/src/util/string.vala" + return result; +#line 870 "string.c" + } +#line 127 "/home/jens/Source/shotwell/src/util/string.vala" + result = NULL; +#line 127 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (output); +#line 127 "/home/jens/Source/shotwell/src/util/string.vala" + return result; +#line 878 "string.c" +} + + static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 632 "string.c" +#line 901 "string.c" } @@ -639,231 +909,242 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar _tmp3_ = '\0'; -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 663 "string.c" +#line 932 "string.c" } gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length) { gchar* result = NULL; const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - PrepareInputTextOptions _tmp2_ = 0; gchar* prepped = NULL; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - PrepareInputTextOptions _tmp10_ = 0; - PrepareInputTextOptions _tmp13_ = 0; - PrepareInputTextOptions _tmp16_ = 0; - gboolean _tmp19_ = FALSE; - PrepareInputTextOptions _tmp20_ = 0; - gint _tmp23_ = 0; -#line 95 "/home/jens/Source/shotwell/src/util/string.vala" + const gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + PrepareInputTextOptions _tmp3_ = 0; + PrepareInputTextOptions _tmp12_ = 0; + PrepareInputTextOptions _tmp15_ = 0; + PrepareInputTextOptions _tmp18_ = 0; + gboolean _tmp21_ = FALSE; + PrepareInputTextOptions _tmp22_ = 0; + gint _tmp25_ = 0; +#line 131 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = text; -#line 95 "/home/jens/Source/shotwell/src/util/string.vala" +#line 131 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp0_ == NULL) { -#line 96 "/home/jens/Source/shotwell/src/util/string.vala" +#line 132 "/home/jens/Source/shotwell/src/util/string.vala" result = NULL; -#line 96 "/home/jens/Source/shotwell/src/util/string.vala" +#line 132 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 689 "string.c" +#line 957 "string.c" } -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp2_ = options; -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp2_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) != 0) { -#line 695 "string.c" - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp3_ = text; -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp4_ = g_utf8_validate (_tmp3_, (gssize) -1, NULL); -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = !_tmp4_; -#line 704 "string.c" - } else { -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp1_ = FALSE; -#line 708 "string.c" - } -#line 98 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp1_) { -#line 712 "string.c" - const gchar* _tmp5_ = NULL; - PrepareInputTextOptions _tmp6_ = 0; - gchar* _tmp7_ = NULL; -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp6_ = options; -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp6_ & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) { -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = NULL; -#line 722 "string.c" - } else { -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp5_ = ""; -#line 726 "string.c" +#line 134 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp1_ = text; +#line 134 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp2_ = g_strdup (_tmp1_); +#line 134 "/home/jens/Source/shotwell/src/util/string.vala" + prepped = _tmp2_; +#line 135 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp3_ = options; +#line 135 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp3_ & PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) == PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) { +#line 969 "string.c" + const gchar* _tmp4_ = NULL; + gboolean _tmp5_ = FALSE; +#line 136 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp4_ = text; +#line 136 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp5_ = g_utf8_validate (_tmp4_, (gssize) -1, NULL); +#line 136 "/home/jens/Source/shotwell/src/util/string.vala" + if (!_tmp5_) { +#line 978 "string.c" + const gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + const gchar* _tmp8_ = NULL; +#line 137 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp6_ = text; +#line 137 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp7_ = guess_convert (_tmp6_); +#line 137 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (prepped); +#line 137 "/home/jens/Source/shotwell/src/util/string.vala" + prepped = _tmp7_; +#line 139 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp8_ = prepped; +#line 139 "/home/jens/Source/shotwell/src/util/string.vala" + if (_tmp8_ == NULL) { +#line 994 "string.c" + const gchar* _tmp9_ = NULL; + PrepareInputTextOptions _tmp10_ = 0; + gchar* _tmp11_ = NULL; +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp10_ = options; +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp10_ & PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL) != 0) { +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp9_ = NULL; +#line 1004 "string.c" + } else { +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp9_ = ""; +#line 1008 "string.c" + } +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp11_ = g_strdup (_tmp9_); +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + result = _tmp11_; +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + _g_free0 (prepped); +#line 140 "/home/jens/Source/shotwell/src/util/string.vala" + return result; +#line 1018 "string.c" + } } -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp7_ = g_strdup (_tmp5_); -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp7_; -#line 99 "/home/jens/Source/shotwell/src/util/string.vala" - return result; -#line 734 "string.c" } -#line 101 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp8_ = text; -#line 101 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp9_ = g_strdup (_tmp8_); -#line 101 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp9_; -#line 107 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp10_ = options; -#line 107 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp10_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) { -#line 746 "string.c" - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; -#line 108 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp11_ = prepped; -#line 108 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp12_ = g_utf8_normalize (_tmp11_, (gssize) -1, G_NORMALIZE_NFC); -#line 108 "/home/jens/Source/shotwell/src/util/string.vala" +#line 149 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp12_ = options; +#line 149 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp12_ & PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) != 0) { +#line 1026 "string.c" + const gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; +#line 150 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp13_ = prepped; +#line 150 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp14_ = g_utf8_normalize (_tmp13_, (gssize) -1, G_NORMALIZE_NFC); +#line 150 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); -#line 108 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp12_; -#line 757 "string.c" +#line 150 "/home/jens/Source/shotwell/src/util/string.vala" + prepped = _tmp14_; +#line 1037 "string.c" } -#line 110 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp13_ = options; -#line 110 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp13_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) { -#line 763 "string.c" - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; -#line 111 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp14_ = prepped; -#line 111 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp15_ = string_strip (_tmp14_); -#line 111 "/home/jens/Source/shotwell/src/util/string.vala" +#line 152 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp15_ = options; +#line 152 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp15_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP) != 0) { +#line 1043 "string.c" + const gchar* _tmp16_ = NULL; + gchar* _tmp17_ = NULL; +#line 153 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp16_ = prepped; +#line 153 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp17_ = string_strip (_tmp16_); +#line 153 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); -#line 111 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp15_; -#line 774 "string.c" +#line 153 "/home/jens/Source/shotwell/src/util/string.vala" + prepped = _tmp17_; +#line 1054 "string.c" } -#line 115 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp16_ = options; -#line 115 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp16_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) { -#line 780 "string.c" - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; -#line 116 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp17_ = prepped; -#line 116 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp18_ = string_delimit (_tmp17_, "\n\r", ' '); -#line 116 "/home/jens/Source/shotwell/src/util/string.vala" +#line 157 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp18_ = options; +#line 157 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp18_ & PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) != 0) { +#line 1060 "string.c" + const gchar* _tmp19_ = NULL; + gchar* _tmp20_ = NULL; +#line 158 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp19_ = prepped; +#line 158 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp20_ = string_delimit (_tmp19_, "\n\r", ' '); +#line 158 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); -#line 116 "/home/jens/Source/shotwell/src/util/string.vala" - prepped = _tmp18_; -#line 791 "string.c" +#line 158 "/home/jens/Source/shotwell/src/util/string.vala" + prepped = _tmp20_; +#line 1071 "string.c" } -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp20_ = options; -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - if ((_tmp20_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) { -#line 797 "string.c" - const gchar* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp21_ = prepped; -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp22_ = is_string_empty (_tmp21_); -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp19_ = _tmp22_; -#line 806 "string.c" +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp22_ = options; +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + if ((_tmp22_ & PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) != 0) { +#line 1077 "string.c" + const gchar* _tmp23_ = NULL; + gboolean _tmp24_ = FALSE; +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp23_ = prepped; +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp24_ = is_string_empty (_tmp23_); +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp21_ = _tmp24_; +#line 1086 "string.c" } else { -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp19_ = FALSE; -#line 810 "string.c" +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp21_ = FALSE; +#line 1090 "string.c" } -#line 118 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp19_) { -#line 119 "/home/jens/Source/shotwell/src/util/string.vala" +#line 160 "/home/jens/Source/shotwell/src/util/string.vala" + if (_tmp21_) { +#line 161 "/home/jens/Source/shotwell/src/util/string.vala" result = NULL; -#line 119 "/home/jens/Source/shotwell/src/util/string.vala" +#line 161 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); -#line 119 "/home/jens/Source/shotwell/src/util/string.vala" +#line 161 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 820 "string.c" +#line 1100 "string.c" } -#line 124 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp23_ = dest_length; -#line 124 "/home/jens/Source/shotwell/src/util/string.vala" - if (_tmp23_ >= 0) { -#line 826 "string.c" +#line 166 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp25_ = dest_length; +#line 166 "/home/jens/Source/shotwell/src/util/string.vala" + if (_tmp25_ >= 0) { +#line 1106 "string.c" GString* sb = NULL; - const gchar* _tmp24_ = NULL; - GString* _tmp25_ = NULL; - GString* _tmp26_ = NULL; - gint _tmp27_ = 0; + const gchar* _tmp26_ = NULL; + GString* _tmp27_ = NULL; GString* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; -#line 125 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp24_ = prepped; -#line 125 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp25_ = g_string_new (_tmp24_); -#line 125 "/home/jens/Source/shotwell/src/util/string.vala" - sb = _tmp25_; -#line 126 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp26_ = sb; -#line 126 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp27_ = dest_length; -#line 126 "/home/jens/Source/shotwell/src/util/string.vala" - g_string_truncate (_tmp26_, (gsize) _tmp27_); -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" + gint _tmp29_ = 0; + GString* _tmp30_ = NULL; + const gchar* _tmp31_ = NULL; + gchar* _tmp32_ = NULL; +#line 167 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp26_ = prepped; +#line 167 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp27_ = g_string_new (_tmp26_); +#line 167 "/home/jens/Source/shotwell/src/util/string.vala" + sb = _tmp27_; +#line 168 "/home/jens/Source/shotwell/src/util/string.vala" _tmp28_ = sb; -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp29_ = _tmp28_->str; -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" - _tmp30_ = g_strdup (_tmp29_); -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" - result = _tmp30_; -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" +#line 168 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp29_ = dest_length; +#line 168 "/home/jens/Source/shotwell/src/util/string.vala" + g_string_truncate (_tmp28_, (gsize) _tmp29_); +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp30_ = sb; +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp31_ = _tmp30_->str; +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" + _tmp32_ = g_strdup (_tmp31_); +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" + result = _tmp32_; +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (sb); -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (prepped); -#line 127 "/home/jens/Source/shotwell/src/util/string.vala" +#line 169 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 861 "string.c" +#line 1141 "string.c" } -#line 131 "/home/jens/Source/shotwell/src/util/string.vala" +#line 173 "/home/jens/Source/shotwell/src/util/string.vala" result = prepped; -#line 131 "/home/jens/Source/shotwell/src/util/string.vala" +#line 173 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 867 "string.c" +#line 1147 "string.c" } @@ -872,19 +1153,19 @@ gint64 parse_int64 (const gchar* str, gint num_base) { const gchar* _tmp0_ = NULL; gint _tmp1_ = 0; gint64 _tmp2_ = 0LL; -#line 134 "/home/jens/Source/shotwell/src/util/string.vala" +#line 176 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, 0LL); -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" +#line 177 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = str; -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" +#line 177 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = num_base; -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" +#line 177 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = g_ascii_strtoll (_tmp0_, NULL, (guint) _tmp1_); -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" +#line 177 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp2_; -#line 135 "/home/jens/Source/shotwell/src/util/string.vala" +#line 177 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 888 "string.c" +#line 1168 "string.c" } @@ -895,35 +1176,35 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 913 "string.c" +#line 1193 "string.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 921 "string.c" +#line 1201 "string.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 927 "string.c" +#line 1207 "string.c" } } @@ -933,19 +1214,19 @@ inline gboolean string_contains_char (const gchar* haystack, gunichar needle) { const gchar* _tmp0_ = NULL; gunichar _tmp1_ = 0U; gint _tmp2_ = 0; -#line 140 "/home/jens/Source/shotwell/src/util/string.vala" +#line 182 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, FALSE); -#line 141 "/home/jens/Source/shotwell/src/util/string.vala" +#line 183 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 141 "/home/jens/Source/shotwell/src/util/string.vala" +#line 183 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = needle; -#line 141 "/home/jens/Source/shotwell/src/util/string.vala" +#line 183 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = string_index_of_char (_tmp0_, _tmp1_, 0); -#line 141 "/home/jens/Source/shotwell/src/util/string.vala" +#line 183 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp2_ >= 0; -#line 141 "/home/jens/Source/shotwell/src/util/string.vala" +#line 183 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 949 "string.c" +#line 1229 "string.c" } @@ -956,37 +1237,37 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 976 "string.c" +#line 1256 "string.c" gchar* _tmp4_ = NULL; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 984 "string.c" +#line 1264 "string.c" } else { -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 990 "string.c" +#line 1270 "string.c" } } @@ -996,21 +1277,21 @@ inline gboolean string_contains_str (const gchar* haystack, const gchar* needle) const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 144 "/home/jens/Source/shotwell/src/util/string.vala" +#line 186 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, FALSE); -#line 144 "/home/jens/Source/shotwell/src/util/string.vala" +#line 186 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, FALSE); -#line 145 "/home/jens/Source/shotwell/src/util/string.vala" +#line 187 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 145 "/home/jens/Source/shotwell/src/util/string.vala" +#line 187 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = needle; -#line 145 "/home/jens/Source/shotwell/src/util/string.vala" +#line 187 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = string_index_of (_tmp0_, _tmp1_, 0); -#line 145 "/home/jens/Source/shotwell/src/util/string.vala" +#line 187 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp2_ >= 0; -#line 145 "/home/jens/Source/shotwell/src/util/string.vala" +#line 187 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1014 "string.c" +#line 1294 "string.c" } @@ -1031,105 +1312,105 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 1047 "string.c" +#line 1327 "string.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 1056 "string.c" +#line 1336 "string.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 1062 "string.c" +#line 1342 "string.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 1071 "string.c" +#line 1351 "string.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 1077 "string.c" +#line 1357 "string.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 1086 "string.c" +#line 1366 "string.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 1090 "string.c" +#line 1370 "string.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { -#line 1098 "string.c" +#line 1378 "string.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; -#line 1107 "string.c" +#line 1387 "string.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 1111 "string.c" +#line 1391 "string.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1133 "string.c" +#line 1413 "string.c" } @@ -1137,48 +1418,48 @@ inline gchar* string_sliced_at (const gchar* str, gint index) { gchar* result = NULL; gchar* _tmp0_ = NULL; gint _tmp1_ = 0; -#line 148 "/home/jens/Source/shotwell/src/util/string.vala" +#line 190 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = index; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp1_ >= 0) { -#line 1147 "string.c" +#line 1427 "string.c" const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; const gchar* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; gchar* _tmp7_ = NULL; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = str; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = index; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = str; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = strlen (_tmp4_); -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = _tmp5_; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = string_slice (_tmp2_, (glong) _tmp3_, (glong) _tmp6_); -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = _tmp7_; -#line 1170 "string.c" +#line 1450 "string.c" } else { -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp0_); -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = NULL; -#line 1176 "string.c" +#line 1456 "string.c" } -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp0_; -#line 149 "/home/jens/Source/shotwell/src/util/string.vala" +#line 191 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1182 "string.c" +#line 1462 "string.c" } @@ -1190,27 +1471,27 @@ inline gchar* string_sliced_at_first_str (const gchar* haystack, const gchar* ne gint _tmp3_ = 0; gint _tmp4_ = 0; gchar* _tmp5_ = NULL; -#line 152 "/home/jens/Source/shotwell/src/util/string.vala" +#line 194 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); -#line 152 "/home/jens/Source/shotwell/src/util/string.vala" +#line 194 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, NULL); -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = haystack; -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = needle; -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = start_index; -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = string_index_of (_tmp1_, _tmp2_, _tmp3_); -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp5_; -#line 153 "/home/jens/Source/shotwell/src/util/string.vala" +#line 195 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1214 "string.c" +#line 1494 "string.c" } @@ -1221,37 +1502,37 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1241 "string.c" +#line 1521 "string.c" gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1249 "string.c" +#line 1529 "string.c" } else { -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1255 "string.c" +#line 1535 "string.c" } } @@ -1264,27 +1545,27 @@ inline gchar* string_sliced_at_last_str (const gchar* haystack, const gchar* nee gint _tmp3_ = 0; gint _tmp4_ = 0; gchar* _tmp5_ = NULL; -#line 156 "/home/jens/Source/shotwell/src/util/string.vala" +#line 198 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); -#line 156 "/home/jens/Source/shotwell/src/util/string.vala" +#line 198 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (needle != NULL, NULL); -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = haystack; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = needle; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = start_index; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = string_last_index_of (_tmp1_, _tmp2_, _tmp3_); -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp5_; -#line 157 "/home/jens/Source/shotwell/src/util/string.vala" +#line 199 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1288 "string.c" +#line 1568 "string.c" } @@ -1296,25 +1577,25 @@ inline gchar* string_sliced_at_first_char (const gchar* haystack, gunichar ch, g gint _tmp3_ = 0; gint _tmp4_ = 0; gchar* _tmp5_ = NULL; -#line 160 "/home/jens/Source/shotwell/src/util/string.vala" +#line 202 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = haystack; -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = ch; -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = start_index; -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = string_index_of_char (_tmp1_, _tmp2_, _tmp3_); -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp5_; -#line 161 "/home/jens/Source/shotwell/src/util/string.vala" +#line 203 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1318 "string.c" +#line 1598 "string.c" } @@ -1325,35 +1606,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1343 "string.c" +#line 1623 "string.c" gchar* _tmp4_ = NULL; -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1351 "string.c" +#line 1631 "string.c" } else { -#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1357 "string.c" +#line 1637 "string.c" } } @@ -1366,25 +1647,25 @@ inline gchar* string_sliced_at_last_char (const gchar* haystack, gunichar ch, gi gint _tmp3_ = 0; gint _tmp4_ = 0; gchar* _tmp5_ = NULL; -#line 164 "/home/jens/Source/shotwell/src/util/string.vala" +#line 206 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (haystack != NULL, NULL); -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = haystack; -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = haystack; -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = ch; -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = start_index; -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = string_last_index_of_char (_tmp1_, _tmp2_, _tmp3_); -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = string_sliced_at (_tmp0_, _tmp4_); -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp5_; -#line 165 "/home/jens/Source/shotwell/src/util/string.vala" +#line 207 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1388 "string.c" +#line 1668 "string.c" } @@ -1392,17 +1673,17 @@ static gunichar string_get_char (const gchar* self, glong index) { gunichar result = 0U; glong _tmp0_ = 0L; gunichar _tmp1_ = 0U; -#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0U); -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1406 "string.c" +#line 1686 "string.c" } @@ -1414,30 +1695,30 @@ gchar* string_strip_leading_zeroes (const gchar* str) { GString* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 169 "/home/jens/Source/shotwell/src/util/string.vala" +#line 211 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); -#line 170 "/home/jens/Source/shotwell/src/util/string.vala" +#line 212 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_string_new (""); -#line 170 "/home/jens/Source/shotwell/src/util/string.vala" +#line 212 "/home/jens/Source/shotwell/src/util/string.vala" stripped = _tmp0_; -#line 171 "/home/jens/Source/shotwell/src/util/string.vala" +#line 213 "/home/jens/Source/shotwell/src/util/string.vala" prev_is_space = TRUE; -#line 1426 "string.c" +#line 1706 "string.c" { const gchar* iter = NULL; const gchar* _tmp1_ = NULL; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = str; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" iter = _tmp1_; -#line 1434 "string.c" +#line 1714 "string.c" { gboolean _tmp2_ = FALSE; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = TRUE; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1441 "string.c" +#line 1721 "string.c" const gchar* _tmp5_ = NULL; gunichar _tmp6_ = 0U; gunichar ch = 0U; @@ -1445,89 +1726,89 @@ gchar* string_strip_leading_zeroes (const gchar* str) { gunichar _tmp8_ = 0U; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp2_) { -#line 1451 "string.c" +#line 1731 "string.c" const gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = iter; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = g_utf8_next_char (_tmp3_); -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" iter = _tmp4_; -#line 1460 "string.c" +#line 1740 "string.c" } -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = FALSE; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = iter; -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = string_get_char (_tmp5_, (glong) 0); -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" if (!(_tmp6_ != ((gunichar) 0))) { -#line 172 "/home/jens/Source/shotwell/src/util/string.vala" +#line 214 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1472 "string.c" +#line 1752 "string.c" } -#line 173 "/home/jens/Source/shotwell/src/util/string.vala" +#line 215 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = iter; -#line 173 "/home/jens/Source/shotwell/src/util/string.vala" +#line 215 "/home/jens/Source/shotwell/src/util/string.vala" _tmp8_ = string_get_char (_tmp7_, (glong) 0); -#line 173 "/home/jens/Source/shotwell/src/util/string.vala" +#line 215 "/home/jens/Source/shotwell/src/util/string.vala" ch = _tmp8_; -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" _tmp10_ = prev_is_space; -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" if (!_tmp10_) { -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = TRUE; -#line 1486 "string.c" +#line 1766 "string.c" } else { gunichar _tmp11_ = 0U; -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" _tmp11_ = ch; -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = _tmp11_ != ((gunichar) '0'); -#line 1493 "string.c" +#line 1773 "string.c" } -#line 175 "/home/jens/Source/shotwell/src/util/string.vala" +#line 217 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp9_) { -#line 1497 "string.c" +#line 1777 "string.c" GString* _tmp12_ = NULL; gunichar _tmp13_ = 0U; gunichar _tmp14_ = 0U; gboolean _tmp15_ = FALSE; -#line 176 "/home/jens/Source/shotwell/src/util/string.vala" +#line 218 "/home/jens/Source/shotwell/src/util/string.vala" _tmp12_ = stripped; -#line 176 "/home/jens/Source/shotwell/src/util/string.vala" +#line 218 "/home/jens/Source/shotwell/src/util/string.vala" _tmp13_ = ch; -#line 176 "/home/jens/Source/shotwell/src/util/string.vala" +#line 218 "/home/jens/Source/shotwell/src/util/string.vala" g_string_append_unichar (_tmp12_, _tmp13_); -#line 177 "/home/jens/Source/shotwell/src/util/string.vala" +#line 219 "/home/jens/Source/shotwell/src/util/string.vala" _tmp14_ = ch; -#line 177 "/home/jens/Source/shotwell/src/util/string.vala" +#line 219 "/home/jens/Source/shotwell/src/util/string.vala" _tmp15_ = g_unichar_isspace (_tmp14_); -#line 177 "/home/jens/Source/shotwell/src/util/string.vala" +#line 219 "/home/jens/Source/shotwell/src/util/string.vala" prev_is_space = _tmp15_; -#line 1514 "string.c" +#line 1794 "string.c" } } } } -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" _tmp16_ = stripped; -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" _tmp17_ = _tmp16_->str; -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" _tmp18_ = g_strdup (_tmp17_); -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp18_; -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (stripped); -#line 181 "/home/jens/Source/shotwell/src/util/string.vala" +#line 223 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1531 "string.c" +#line 1811 "string.c" } @@ -1537,56 +1818,56 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar* gint _tmp0_ = 0; gunichar _tmp1_ = 0U; gunichar _tmp2_ = 0U; -#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = *index; -#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _vala_c = _tmp1_; -#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _vala_c; -#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ != ((gunichar) 0)) { -#line 1553 "string.c" +#line 1833 "string.c" gint _tmp3_ = 0; gchar* _tmp4_ = NULL; -#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = *index; -#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_); -#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *index = (gint) (_tmp4_ - ((gchar*) self)); -#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = TRUE; -#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (c) { -#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1568 "string.c" +#line 1848 "string.c" } -#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1572 "string.c" +#line 1852 "string.c" } else { -#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = FALSE; -#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (c) { -#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1580 "string.c" +#line 1860 "string.c" } -#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 1584 "string.c" +#line 1864 "string.c" } -#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (c) { -#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *c = _vala_c; -#line 1590 "string.c" +#line 1870 "string.c" } } @@ -1600,17 +1881,17 @@ gchar* string_remove_diacritics (const gchar* istring) { GString* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 184 "/home/jens/Source/shotwell/src/util/string.vala" +#line 226 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (istring != NULL, NULL); -#line 185 "/home/jens/Source/shotwell/src/util/string.vala" +#line 227 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_string_new (""); -#line 185 "/home/jens/Source/shotwell/src/util/string.vala" +#line 227 "/home/jens/Source/shotwell/src/util/string.vala" builder = _tmp0_; -#line 187 "/home/jens/Source/shotwell/src/util/string.vala" +#line 229 "/home/jens/Source/shotwell/src/util/string.vala" i = 0; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1614 "string.c" +#line 1894 "string.c" const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -1621,76 +1902,76 @@ gchar* string_remove_diacritics (const gchar* istring) { GUnicodeType _tmp8_ = 0; GString* _tmp9_ = NULL; gunichar _tmp10_ = 0U; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = istring; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = g_utf8_normalize (_tmp1_, (gssize) -1, G_NORMALIZE_DEFAULT); -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = _tmp2_; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = string_get_next_char (_tmp3_, &i, &_tmp4_); -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" ch = _tmp4_; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = !_tmp5_; -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp3_); -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp6_) { -#line 188 "/home/jens/Source/shotwell/src/util/string.vala" +#line 230 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1643 "string.c" +#line 1923 "string.c" } -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = ch; -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" _tmp8_ = g_unichar_type (_tmp7_); -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" switch (_tmp8_) { -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_CONTROL: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_FORMAT: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_UNASSIGNED: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_NON_SPACING_MARK: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_COMBINING_MARK: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" case G_UNICODE_ENCLOSING_MARK: -#line 1663 "string.c" +#line 1943 "string.c" { -#line 197 "/home/jens/Source/shotwell/src/util/string.vala" +#line 239 "/home/jens/Source/shotwell/src/util/string.vala" continue; -#line 1667 "string.c" +#line 1947 "string.c" } default: -#line 189 "/home/jens/Source/shotwell/src/util/string.vala" +#line 231 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1672 "string.c" +#line 1952 "string.c" } -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" +#line 241 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = builder; -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" +#line 241 "/home/jens/Source/shotwell/src/util/string.vala" _tmp10_ = ch; -#line 199 "/home/jens/Source/shotwell/src/util/string.vala" +#line 241 "/home/jens/Source/shotwell/src/util/string.vala" g_string_append_unichar (_tmp9_, _tmp10_); -#line 1680 "string.c" +#line 1960 "string.c" } -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" _tmp11_ = builder; -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" _tmp12_ = _tmp11_->str; -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" _tmp13_ = g_strdup (_tmp12_); -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp13_; -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (builder); -#line 201 "/home/jens/Source/shotwell/src/util/string.vala" +#line 243 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1694 "string.c" +#line 1974 "string.c" } @@ -1703,67 +1984,67 @@ gchar* string_to_hex_string (const gchar* str) { GString* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 204 "/home/jens/Source/shotwell/src/util/string.vala" +#line 246 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (str != NULL, NULL); -#line 205 "/home/jens/Source/shotwell/src/util/string.vala" +#line 247 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_string_new (""); -#line 205 "/home/jens/Source/shotwell/src/util/string.vala" +#line 247 "/home/jens/Source/shotwell/src/util/string.vala" builder = _tmp0_; -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" +#line 249 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = str; -#line 207 "/home/jens/Source/shotwell/src/util/string.vala" +#line 249 "/home/jens/Source/shotwell/src/util/string.vala" data = (guint8*) _tmp1_; -#line 208 "/home/jens/Source/shotwell/src/util/string.vala" +#line 250 "/home/jens/Source/shotwell/src/util/string.vala" while (TRUE) { -#line 1719 "string.c" +#line 1999 "string.c" guint8* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; guint8* _tmp4_ = NULL; GString* _tmp5_ = NULL; guint8* _tmp6_ = NULL; -#line 208 "/home/jens/Source/shotwell/src/util/string.vala" +#line 250 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = data; -#line 208 "/home/jens/Source/shotwell/src/util/string.vala" +#line 250 "/home/jens/Source/shotwell/src/util/string.vala" if (!(((gint) (*_tmp2_)) != 0)) { -#line 208 "/home/jens/Source/shotwell/src/util/string.vala" +#line 250 "/home/jens/Source/shotwell/src/util/string.vala" break; -#line 1731 "string.c" +#line 2011 "string.c" } -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = data; -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" if (((gint) (*_tmp4_)) != 0) { -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = " "; -#line 1739 "string.c" +#line 2019 "string.c" } else { -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = ""; -#line 1743 "string.c" +#line 2023 "string.c" } -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = builder; -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = data; -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" data = _tmp6_ + 1; -#line 209 "/home/jens/Source/shotwell/src/util/string.vala" +#line 251 "/home/jens/Source/shotwell/src/util/string.vala" g_string_append_printf (_tmp5_, "%02Xh%s", (guint) (*_tmp6_), _tmp3_); -#line 1753 "string.c" +#line 2033 "string.c" } -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = builder; -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" _tmp8_ = _tmp7_->str; -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = g_strdup (_tmp8_); -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp9_; -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" _g_string_free0 (builder); -#line 211 "/home/jens/Source/shotwell/src/util/string.vala" +#line 253 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1767 "string.c" +#line 2047 "string.c" } @@ -1777,31 +2058,31 @@ guint string_collated_hash (void* ptr) { gchar* _tmp4_ = NULL; guint _tmp5_ = 0U; guint _tmp6_ = 0U; -#line 231 "/home/jens/Source/shotwell/src/util/string.vala" +#line 273 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = ptr; -#line 231 "/home/jens/Source/shotwell/src/util/string.vala" +#line 273 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = g_strdup ((const gchar*) _tmp0_); -#line 231 "/home/jens/Source/shotwell/src/util/string.vala" +#line 273 "/home/jens/Source/shotwell/src/util/string.vala" str = _tmp1_; -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = g_str_hash; -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = g_utf8_collate_key (str, (gssize) -1); -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = _tmp3_; -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = _tmp2_ (_tmp4_); -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = _tmp5_; -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (_tmp4_); -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp6_; -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (str); -#line 233 "/home/jens/Source/shotwell/src/util/string.vala" +#line 275 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1805 "string.c" +#line 2085 "string.c" } @@ -1810,17 +2091,17 @@ guint string_precollated_hash (void* ptr) { GHashFunc _tmp0_ = NULL; void* _tmp1_ = NULL; guint _tmp2_ = 0U; -#line 238 "/home/jens/Source/shotwell/src/util/string.vala" +#line 280 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_str_hash; -#line 238 "/home/jens/Source/shotwell/src/util/string.vala" +#line 280 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = ptr; -#line 238 "/home/jens/Source/shotwell/src/util/string.vala" +#line 280 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = _tmp0_ ((const gchar*) _tmp1_); -#line 238 "/home/jens/Source/shotwell/src/util/string.vala" +#line 280 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp2_; -#line 238 "/home/jens/Source/shotwell/src/util/string.vala" +#line 280 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1824 "string.c" +#line 2104 "string.c" } @@ -1838,63 +2119,63 @@ gint string_collated_compare (void* a, void* b) { gint _tmp6_ = 0; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 243 "/home/jens/Source/shotwell/src/util/string.vala" +#line 285 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = a; -#line 243 "/home/jens/Source/shotwell/src/util/string.vala" +#line 285 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = g_strdup ((const gchar*) _tmp0_); -#line 243 "/home/jens/Source/shotwell/src/util/string.vala" +#line 285 "/home/jens/Source/shotwell/src/util/string.vala" astr = _tmp1_; -#line 244 "/home/jens/Source/shotwell/src/util/string.vala" +#line 286 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = b; -#line 244 "/home/jens/Source/shotwell/src/util/string.vala" +#line 286 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = g_strdup ((const gchar*) _tmp2_); -#line 244 "/home/jens/Source/shotwell/src/util/string.vala" +#line 286 "/home/jens/Source/shotwell/src/util/string.vala" bstr = _tmp3_; -#line 246 "/home/jens/Source/shotwell/src/util/string.vala" +#line 288 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = astr; -#line 246 "/home/jens/Source/shotwell/src/util/string.vala" +#line 288 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = bstr; -#line 246 "/home/jens/Source/shotwell/src/util/string.vala" +#line 288 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = g_utf8_collate (_tmp4_, _tmp5_); -#line 246 "/home/jens/Source/shotwell/src/util/string.vala" +#line 288 "/home/jens/Source/shotwell/src/util/string.vala" _result_ = _tmp6_; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp8_ = _result_; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp8_ != 0) { -#line 1866 "string.c" +#line 2146 "string.c" gint _tmp9_ = 0; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = _result_; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = _tmp9_; -#line 1872 "string.c" +#line 2152 "string.c" } else { GCompareFunc _tmp10_ = NULL; const gchar* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gint _tmp13_ = 0; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp10_ = g_strcmp0; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp11_ = astr; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp12_ = bstr; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp13_ = _tmp10_ (_tmp11_, _tmp12_); -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = _tmp13_; -#line 1888 "string.c" +#line 2168 "string.c" } -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp7_; -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (bstr); -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" _g_free0 (astr); -#line 248 "/home/jens/Source/shotwell/src/util/string.vala" +#line 290 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1898 "string.c" +#line 2178 "string.c" } @@ -1907,57 +2188,57 @@ gint string_precollated_compare (const gchar* astr, const gchar* akey, const gch gint _tmp3_ = 0; gint _tmp4_ = 0; gint _tmp5_ = 0; -#line 252 "/home/jens/Source/shotwell/src/util/string.vala" +#line 294 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (astr != NULL, 0); -#line 252 "/home/jens/Source/shotwell/src/util/string.vala" +#line 294 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (akey != NULL, 0); -#line 252 "/home/jens/Source/shotwell/src/util/string.vala" +#line 294 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (bstr != NULL, 0); -#line 252 "/home/jens/Source/shotwell/src/util/string.vala" +#line 294 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (bkey != NULL, 0); -#line 253 "/home/jens/Source/shotwell/src/util/string.vala" +#line 295 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = g_strcmp0; -#line 253 "/home/jens/Source/shotwell/src/util/string.vala" +#line 295 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = akey; -#line 253 "/home/jens/Source/shotwell/src/util/string.vala" +#line 295 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = bkey; -#line 253 "/home/jens/Source/shotwell/src/util/string.vala" +#line 295 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = _tmp0_ (_tmp1_, _tmp2_); -#line 253 "/home/jens/Source/shotwell/src/util/string.vala" +#line 295 "/home/jens/Source/shotwell/src/util/string.vala" _result_ = _tmp3_; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp5_ = _result_; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" if (_tmp5_ != 0) { -#line 1933 "string.c" +#line 2213 "string.c" gint _tmp6_ = 0; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp6_ = _result_; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = _tmp6_; -#line 1939 "string.c" +#line 2219 "string.c" } else { GCompareFunc _tmp7_ = NULL; const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; gint _tmp10_ = 0; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp7_ = g_strcmp0; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp8_ = astr; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp9_ = bstr; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp10_ = _tmp7_ (_tmp8_, _tmp9_); -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = _tmp10_; -#line 1955 "string.c" +#line 2235 "string.c" } -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp4_; -#line 255 "/home/jens/Source/shotwell/src/util/string.vala" +#line 297 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1961 "string.c" +#line 2241 "string.c" } @@ -1966,17 +2247,17 @@ gboolean string_collated_equals (void* a, void* b) { void* _tmp0_ = NULL; void* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 260 "/home/jens/Source/shotwell/src/util/string.vala" +#line 302 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = a; -#line 260 "/home/jens/Source/shotwell/src/util/string.vala" +#line 302 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = b; -#line 260 "/home/jens/Source/shotwell/src/util/string.vala" +#line 302 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = string_collated_compare (_tmp0_, _tmp1_); -#line 260 "/home/jens/Source/shotwell/src/util/string.vala" +#line 302 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp2_ == 0; -#line 260 "/home/jens/Source/shotwell/src/util/string.vala" +#line 302 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 1980 "string.c" +#line 2260 "string.c" } @@ -1987,29 +2268,29 @@ gboolean string_precollated_equals (const gchar* astr, const gchar* akey, const const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; gint _tmp4_ = 0; -#line 264 "/home/jens/Source/shotwell/src/util/string.vala" +#line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (astr != NULL, FALSE); -#line 264 "/home/jens/Source/shotwell/src/util/string.vala" +#line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (akey != NULL, FALSE); -#line 264 "/home/jens/Source/shotwell/src/util/string.vala" +#line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (bstr != NULL, FALSE); -#line 264 "/home/jens/Source/shotwell/src/util/string.vala" +#line 306 "/home/jens/Source/shotwell/src/util/string.vala" g_return_val_if_fail (bkey != NULL, FALSE); -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" _tmp0_ = astr; -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" _tmp1_ = akey; -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" _tmp2_ = bstr; -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" _tmp3_ = bkey; -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" _tmp4_ = string_precollated_compare (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" result = _tmp4_ == 0; -#line 265 "/home/jens/Source/shotwell/src/util/string.vala" +#line 307 "/home/jens/Source/shotwell/src/util/string.vala" return result; -#line 2013 "string.c" +#line 2293 "string.c" } diff --git a/src/util/string.vala b/src/util/string.vala index 7331780..bf7e605 100644 --- a/src/util/string.vala +++ b/src/util/string.vala @@ -91,15 +91,57 @@ public enum PrepareInputTextOptions { DEFAULT = EMPTY_IS_NULL | VALIDATE | INVALID_IS_NULL | STRIP_CRLF | STRIP | NORMALIZE; } +private string? guess_convert(string text) { + string? output = null; + size_t bytes_read = 0; + unowned string charset = null; + debug ("CONVERT: Text did not validate as UTF-8, trying conversion"); + + // Try with locale + if (!GLib.get_charset(out charset)) { + output = text.locale_to_utf8(text.length, out bytes_read, null, null); + if (bytes_read == text.length) { + debug ("CONVERT: Locale is not UTF-8, convert from %s", charset); + return output; + } + } + + try { + output = GLib.convert (text, text.length, "UTF-8", "WINDOWS-1252", out bytes_read); + charset = "WINDOWS-1252"; + } catch (ConvertError error) { + if (error is ConvertError.NO_CONVERSION) { + try { + output = GLib.convert (text, text.length, "UTF-8", "ISO-8859-1", out bytes_read); + charset = "ISO-8859-1"; + } catch (Error error) { /* do nothing */ } + } + } + + if (bytes_read == text.length) { + debug ("CONVERT: Guessed conversion from %s", charset); + + return output; + } + + return null; +} + public string? prepare_input_text(string? text, PrepareInputTextOptions options, int dest_length) { if (text == null) return null; - if ((options & PrepareInputTextOptions.VALIDATE) != 0 && !text.validate()) - return (options & PrepareInputTextOptions.INVALID_IS_NULL) != 0 ? null : ""; - - string prepped = text; - + string? prepped = text; + if (PrepareInputTextOptions.VALIDATE in options) { + if (!text.validate()) { + prepped = guess_convert (text); + + if (prepped == null) { + return (options & PrepareInputTextOptions.INVALID_IS_NULL) != 0 ? null : ""; + } + } + } + // Using composed form rather than GLib's default (decomposed) as NFC is the preferred form in // Linux and WWW. More importantly, Pango seems to have serious problems displaying decomposed // forms of Korean language glyphs (and perhaps others). See: diff --git a/src/util/system.c b/src/util/system.c index cef9603..d56348e 100644 --- a/src/util/system.c +++ b/src/util/system.c @@ -1,4 +1,4 @@ -/* system.c generated by valac 0.32.1, the Vala compiler +/* system.c generated by valac 0.34.4, the Vala compiler * generated from system.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/util/ui.c b/src/util/ui.c index ee1017e..2cb3739 100644 --- a/src/util/ui.c +++ b/src/util/ui.c @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.32.1, the Vala compiler +/* ui.c generated by valac 0.34.4, the Vala compiler * generated from ui.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. |