aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/nntp
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-05-12 15:12:27 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-05-12 15:12:27 +0800
commitdedec6a7084cc67aa79cd884f47e6a2d8ee818db (patch)
treebdfa3dc0c7ea8e89adea0ad87842509ea67caa56 /camel/providers/nntp
parent0f8af52d9c5e83137c7c80f2b0bca8a60522c83a (diff)
downloadgsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar.gz
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar.bz2
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar.lz
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar.xz
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.tar.zst
gsoc2013-evolution-dedec6a7084cc67aa79cd884f47e6a2d8ee818db.zip
changed to match_threads. (camel_folder_search_search): remove thread
2004-05-12 Not Zed <NotZed@Ximian.com> * camel-folder-search.c (search_threads): changed to match_threads. (camel_folder_search_search): remove thread matching stuff from here. 2004-05-06 Not Zed <NotZed@Ximian.com> * camel-digest-folder.c (digest_search_by_expression) (digest_search_by_uids): * providers/nntp/camel-nntp-folder.c (nntp_folder_search_by_expression) (nntp_folder_search_by_uids): * providers/imap/camel-imap-folder.c (imap_search_by_expression) (imap_search_by_uids): * providers/local/camel-local-folder.c (local_search_by_expression) (local_search_by_uids): use camel_folder_search_search & some minor cleanups. * camel-folder-search.c (search_threads): keep track of the match threads option for this search. (camel_folder_search_match_expression): Removed, not used anymore. (camel_folder_search_search): new api entry point for searching, a bit easier to use and needed for thread matching. * camel-folder-search.c (camel_folder_search_search): new search api entry point, take a full summary and optionally a subset of uids to match against. (search_match_all): use the uids' passed in to only search a subset of uid's. svn path=/trunk/; revision=25876
Diffstat (limited to 'camel/providers/nntp')
-rw-r--r--camel/providers/nntp/camel-nntp-folder.c38
1 files changed, 7 insertions, 31 deletions
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 9fc236e215..4762cf974a 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -287,7 +287,7 @@ static GPtrArray*
nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
{
CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
- GPtrArray *matches, *summary;
+ GPtrArray *matches;
CAMEL_NNTP_FOLDER_LOCK(nntp_folder, search_lock);
@@ -295,15 +295,10 @@ nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, C
nntp_folder->search = camel_folder_search_new ();
camel_folder_search_set_folder (nntp_folder->search, folder);
- summary = camel_folder_get_summary (folder);
- camel_folder_search_set_summary (nntp_folder->search, summary);
-
- matches = camel_folder_search_execute_expression (nntp_folder->search, expression, ex);
+ matches = camel_folder_search_search(nntp_folder->search, expression, NULL, ex);
CAMEL_NNTP_FOLDER_UNLOCK(nntp_folder, search_lock);
- camel_folder_free_summary (folder, summary);
-
return matches;
}
@@ -311,22 +306,10 @@ static GPtrArray *
nntp_folder_search_by_uids (CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)
{
CamelNNTPFolder *nntp_folder = (CamelNNTPFolder *) folder;
- GPtrArray *summary, *matches;
- int i;
-
- /* NOTE: could get away without the search lock by creating a new
- search object each time */
-
- summary = g_ptr_array_new ();
- for (i = 0; i < uids->len; i++) {
- CamelMessageInfo *info;
-
- if ((info = camel_folder_get_message_info (folder, uids->pdata[i])))
- g_ptr_array_add (summary, info);
- }
-
- if (summary->len == 0)
- return summary;
+ GPtrArray *matches;
+
+ if (uids->len == 0)
+ return g_ptr_array_new();
CAMEL_NNTP_FOLDER_LOCK(folder, search_lock);
@@ -334,17 +317,10 @@ nntp_folder_search_by_uids (CamelFolder *folder, const char *expression, GPtrArr
nntp_folder->search = camel_folder_search_new ();
camel_folder_search_set_folder (nntp_folder->search, folder);
- camel_folder_search_set_summary (nntp_folder->search, summary);
-
- matches = camel_folder_search_execute_expression (nntp_folder->search, expression, ex);
+ matches = camel_folder_search_search(nntp_folder->search, expression, uids, ex);
CAMEL_NNTP_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;
}