From 637096d7bdde35bc4ae82e95d11b74805cbb94b7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 8 Feb 2006 12:54:31 +0000 Subject: [PATCH] 2006-02-08 [colin] 2.0.0cvs33 * src/summaryview.c Fix crasher introduced yesterday --- ChangeLog | 15 +++++++++--- PATCHSETS | 1 + configure.ac | 2 +- src/summaryview.c | 61 +---------------------------------------------- 4 files changed, 15 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1d12932b..5eb52e3b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 [colin] 2.0.0cvs33 + + * src/summaryview.c + Fix crasher introduced yesterday + 2006-02-08 [wwp] 2.0.0cvs32 * src/compose.c @@ -14,6 +19,7 @@ * src/compose.c Don't unblock if not blocked + FOR_STABLE 2006-02-07 [colin] 2.0.0cvs29 @@ -27,7 +33,7 @@ processing %as{} actions * src/compose.c Fix auto-wrap disabling after a middle-click - paste + paste - FOR_STABLE 2006-02-07 [paul] 2.0.0cvs27 @@ -130,6 +136,7 @@ to fail after an add_msgs ! :-/// * src/etpan/imap-thread.c Add a bit of debug + FOR_STABLE 2006-02-05 [colin] 2.0.0cvs16 @@ -203,6 +210,7 @@ move global option 'Set displayed columns...' out of folder option grouping. fix sensitivity of 'harvest addresses' + FOR_STABLE 2006-02-01 [colin] 2.0.0cvs8 @@ -242,7 +250,7 @@ * src/jpilot.c fix crash on creating jpilot address book - Thanks to Colin + Thanks to Colin - FOR_STABLE * src/prefs_summaries.c * src/prefs_wrapping.c * src/gtk/icon_legend.c @@ -265,6 +273,7 @@ * src/compose.c Fix drafting on IMAP. Crappy bug sneaked in the release :-/ + FOR_STABLE 2006-01-30 [paul] 2.0.0cvs2 @@ -275,7 +284,7 @@ * src/manual.c Check for the file to be present before - enabling the menu + enabling the menu - FOR_STABLE * src/gtk/icon_legend.c Add folders icons (not all of them, there are too much, but the most intriguing ones) diff --git a/PATCHSETS b/PATCHSETS index 392ffb9d0..2e08feafe 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1216,3 +1216,4 @@ ( cvs diff -u -r 1.382.2.236 -r 1.382.2.237 src/compose.c; ) > 2.0.0cvs30.patchset ( cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/prefs_template.c; ) > 2.0.0cvs31.patchset ( cvs diff -u -r 1.382.2.237 -r 1.382.2.238 src/compose.c; cvs diff -u -r 1.50.2.19 -r 1.50.2.20 src/compose.h; ) > 2.0.0cvs32.patchset +( cvs diff -u -r 1.395.2.166 -r 1.395.2.167 src/summaryview.c; ) > 2.0.0cvs33.patchset diff --git a/configure.ac b/configure.ac index fa8a969c7..ace7c605e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=32 +EXTRA_VERSION=33 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/summaryview.c b/src/summaryview.c index c677d03fa..227691b35 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -4219,7 +4219,7 @@ void summary_filter(SummaryView *summaryview, gboolean selected_only) cur != NULL && cur->data != NULL; cur = cur->next) { mlist = g_slist_prepend(mlist, procmsg_msginfo_new_ref( - GTKUT_CTREE_NODE_GET_ROW_DATA(cur))); + GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data))); } mlist = g_slist_reverse(mlist); } else { @@ -5541,65 +5541,6 @@ void summary_toggle_ignore_thread(SummaryView *summaryview) summary_ignore_thread(summaryview); } -#if 0 /* OLD PROCESSING */ -static gboolean processing_apply_func(GNode *node, gpointer data) -{ - FolderItem *item; - GSList * processing; - SummaryView * summaryview = (SummaryView *) data; - - if (node == NULL) - return FALSE; - - item = node->data; - /* prevent from the warning */ - if (item->path == NULL) - return FALSE; - processing = item->prefs->processing; - - - if (processing != NULL) { - gchar * buf; - GSList * mlist; - GSList * cur; - - buf = g_strdup_printf(_("Processing (%s)..."), item->path); - debug_print(buf); - STATUSBAR_PUSH(summaryview->mainwin, buf); - g_free(buf); - - mlist = folder_item_get_msg_list(item); - for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) { - MsgInfo * msginfo; - - msginfo = (MsgInfo *) cur->data; - filter_message_by_msginfo(processing, msginfo, NULL); - procmsg_msginfo_free(msginfo); - } - filtering_move_and_copy_msgs(mlist); - g_slist_free(mlist); - - STATUSBAR_POP(summaryview->mainwin); - } - - - return FALSE; -} - -void processing_apply(SummaryView * summaryview) -{ - GList * cur; - - for (cur = folder_get_list() ; cur != NULL && cur->data != NULL ; cur = g_list_next(cur)) { - Folder *folder; - - folder = (Folder *) cur->data; - g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, - processing_apply_func, summaryview); - } -} -#endif - void summary_toggle_show_read_messages(SummaryView *summaryview) { FolderItemUpdateData source; -- 2.25.1