add new match-thread type "unreplied", matches messages that are unreplied

2006-01-25  Not Zed  <NotZed@Ximian.com>

 	* camel-folder-search.c (search_match_threads): add new
 	match-thread type "unreplied", matches messages that are unreplied
 	to.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1f1d9c8..2ca7354 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-25  Not Zed  <NotZed@Ximian.com>
+ 
+       * camel-folder-search.c (search_match_threads): add new
+       match-thread type "unreplied", matches messages that are unreplied
+       to. 
+       Committed to head on behaf of Notzed
+ 
 2006-01-23  Parthasarathi Susarla <sparthasarathi@novell.com>
        
        * camel-mime-utils.c: (camel_content_type_unref):

diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 99a2b02..7a7467f 100644 (file)
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -772,6 +772,8 @@ search_match_threads(struct _ESExp *f, int argc, struct _ESExpTerm **argv, Camel
                type = 2;
        else if (!strcmp(r->value.string, "replies_parents"))
                type = 3;
+       else if (!strcmp(r->value.string, "single"))
+               type = 4;
        e_sexp_result_free(f, r);
 
        /* behave as (begin does */
@@ -801,31 +803,34 @@ search_match_threads(struct _ESExp *f, int argc, struct _ESExpTerm **argv, Camel
 
        results = g_hash_table_new(g_str_hash, g_str_equal);
        for (i=0;i<r->value.ptrarray->len;i++) {
-               d(printf("adding match: %s\n", (char *)g_ptr_array_index(r->value.ptrarray, i)));
-               g_hash_table_insert(results, g_ptr_array_index(r->value.ptrarray, i), GINT_TO_POINTER (1));
-       }
-
-       for (i=0;i<r->value.ptrarray->len;i++) {
                struct _CamelFolderThreadNode *node, *scan;
 
+               if (type != 4)
+                       g_hash_table_insert(results, g_ptr_array_index(r->value.ptrarray, i), GINT_TO_POINTER(1));
+
                node = g_hash_table_lookup(p->threads_hash, (char *)g_ptr_array_index(r->value.ptrarray, i));
                if (node == NULL) /* this shouldn't happen but why cry over spilt milk */
                        continue;
 
                /* select messages in thread according to search criteria */
-               if (type == 3) {
-                       scan = node;
-                       while (scan && scan->parent) {
-                               scan = scan->parent;
-                               g_hash_table_insert(results, (char *)camel_message_info_uid(scan->message), GINT_TO_POINTER(1));
+               if (type == 4) {
+                       if (node->child == NULL && node->parent == NULL)
+                               g_hash_table_insert(results, (char *)camel_message_info_uid(node->message), GINT_TO_POINTER(1));
+               } else {
+                       if (type == 3) {
+                               scan = node;
+                               while (scan && scan->parent) {
+                                       scan = scan->parent;
+                                       g_hash_table_insert(results, (char *)camel_message_info_uid(scan->message), GINT_TO_POINTER(1));
+                               }
+                       } else if (type == 1) {
+                               while (node && node->parent)
+                                       node = node->parent;
                        }
-               } else if (type == 1) {
-                       while (node && node->parent)
-                               node = node->parent;
+                       g_hash_table_insert(results, (char *)camel_message_info_uid(node->message), GINT_TO_POINTER(1));
+                       if (node->child)
+                               add_thread_results(node->child, results);
                }
-               g_hash_table_insert(results, (char *)camel_message_info_uid(node->message), GINT_TO_POINTER(1));
-               if (node->child)
-                       add_thread_results(node->child, results);
        }
        e_sexp_result_free(f, r);