[geary/ricotz/vala: 44/45] engine: Don't use custom binding of g_utf8_collate_key()
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/ricotz/vala: 44/45] engine: Don't use custom binding of g_utf8_collate_key()
- Date: Tue, 9 Nov 2021 16:04:39 +0000 (UTC)
commit ac67638fde8d54f0021d4cd7e5f721455e5e7ab2
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Tue Apr 27 08:47:34 2021 +0200
engine: Don't use custom binding of g_utf8_collate_key()
src/engine/imap-db/imap-db-database.vala | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/imap-db/imap-db-database.vala b/src/engine/imap-db/imap-db-database.vala
index 45286f9b0..1ca912f0e 100644
--- a/src/engine/imap-db/imap-db-database.vala
+++ b/src/engine/imap-db/imap-db-database.vala
@@ -5,8 +5,6 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
-[CCode (cname = "g_utf8_collate_key")]
-extern string utf8_collate_key(string data, ssize_t len);
extern int sqlite3_register_fts5_tokeniser(Sqlite.Database db);
extern int sqlite3_register_fts5_matches(Sqlite.Database db);
extern int sqlite3_register_legacy_tokenizer(Sqlite.Database db);
@@ -58,11 +56,11 @@ private class Geary.ImapDB.Database : Geary.Db.VersionedDatabase {
// Don't need to normalise, collate_key() will do it for us
string? a_str = null;
if (a_bytes != null) {
- a_str = utf8_collate_key((string) a_bytes, a_len);
+ a_str = ((string) a_bytes).collate_key (a_len);
}
string? b_str = null;
if (b_bytes != null) {
- b_str = utf8_collate_key((string) b_bytes, b_len);
+ b_str = ((string) b_bytes).collate_key (b_len);
}
return GLib.strcmp(a_str, b_str);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]