[evolution-data-server] CamelImapSearch: Use GQueues instead of CamelDLists.

[Matthew Barnes <mbarnes src gnome org>]

commit a8bd1d3cc7fd05bfa21462d58a76aee37bd0b4f5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jan 28 11:11:03 2012 -0500

    CamelImapSearch: Use GQueues instead of CamelDLists.
    
    GQueue has a more intuitive API.

 camel/providers/imap/camel-imap-search.c |   13 +++++--------
 camel/providers/imap/camel-imap-search.h |    2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index 6103b47..bba2b07 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -76,9 +76,6 @@ struct _match_header {
 
 /* in-memory record */
 struct _match_record {
-	struct _match_record *next;
-	struct _match_record *prev;
-
 	gchar hash[17];
 
 	guint32 lastuid;
@@ -130,7 +127,7 @@ imap_search_finalize (GObject *object)
 
 	search = CAMEL_IMAP_SEARCH (object);
 
-	while ((mr = (struct _match_record *) camel_dlist_remtail (&search->matches)))
+	while ((mr = g_queue_pop_tail (&search->matches)) != NULL)
 		free_match (search, mr);
 
 	g_hash_table_destroy (search->matches_hash);
@@ -156,7 +153,7 @@ camel_imap_search_class_init (CamelImapSearchClass *class)
 static void
 camel_imap_search_init (CamelImapSearch *is)
 {
-	camel_dlist_init (&is->matches);
+	g_queue_init (&is->matches);
 	is->matches_hash = g_hash_table_new (g_str_hash, g_str_equal);
 	is->matches_count = 0;
 	is->lastuid = 0;
@@ -406,7 +403,7 @@ get_match (CamelImapSearch *is,
 	mr = g_hash_table_lookup (is->matches_hash, hash);
 	if (mr == NULL) {
 		while (is->matches_count >= MATCH_CACHE_SIZE) {
-			mr = (struct _match_record *) camel_dlist_remtail (&is->matches);
+			mr = g_queue_pop_tail (&is->matches);
 			if (mr) {
 				printf("expiring match '%s' (%s)\n", mr->hash, mr->terms[0]);
 				g_hash_table_remove (is->matches_hash, mr->hash);
@@ -420,10 +417,10 @@ get_match (CamelImapSearch *is,
 		g_hash_table_insert (is->matches_hash, mr->hash, mr);
 		is->matches_count++;
 	} else {
-		camel_dlist_remove ((CamelDListNode *) mr);
+		g_queue_remove (&is->matches, mr);
 	}
 
-	camel_dlist_addhead (&is->matches, (CamelDListNode *) mr);
+	g_queue_push_head (&is->matches, mr);
 
 	/* what about offline mode? */
 	/* We could cache those results too, or should we cache them elsewhere? */
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index 26e8993..3b80051 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -62,7 +62,7 @@ struct _CamelImapSearch {
 
 	/* cache of body search matches */
 	guint matches_count;
-	CamelDList matches;
+	GQueue matches;
 	GHashTable *matches_hash;
 };