From 6cea3db6d5ca7a06084546f4dc925b5be600f3e2 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Mon, 23 Feb 2009 12:58:21 +0000 Subject: [PATCH] * Fixes NB#102745, fixes dbus search by date pmo-trunk-r7642 --- libmodest-dbus-client/libmodest-dbus-client.c | 4 ++-- src/dbus_api/modest-dbus-callbacks.c | 4 ++-- src/modest-search.c | 14 +++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libmodest-dbus-client/libmodest-dbus-client.c b/libmodest-dbus-client/libmodest-dbus-client.c index 183d179..d4ab4c9 100644 --- a/libmodest-dbus-client/libmodest-dbus-client.c +++ b/libmodest-dbus-client/libmodest-dbus-client.c @@ -614,8 +614,8 @@ libmodest_dbus_client_search (osso_context_t *osso_ctx, folder = ""; } - sd_v = start_date; - ed_v = end_date; + sd_v = (dbus_int64_t) start_date; + ed_v = (dbus_int64_t) end_date; flags_v = (dbus_int32_t) flags; size_v = (dbus_uint32_t) min_size; diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 39d9466..28b60ef 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -1528,12 +1528,12 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) } if (sd_v > 0) { - search->flags |= MODEST_SEARCH_BEFORE; + search->flags |= MODEST_SEARCH_AFTER; search->start_date = start_date; } if (ed_v > 0) { - search->flags |= MODEST_SEARCH_AFTER; + search->flags |= MODEST_SEARCH_BEFORE; search->end_date = end_date; } diff --git a/src/modest-search.c b/src/modest-search.c index 9f6c1a1..a3ee398 100644 --- a/src/modest-search.c +++ b/src/modest-search.c @@ -413,14 +413,18 @@ modest_search_folder_get_headers_cb (TnyFolder *folder, while (!tny_iterator_is_done (iter)) { - TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter); - const time_t t = tny_header_get_date_sent (cur); - gboolean found = FALSE; - + TnyHeader *cur; + time_t t; + gboolean found; + + cur = (TnyHeader *) tny_iterator_get_current (iter); + t = tny_header_get_date_sent (cur); + found = FALSE; + /* Ignore deleted (not yet expunged) emails: */ if (tny_header_get_flags(cur) & TNY_HEADER_FLAG_DELETED) goto go_next; - + if (helper->search->flags & MODEST_SEARCH_BEFORE) if (!(t <= helper->search->end_date)) goto go_next; -- 1.7.9.5