#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
-#include <libmodest-dbus-client/libmodest-dbus-client.h>
-
#include "modest-text-utils.h"
#include "modest-account-mgr.h"
#include "modest-tny-account-store.h"
#include "modest-tny-account.h"
+#include "modest-tny-folder.h"
#include "modest-search.h"
#include "modest-runtime.h"
#include "modest-platform.h"
static GList*
add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
{
- ModestSearchHit *hit;
+ ModestSearchResultHit *hit;
TnyHeaderFlags flags;
char *furl;
char *msg_url;
const char *subject;
const char *sender;
- hit = g_slice_new0 (ModestSearchHit);
+ hit = g_slice_new0 (ModestSearchResultHit);
furl = tny_folder_get_url_string (folder);
printf ("DEBUG: %s: folder URL=%s\n", __FUNCTION__, furl);
hit->msize = tny_header_get_message_size (header);
hit->has_attachment = flags & TNY_HEADER_FLAG_ATTACHMENTS;
hit->is_unread = ! (flags & TNY_HEADER_FLAG_SEEN);
- hit->timestamp = tny_header_get_date_received (header);
+ hit->timestamp = MIN (tny_header_get_date_received (header), tny_header_get_date_sent (header));
return g_list_prepend (list, hit);
}
buffer,
TRUE);
- if (found) {
+ if ((found)||(nread == 0)) {
break;
}
/* Check that we should be searching this folder. */
/* Note that we don't try to search sub-folders.
* Maybe we should, but that should be specified. */
- if (search->folder && strlen (search->folder) && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
- return NULL;
+ if (search->folder && strlen (search->folder)) {
+ if (!strcmp (search->folder, "outbox")) {
+ if (modest_tny_folder_guess_folder_type (folder) != TNY_FOLDER_TYPE_OUTBOX) {
+ return NULL;
+ }
+ } else if (strcmp (tny_folder_get_id (folder), search->folder) != 0) {
+ return NULL;
+ }
+ }
GList *retval = NULL;
TnyIterator *iter = NULL;