diff options
Diffstat (limited to 'mail/claws-mail/files')
| -rw-r--r-- | mail/claws-mail/files/patch-src-defs.h | 22 | ||||
| -rw-r--r-- | mail/claws-mail/files/patch-src-summary_search.c | 126 |
2 files changed, 0 insertions, 148 deletions
diff --git a/mail/claws-mail/files/patch-src-defs.h b/mail/claws-mail/files/patch-src-defs.h deleted file mode 100644 index 897ee6a22219..000000000000 --- a/mail/claws-mail/files/patch-src-defs.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/defs.h.orig Wed Aug 28 11:43:59 2002 -+++ src/defs.h Sun Sep 1 03:01:59 2002 -@@ -70,8 +70,8 @@ - #define MARK_VERSION 2 - - #define DEFAULT_SIGNATURE ".signature" --#define DEFAULT_INC_PATH "/usr/bin/mh/inc" --#define DEFAULT_INC_PROGRAM "inc" -+#define DEFAULT_INC_PATH "" -+#define DEFAULT_INC_PROGRAM "" - /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ - /* #define DEFAULT_INC_PROGRAM "imget" */ - #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t" -@@ -79,7 +79,7 @@ - #ifdef _PATH_MAILDIR - # define DEFAULT_SPOOL_PATH _PATH_MAILDIR - #else --# define DEFAULT_SPOOL_PATH "/var/spool/mail" -+# define DEFAULT_SPOOL_PATH "/var/mail" - #endif - - #define BUFFSIZE 8192 diff --git a/mail/claws-mail/files/patch-src-summary_search.c b/mail/claws-mail/files/patch-src-summary_search.c deleted file mode 100644 index 99f184bdea36..000000000000 --- a/mail/claws-mail/files/patch-src-summary_search.c +++ /dev/null @@ -1,126 +0,0 @@ ---- src/summary_search.c.orig Wed Jun 12 07:49:20 2002 -+++ src/summary_search.c Tue Jul 23 19:14:41 2002 -@@ -224,10 +224,6 @@ - gboolean backward; - gboolean search_all; - gboolean all_searched = FALSE; -- gboolean from_matched; -- gboolean to_matched; -- gboolean subj_matched; -- gboolean body_matched; - gchar *body_str; - wchar_t *wcs_hs, *fromwcs, *towcs, *subjwcs; - wchar_t *(* WCSFindFunc) (const wchar_t *haystack, -@@ -260,6 +256,7 @@ - towcs = (wchar_t *)GTK_ENTRY(to_entry)->text; - subjwcs = (wchar_t *)GTK_ENTRY(subject_entry)->text; - body_str = gtk_entry_get_text(GTK_ENTRY(body_entry)); -+ wcs_hs = NULL; - - if (search_all) { - gtk_clist_freeze(GTK_CLIST(ctree)); -@@ -285,7 +282,13 @@ - if (*body_str) - main_window_cursor_wait(summaryview->mainwin); - -- for (;;) { -+ for (;; node = backward ? GTK_CTREE_NODE_PREV(node) -+ : GTK_CTREE_NODE_NEXT(node)) { -+ if (wcs_hs) { -+ g_free(wcs_hs); -+ wcs_hs = NULL; -+ } -+ - if (!node) { - gchar *str; - AlertValue val; -@@ -324,58 +327,49 @@ - break; - } - -- from_matched = to_matched = subj_matched = body_matched = FALSE; -- - msginfo = gtk_ctree_node_get_row_data(ctree, node); - -- if (*fromwcs && msginfo->from) { -+ if (*fromwcs) { -+ if (msginfo->from == NULL) -+ continue; - wcs_hs = strdup_mbstowcs(msginfo->from); -- if (wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL) -- from_matched = TRUE; -- g_free(wcs_hs); -+ if (!(wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL)) -+ continue; - } -- if (*towcs && msginfo->to) { -+ if (*towcs) { -+ if (msginfo->to == NULL) -+ continue; - wcs_hs = strdup_mbstowcs(msginfo->to); -- if (wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL) -- to_matched = TRUE; -- g_free(wcs_hs); -+ if (!(wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL)) -+ continue; - } -- if (*subjwcs && msginfo->subject) { -+ if (*subjwcs) { -+ if (msginfo->subject == NULL) -+ continue; - wcs_hs = strdup_mbstowcs(msginfo->subject); -- if (wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL) -- subj_matched = TRUE; -- g_free(wcs_hs); -+ if (!(wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL)) -+ continue; - } - if (*body_str) { -- if (procmime_find_string(msginfo, body_str, case_sens)) -- body_matched = TRUE; -+ if (!procmime_find_string(msginfo, body_str, case_sens)) -+ continue; - } - -- if (from_matched || to_matched || subj_matched || body_matched) { -- if (search_all) -- gtk_ctree_select(ctree, node); -- else { -- if (messageview_is_visible -- (summaryview->messageview)) { -- summary_unlock(summaryview); -- summary_select_node -- (summaryview, node, TRUE, TRUE); -- summary_lock(summaryview); -- if (body_matched) { -- messageview_search_string -- (summaryview->messageview, -- body_str, case_sens); -- } -- } else { -- summary_select_node -- (summaryview, node, FALSE, TRUE); -- } -- break; -- } -+ if (search_all) -+ gtk_ctree_select(ctree, node); -+ else { -+ if (messageview_is_visible(summaryview->messageview)) { -+ summary_unlock(summaryview); -+ summary_select_node(summaryview, node, TRUE, TRUE); -+ summary_lock(summaryview); -+ if (*body_str) -+ messageview_search_string( -+ summaryview->messageview, -+ body_str, case_sens); -+ } else -+ summary_select_node(summaryview, node, FALSE, TRUE); -+ break; - } -- -- node = backward ? GTK_CTREE_NODE_PREV(node) -- : GTK_CTREE_NODE_NEXT(node); - } - - if (*body_str) |