diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2023-03-20 15:34:42 +0100 |
|---|---|---|
| committer | Corentin Noël <tintou@noel.tf> | 2023-03-20 16:19:09 +0100 |
| commit | 92efc6dcaa3245416cba8c1c688156e61b4fa02d (patch) | |
| tree | d37e1b88b7d310c64a24a484f194354c317b5899 | |
| parent | e5bef29c394dee9521879eaee1bc6252f75050f5 (diff) | |
| download | evolution-data-server-92efc6dcaa3245416cba8c1c688156e61b4fa02d.tar.gz | |
M!120 - camel: Remove the last use of GTimeVal
Replace the last occurence of GTimeVal and replace it with GDateTime.
Also use ASCII compare for 'BODY' in UID search in IMAPx.
Closes: https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/120
| -rw-r--r-- | src/camel/camel-folder-search.c | 8 | ||||
| -rw-r--r-- | src/camel/providers/imapx/camel-imapx-server.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/camel/camel-folder-search.c b/src/camel/camel-folder-search.c index 319166651..a0cd8c77e 100644 --- a/src/camel/camel-folder-search.c +++ b/src/camel/camel-folder-search.c @@ -2657,10 +2657,12 @@ camel_folder_search_util_make_time (gint argc, g_return_val_if_fail (argv != NULL, res); if (argc == 1 && argv[0]->type == CAMEL_SEXP_RES_STRING && argv[0]->value.string) { - GTimeVal tv; + GDateTime *datetime; - if (g_time_val_from_iso8601 (argv[0]->value.string, &tv)) { - res = tv.tv_sec; + datetime = g_date_time_new_from_iso8601 (argv[0]->value.string, NULL); + if (datetime) { + res = g_date_time_to_unix (datetime); + g_date_time_unref (datetime); } else if (strlen (argv[0]->value.string) == 8) { gint num; diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c index 95918a022..e43d3ed38 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -6916,7 +6916,7 @@ camel_imapx_server_uid_search_sync (CamelIMAPXServer *is, if (search_key && words) { gboolean is_gmail_server = FALSE; - if (g_strcasecmp (search_key, "BODY") == 0) { + if (g_ascii_strcasecmp (search_key, "BODY") == 0) { CamelIMAPXStore *imapx_store; imapx_store = camel_imapx_server_ref_store (is); |