diff options
Diffstat (limited to 'camel/camel-digest-folder.c')
-rw-r--r-- | camel/camel-digest-folder.c | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/camel/camel-digest-folder.c b/camel/camel-digest-folder.c index b2c81b5d4d..1e814fdf6a 100644 --- a/camel/camel-digest-folder.c +++ b/camel/camel-digest-folder.c @@ -315,31 +315,22 @@ digest_get_message (CamelFolder *folder, const char *uid, CamelException *ex) return message; } - static GPtrArray * digest_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex) { CamelDigestFolder *df = (CamelDigestFolder *) folder; - CamelFolderSearch *search; - GPtrArray *summary, *matches; - - summary = camel_folder_get_summary (folder); + GPtrArray *matches; CAMEL_DIGEST_FOLDER_LOCK (folder, search_lock); if (!df->priv->search) df->priv->search = camel_folder_search_new (); - search = df->priv->search; - camel_folder_search_set_folder (search, folder); - camel_folder_search_set_summary (search, summary); - - matches = camel_folder_search_execute_expression (search, expression, ex); + camel_folder_search_set_folder (df->priv->search, folder); + matches = camel_folder_search_search(df->priv->search, expression, NULL, ex); CAMEL_DIGEST_FOLDER_UNLOCK (folder, search_lock); - camel_folder_free_summary (folder, summary); - return matches; } @@ -347,39 +338,21 @@ static GPtrArray * digest_search_by_uids (CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex) { CamelDigestFolder *df = (CamelDigestFolder *) folder; - CamelFolderSearch *search; - GPtrArray *summary, *matches; - int i; - - 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); - } - - if (summary->len == 0) - return summary; - + GPtrArray *matches; + + if (uids->len == 0) + return g_ptr_array_new(); + CAMEL_DIGEST_FOLDER_LOCK (folder, search_lock); if (!df->priv->search) df->priv->search = camel_folder_search_new (); - search = df->priv->search; - camel_folder_search_set_folder (search, folder); - camel_folder_search_set_summary (search, summary); - - matches = camel_folder_search_execute_expression (search, expression, ex); + camel_folder_search_set_folder (df->priv->search, folder); + matches = camel_folder_search_search(df->priv->search, expression, NULL, ex); CAMEL_DIGEST_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; } |