diff options
Diffstat (limited to 'camel/providers/imap/camel-imap-folder.c')
-rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 4e4745c6ec..7915441047 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -1574,7 +1574,7 @@ static GPtrArray * imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex) { CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); - GPtrArray *matches, *summary; + GPtrArray *matches; /* we could get around this by creating a new search object each time, but i doubt its worth it since any long operation would lock the @@ -1582,14 +1582,10 @@ imap_search_by_expression (CamelFolder *folder, const char *expression, CamelExc CAMEL_IMAP_FOLDER_LOCK(folder, search_lock); camel_folder_search_set_folder (imap_folder->search, folder); - summary = camel_folder_get_summary(folder); - camel_folder_search_set_summary(imap_folder->search, summary); - matches = camel_folder_search_execute_expression (imap_folder->search, expression, ex); + matches = camel_folder_search_search(imap_folder->search, expression, NULL, ex); CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock); - camel_folder_free_summary(folder, summary); - return matches; } @@ -1597,39 +1593,18 @@ static GPtrArray * imap_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex) { CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER(folder); - GPtrArray *summary, *matches; - int i; - - /* NOTE: could get away without the search lock by creating a new - search object each time */ - - qsort (uids->pdata, uids->len, sizeof (void *), uid_compar); - - summary = g_ptr_array_new(); - for (i=0;i<uids->len;i++) { - CamelMessageInfo *info; - - info = camel_folder_get_message_info(folder, uids->pdata[i]); - if (info) - g_ptr_array_add(summary, info); - } + GPtrArray *matches; - if (summary->len == 0) - return summary; + if (uids->len == 0) + return g_ptr_array_new(); CAMEL_IMAP_FOLDER_LOCK(folder, search_lock); camel_folder_search_set_folder(imap_folder->search, folder); - camel_folder_search_set_summary(imap_folder->search, summary); - - matches = camel_folder_search_execute_expression(imap_folder->search, expression, ex); + matches = camel_folder_search_search(imap_folder->search, expression, uids, ex); CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock); - for (i=0;i<summary->len;i++) - camel_folder_free_message_info(folder, summary->pdata[i]); - g_ptr_array_free(summary, TRUE); - return matches; } |