#include <gtk/gtkarrow.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkstatusbar.h>
+#include <gtk/gtkmenuitem.h>
#include <stdio.h>
#include <stdlib.h>
#include "utils.h"
#include "gtkutils.h"
#include "filesel.h"
+#include "manage_window.h"
#include "alertpanel.h"
#include "inputdialog.h"
#include "statusbar.h"
#include "filter.h"
#include "folder.h"
+#include "addressbook.h"
+#include "addr_compl.h"
+#include "scoring.h"
+#include "prefs_folder_item.h"
+#include "filtering.h"
#include "pixmaps/dir-open.xpm"
#include "pixmaps/mark.xpm"
static GtkCTreeNode *summary_find_next_unread_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_next_marked_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_prev_marked_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_msg_by_msgnum
(SummaryView *summaryview,
guint msgnum);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_add_sender_to_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_num_clicked (GtkWidget *button,
SummaryView *summaryview);
+static void summary_score_clicked (GtkWidget *button,
+ SummaryView *summaryview);
static void summary_size_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_date_clicked (GtkWidget *button,
static gint summary_cmp_by_subject (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_score (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
GtkTargetEntry summary_drag_types[1] =
{
{N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
- {N_("/_Mark/Make it as _being read"),
+ {N_("/_Mark/Mark as rea_d"),
NULL, summary_mark_as_read, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
- {N_("/Forward as an a_ttachment"),
+ {N_("/Forward as a_ttachment"),
NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Open in new _window"), NULL, summary_open_msg, 0, NULL},
{N_("/View so_urce"), NULL, summary_view_source, 0, NULL},
{N_("/Show all _header"), NULL, summary_show_all_header_cb, 0, NULL},
- {N_("/Re_edit"), NULL, summary_reedit, 0, NULL},
+ {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
titles[S_COL_FROM] = "From";
titles[S_COL_SUBJECT] = "Subject";
}
- titles[S_COL_SIZE] = _("Size");
+ titles[S_COL_SIZE] = _("Size");
+ titles[S_COL_SCORE] = _("Score");
ctree = gtk_sctree_new_with_titles(N_SUMMARY_COLS, S_COL_SUBJECT, titles);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_NUMBER,
GTK_JUSTIFY_RIGHT);
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SCORE,
+ GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SIZE,
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_MARK,
SUMMARY_COL_MIME_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_NUMBER,
prefs_common.summary_col_number);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SCORE,
+ prefs_common.summary_col_score);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SIZE,
prefs_common.summary_col_size);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_DATE,
"clicked",
GTK_SIGNAL_FUNC(summary_num_clicked),
summaryview);
+ gtk_signal_connect
+ (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SCORE].button),
+ "clicked",
+ GTK_SIGNAL_FUNC(summary_score_clicked),
+ summaryview);
gtk_signal_connect
(GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SIZE].button),
"clicked",
summary_set_menu_sensitive(summaryview);
}
+GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+ gint best_score = MIN_SCORE;
+ GtkCTreeNode *best_node = NULL;
+
+ if (current_node)
+ //node = current_node;
+ node = GTK_CTREE_NODE_NEXT(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (msginfo->score >= summaryview->important_score)
+ break;
+ if (msginfo->score > best_score) {
+ best_score = msginfo->score;
+ best_node = node;
+ }
+ }
+
+ if (node != NULL)
+ return node;
+ else
+ return best_node;
+}
+
+GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+ gint best_score = MIN_SCORE;
+ GtkCTreeNode *best_node = NULL;
+
+ if (current_node)
+ //node = current_node;
+ node = GTK_CTREE_NODE_PREV(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (msginfo->score >= summaryview->important_score)
+ break;
+ if (msginfo->score > best_score) {
+ best_score = msginfo->score;
+ best_node = node;
+ }
+ }
+
+ if (node != NULL)
+ return node;
+ else
+ return best_node;
+}
+
gboolean summary_show(SummaryView *summaryview, FolderItem *item,
gboolean update_cache)
{
gchar *buf;
gboolean is_refresh;
guint prev_msgnum = 0;
+ GtkCTreeNode *selected_node = summaryview->folderview->selected;
+ GSList *cur;
+ gint sort_mode;
+ gint sort_type;
STATUSBAR_POP(summaryview->mainwin);
- is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+ is_refresh = (!prefs_common.open_inbox_on_inc &&
+ item == summaryview->folder_item) ? TRUE : FALSE;
if (is_refresh) {
prev_msgnum = summary_get_current_msgnum(summaryview);
if (prev_msgnum < 1)
is_refresh = FALSE;
}
-#if 0
/* process the marks if any */
- if (summaryview->deleted > 0 || summaryview->moved > 0) {
+ if (summaryview->moved > 0 || summaryview->copied > 0) {
AlertValue val;
val = alertpanel(_("Process mark"),
else
return FALSE;
} else
-#endif
summary_write_cache(summaryview);
+ summaryview->folderview->opened = selected_node;
+
gtk_clist_freeze(GTK_CLIST(ctree));
summary_clear_list(summaryview);
mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
+ for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ msginfo->score = score_message(global_scoring, msginfo);
+ if (msginfo->score != MAX_SCORE &&
+ msginfo->score != MIN_SCORE) {
+ msginfo->score += score_message(item->prefs->scoring,
+ msginfo);
+ }
+ }
+
+ summaryview->killed_messages = NULL;
+ if ((global_scoring || item->prefs->scoring) &&
+ (item->folder->type == F_NEWS)) {
+ GSList *not_killed;
+ gint kill_score;
+
+ not_killed = NULL;
+ kill_score = prefs_common.kill_score;
+ if (item->prefs->kill_score > kill_score)
+ kill_score = item->prefs->kill_score;
+ for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ if (MSG_IS_NEWS(msginfo->flags) &&
+ (msginfo->score <= kill_score))
+ summaryview->killed_messages = g_slist_append(summaryview->killed_messages, msginfo);
+ else
+ not_killed = g_slist_append(not_killed,
+ msginfo);
+ }
+ g_slist_free(mlist);
+ mlist = not_killed;
+ }
+
STATUSBAR_POP(summaryview->mainwin);
/* set ctree and hash table from the msginfo list
GTK_SIGNAL_FUNC(summary_open_row), summaryview);
/*connect drag and drop signal*/
- gtk_signal_connect (GTK_OBJECT (ctree),"start_drag",
- GTK_SIGNAL_FUNC (summary_start_drag),
- summaryview);
- gtk_signal_connect (GTK_OBJECT (ctree),"drag_data_get",
- GTK_SIGNAL_FUNC (summary_drag_data_get),
- summaryview);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
+ gtk_signal_connect(GTK_OBJECT (ctree),"start_drag",
+ GTK_SIGNAL_FUNC (summary_start_drag),
+ summaryview);
+ gtk_signal_connect(GTK_OBJECT (ctree),"drag_data_get",
+ GTK_SIGNAL_FUNC (summary_drag_data_get),
+ summaryview);
+
+ gtk_clist_thaw(GTK_CLIST(ctree));
+
+ /* sort before */
+ sort_mode = prefs_folder_item_get_sort_mode(item);
+ sort_type = prefs_folder_item_get_sort_type(item);
+
+ if (sort_mode != SORT_BY_NONE) {
+ summaryview->sort_mode = sort_mode;
+ if (sort_type == GTK_SORT_DESCENDING)
+ summaryview->sort_type = GTK_SORT_ASCENDING;
+ else
+ summaryview->sort_type = GTK_SORT_DESCENDING;
+
+ summary_sort(summaryview, sort_mode);
+ }
if (is_refresh) {
summary_select_by_msgnum(summaryview, prev_msgnum);
} else {
/* select first unread message */
- node = summary_find_next_unread_msg(summaryview, NULL);
+ if (sort_mode == SORT_BY_SCORE)
+ node = summary_find_next_important_score(summaryview,
+ NULL);
+ else
+ node = summary_find_next_unread_msg(summaryview, NULL);
+
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
if (node) {
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
gint optimal_width;
+ GSList * cur;
gtk_clist_freeze(clist);
+ for(cur = summaryview->killed_messages ; cur != NULL ;
+ cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ procmsg_msginfo_free(msginfo);
+ }
+ g_slist_free(summaryview->killed_messages);
+ summaryview->killed_messages = NULL;
+
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
NULL, summary_free_msginfo_func, NULL);
g_hash_table_destroy(summaryview->msgid_table);
summaryview->msgid_table = NULL;
}
+ if (summaryview->subject_table) {
+ g_hash_table_destroy(summaryview->subject_table);
+ summaryview->subject_table = NULL;
+ }
summaryview->mlist = NULL;
if (summaryview->folder_table) {
g_hash_table_destroy(summaryview->folder_table);
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Reply", sens);
+ menu_set_sensitive(ifactory, "/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", sens);
- menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
+ menu_set_sensitive(ifactory, "/Forward as attachment", sens);
menu_set_sensitive(ifactory, "/Open in new window", sens);
menu_set_sensitive(ifactory, "/View source", sens);
menu_set_sensitive(ifactory, "/Show all header", sens);
- if (summaryview->folder_item->stype == F_DRAFT)
- menu_set_sensitive(ifactory, "/Reedit", sens);
+ if ((summaryview->folder_item->stype == F_DRAFT) ||
+ (summaryview->folder_item->stype == F_OUTBOX) ||
+ (summaryview->folder_item->stype == F_QUEUE))
+ menu_set_sensitive(ifactory, "/Re-edit", sens);
menu_set_sensitive(ifactory, "/Save as...", sens);
menu_set_sensitive(ifactory, "/Print...", TRUE);
menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Make it as being read", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
menu_set_sensitive(ifactory, "/Select all", TRUE);
+
+ if (summaryview->folder_item->folder->account)
+ sens = summaryview->folder_item->folder->account->protocol
+ == A_NNTP;
+ else
+ sens = FALSE;
+ menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
}
void summary_select_next_unread(SummaryView *summaryview)
}
}
-void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
+void summary_select_next_marked(SummaryView *summaryview)
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_msg_by_msgnum(summaryview, msgnum);
+ node = summary_find_next_marked_msg(summaryview,
+ summaryview->selected);
- if (node) {
+ if (!node) {
+ AlertValue val;
+
+ val = alertpanel(_("No more marked messages"),
+ _("No marked message found. "
+ "Search from the beginning?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_next_marked_msg(summaryview,
+ NULL);
+ }
+ if (!node) {
+ alertpanel_notice(_("No marked messages."));
+ } else {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
+}
+
+void summary_select_prev_marked(SummaryView *summaryview)
+{
+ GtkCTreeNode *node;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ node = summary_find_prev_marked_msg(summaryview,
+ summaryview->selected);
+
+ if (!node) {
+ AlertValue val;
+
+ val = alertpanel(_("No more marked messages"),
+ _("No marked message found. "
+ "Search from the end?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_prev_marked_msg(summaryview,
+ NULL);
+ }
+ if (!node) {
+ alertpanel_notice(_("No marked messages."));
+ } else {
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
}
}
+void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
+{
+ GtkCTreeNode *node;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ node = summary_find_msg_by_msgnum(summaryview, msgnum);
+
+ if (node) {
+ GTK_EVENTS_FLUSH();
+ gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ gtk_widget_grab_focus(GTK_WIDGET(ctree));
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ if (summaryview->msg_is_toggled_on) {
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
+ }
+}
+
guint summary_get_current_msgnum(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
return node;
}
+static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = GTK_CTREE_NODE_NEXT(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (MSG_IS_MARKED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
+static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = GTK_CTREE_NODE_PREV(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (MSG_IS_MARKED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
guint msgnum)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func;
+ if (!summaryview->folder_item)
+ return;
+
switch (type) {
case SORT_BY_NUMBER:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
case SORT_BY_SUBJECT:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
break;
+ case SORT_BY_SCORE:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
+ break;
default:
return;
}
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
//gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+ prefs_folder_item_set_config(summaryview->folder_item,
+ summaryview->sort_type,
+ summaryview->sort_mode);
+ prefs_folder_item_save_config(summaryview->folder_item);
+
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
}
+static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
+ gchar * subject)
+{
+ if (g_strncasecmp(subject, "Re: ", 4) == 0)
+ return g_hash_table_lookup(subject_table, subject + 4);
+ else
+ return g_hash_table_lookup(subject_table, subject);
+}
+
+static void subject_table_insert(GHashTable *subject_table, gchar * subject,
+ GtkCTreeNode * node)
+{
+ if (g_strncasecmp(subject, "Re: ", 4) == 0)
+ g_hash_table_insert(subject_table, subject + 4, node);
+ else
+ g_hash_table_insert(subject_table, subject, node);
+}
+
static void summary_set_ctree_from_list(SummaryView *summaryview,
GSList *mlist)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
+ MsgInfo *parentinfo;
+ MsgInfo *cur_msginfo;
GtkCTreeNode *node, *parent;
gchar *text[N_SUMMARY_COLS];
GHashTable *msgid_table;
+ GHashTable *subject_table;
+ GSList * cur;
+ GtkCTreeNode *cur_parent;
if (!mlist) return;
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
summaryview->msgid_table = msgid_table;
+ subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+ summaryview->subject_table = subject_table;
+
+ if (prefs_common.use_addr_book)
+ start_address_completion();
+
+ main_window_set_thread_option(summaryview->mainwin);
+
+ for (cur = mlist ; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ msginfo->threadscore = msginfo->score;
+ }
- if (prefs_common.enable_thread) {
+ if (global_scoring || summaryview->folder_item->prefs->scoring) {
+ summaryview->important_score = prefs_common.important_score;
+ if (summaryview->folder_item->prefs->important_score >
+ summaryview->important_score)
+ summaryview->important_score =
+ summaryview->folder_item->prefs->important_score;
+ }
+
+ /* if (prefs_common.enable_thread) { */
+ if (summaryview->folder_item->prefs->enable_thread) {
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
parent = NULL;
summary_set_header(text, msginfo);
/* search parent node for threading */
- if (msginfo->inreplyto && *msginfo->inreplyto)
+ if (msginfo->inreplyto && *msginfo->inreplyto) {
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
+ }
+ if (parent == NULL && msginfo->subject) {
+ parent = subject_table_lookup
+ (subject_table, msginfo->subject);
+ }
node = gtk_ctree_insert_node
(ctree, parent, NULL, text, 2,
NULL, NULL, NULL, NULL, FALSE, TRUE);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
+
summary_set_marks_func(ctree, node, summaryview);
/* preserve previous node if the message is
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+ if (msginfo->subject &&
+ subject_table_lookup(subject_table,
+ msginfo->subject) == NULL) {
+ subject_table_insert(subject_table,
+ msginfo->subject, node);
+ }
+
+ cur_parent = parent;
+ cur_msginfo = msginfo;
+ while (cur_parent != NULL) {
+ parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
+
+ if (!parentinfo)
+ break;
+
+ if (parentinfo->threadscore <
+ cur_msginfo->threadscore) {
+ gchar * s;
+ parentinfo->threadscore =
+ cur_msginfo->threadscore;
+#if 0
+ s = itos(parentinfo->threadscore);
+ gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
+#endif
+ }
+ else break;
+
+ cur_msginfo = parentinfo;
+ if (cur_msginfo->inreplyto &&
+ *cur_msginfo->inreplyto) {
+ cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
+ }
+ if (cur_parent == NULL && cur_msginfo->subject) {
+ cur_parent = subject_table_lookup(subject_table, cur_msginfo->subject);
+ }
+ }
}
/* complete the thread */
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+
+ if (msginfo->subject &&
+ subject_table_lookup(subject_table,
+ msginfo->subject) == NULL)
+ subject_table_insert(subject_table,
+ msginfo->subject, node);
}
}
optimal_width);
}
+ if (prefs_common.use_addr_book)
+ end_address_completion();
+
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
- if (debug_mode)
+ if (debug_mode) {
debug_print("\tmsgid hash table size = %d\n",
g_hash_table_size(msgid_table));
+ debug_print("\tsubject hash table size = %d\n",
+ g_hash_table_size(subject_table));
+ }
}
struct wcachefp
gint ver = CACHE_VERSION;
gchar *buf;
gchar *cachefile, *markfile;
+ GSList * cur;
if (!summaryview->folder_item || !summaryview->folder_item->path)
return -1;
+ if (summaryview->folder_item->folder->update_mark != NULL)
+ summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
+
cachefile = folder_item_get_cache_file(summaryview->folder_item);
g_return_val_if_fail(cachefile != NULL, -1);
if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
gtk_ctree_pre_recursive(ctree, NULL, summary_write_cache_func, &fps);
+ for(cur = summaryview->killed_messages ; cur != NULL ;
+ cur = g_slist_next(cur)) {
+ MsgInfo *msginfo = (MsgInfo *) cur->data;
+
+ procmsg_write_cache(msginfo, fps.cache_fp);
+ procmsg_write_flags(msginfo, fps.mark_fp);
+ }
+
fclose(fps.cache_fp);
fclose(fps.mark_fp);
{
static gchar date_modified[80];
static gchar *to = NULL;
+ static gchar *from_name = NULL;
+ static gchar col_number[11];
+ static gchar col_score[11];
text[S_COL_MARK] = NULL;
text[S_COL_UNREAD] = NULL;
- text[S_COL_MIME] = NULL;
- text[S_COL_NUMBER] = itos(msginfo->msgnum);
+ text[S_COL_MIME] = NULL;
+ text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
text[S_COL_SIZE] = to_human_readable(msginfo->size);
+#if 0
+ text[S_COL_SCORE] = itos_buf(col_score, msginfo->threadscore);
+#else
+ text[S_COL_SCORE] = itos_buf(col_score, msginfo->score);
+#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
if (prefs_common.swap_from && msginfo->from && msginfo->to &&
- cur_account && cur_account->address) {
+ !MSG_IS_NEWS(msginfo->flags)) {
gchar *from;
Xalloca(from, strlen(msginfo->from) + 1, return);
strcpy(from, msginfo->from);
extract_address(from);
- if (!strcmp(from, cur_account->address)) {
+ if (account_find_mail_from_address(from)) {
g_free(to);
to = g_strconcat("-->", msginfo->to, NULL);
text[S_COL_FROM] = to;
}
}
+ if ((text[S_COL_FROM] != to) && prefs_common.use_addr_book &&
+ msginfo->from) {
+ gint count;
+ gchar *from;
+
+ Xalloca(from, strlen(msginfo->from) + 1, return);
+ strcpy(from, msginfo->from);
+ extract_address(from);
+ count = complete_address(from);
+ if (count > 1) {
+ g_free(from_name);
+ from = get_complete_address(1);
+ from_name = procheader_get_fromname(from);
+ g_free(from);
+ text[S_COL_FROM] = from_name;
+ }
+ }
+
text[S_COL_SUBJECT] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
}
+#define CHANGE_FLAGS(msginfo) \
+{ \
+if (msginfo->folder->folder->change_flags != NULL) \
+msginfo->folder->folder->change_flags(msginfo->folder->folder, \
+ msginfo->folder, \
+ msginfo); \
+}
+
static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
gboolean new_window)
{
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
if (!summaryview->selected) return;
if (!summaryview->folder_item ||
- summaryview->folder_item->stype != F_DRAFT) return;
+ (summaryview->folder_item->stype != F_DRAFT &&
+ summaryview->folder_item->stype != F_OUTBOX &&
+ summaryview->folder_item->stype != F_QUEUE)) return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "O");
gtk_ctree_node_set_foreground(ctree, row,
&summaryview->color_marked);
+ }
+ else if ((global_scoring ||
+ summaryview->folder_item->prefs->scoring) &&
+ (msginfo->score >= summaryview->important_score) &&
+ ((msginfo->flags &
+ (MSG_MARKED | MSG_MOVE | MSG_COPY)) == 0)) {
+ gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
+ gtk_ctree_node_set_foreground(ctree, row,
+ &summaryview->color_important);
} else {
gtk_ctree_node_set_text(ctree, row, S_COL_MARK, NULL);
}
summaryview->copied--;
MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked\n"), msginfo->msgnum);
}
summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
/* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
+ summary_status_show(summaryview);
}
static void summary_mark_row_as_read(SummaryView *summaryview,
if (MSG_IS_NEW(msginfo->flags) ||
MSG_IS_UNREAD(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as being read\n"),
+ debug_print(_("Message %d is marked as read\n"),
msginfo->msgnum);
}
}
MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
if (!MSG_IS_UNREAD(msginfo->flags)) {
MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
+
gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
unreadxpm, unreadxpmmask);
summaryview->unread++;
debug_print(_("Message %d is marked as unread\n"),
msginfo->msgnum);
}
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
}
MSG_MOVE |
MSG_COPY);
MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
+
+ CHANGE_FLAGS(msginfo);
+
summaryview->deleted++;
if (!prefs_common.immediate_exec)
MSG_DELETED |
MSG_MOVE |
MSG_COPY);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
debug_print(_("Message %s/%d is unmarked\n"),
MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
summaryview->moved++;
}
+
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
summaryview->copied++;
}
+
if (!prefs_common.immediate_exec)
summary_set_row_marks(summaryview, row);
strchr(p + 2, '%')) {
alertpanel_error(_("Print command line is invalid:\n`%s'"),
cmdline);
+ g_free(cmdline);
return;
}
(ctree, GTK_CTREE_NODE(cur->data));
if (msginfo) procmsg_print_message(msginfo, cmdline);
}
+
+ g_free(cmdline);
}
void summary_execute(SummaryView *summaryview)
gtk_clist_freeze(clist);
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->prefs->enable_thread)
+ /* if (prefs_common.enable_thread) */
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->prefs->enable_thread)
+ /* if (prefs_common.enable_thread) */
summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
g_slist_append(summaryview->mlist, msginfo);
MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
+
summary_set_row_marks(summaryview, node);
}
}
GSList *cur;
trash = summaryview->folder_item->folder->trash;
- g_return_if_fail(trash != NULL);
+ if (summaryview->folder_item->folder->type == F_MH) {
+ g_return_if_fail(trash != NULL);
+ }
if (summaryview->folder_item == trash) return;
/* search deleting messages and execute */
if (!summaryview->mlist) return;
+ for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo = cur->data;
+ MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+ }
+
folder_item_move_msgs_with_dest(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
gtk_ctree_pre_recursive_to_depth
(GTK_CTREE(summaryview->ctree), NULL, 1,
GTK_CTREE_FUNC(summary_thread_func),
- summaryview->msgid_table);
+ summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
gpointer data)
{
MsgInfo *msginfo;
- GtkCTreeNode *parent;
- GHashTable *msgid_table = (GHashTable *)data;
+ GtkCTreeNode *parent = NULL;
+
+ SummaryView * summaryview = (SummaryView *) data;
+ GHashTable *msgid_table = summaryview->msgid_table;
+ GHashTable *subject_table = summaryview->subject_table;
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (!msginfo || !msginfo->inreplyto) return;
+ if (!msginfo) return;
- parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+ if(msginfo->inreplyto) {
+ parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+ }
+ if (parent == NULL && msginfo->subject) {
+ parent = subject_table_lookup(subject_table, msginfo->subject);
+ }
if (parent && parent != node) {
gtk_ctree_move(ctree, node, parent, NULL);
gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
- gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
- GTK_CTREE_FUNC(summary_filter_func),
- summaryview);
+ if (prefs_filtering == NULL) {
+ gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+ GTK_CTREE_FUNC(summary_filter_func),
+ summaryview);
+
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ if (prefs_common.immediate_exec)
+ summary_execute(summaryview);
+ else
+ summary_status_show(summaryview);
+ }
+ else {
+ summaryview->folder_table = g_hash_table_new(NULL, NULL);
- if (prefs_common.immediate_exec)
- summary_execute(summaryview);
- else
- summary_status_show(summaryview);
+ gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+ GTK_CTREE_FUNC(summary_filter_func),
+ summaryview);
+
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
+ folder_item_scan_foreach(summaryview->folder_table);
+ folderview_update_item_foreach(summaryview->folder_table);
+
+ g_hash_table_destroy(summaryview->folder_table);
+ summaryview->folder_table = NULL;
+
+ summary_show(summaryview, summaryview->folder_item, FALSE);
+ }
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
gchar *file;
FolderItem *dest;
- file = procmsg_get_message_file_path(msginfo);
- dest = filter_get_dest_folder(prefs_common.fltlist, file);
- g_free(file);
+ if (prefs_filtering == NULL) {
+ /* old filtering */
+ file = procmsg_get_message_file_path(msginfo);
+ dest = filter_get_dest_folder(prefs_common.fltlist, file);
+ g_free(file);
- if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
- summaryview->folder_item != dest)
- summary_move_row_to(summaryview, node, dest);
+ if (dest && strcmp2(dest->path, FILTER_NOT_RECEIVE) != 0 &&
+ summaryview->folder_item != dest)
+ summary_move_row_to(summaryview, node, dest);
+ }
+ else
+ filter_msginfo_move_or_delete(prefs_filtering, msginfo,
+ summaryview->folder_table);
}
/* callback functions */
if (event->button == 3) {
/* right clicked */
+ summary_add_sender_to_cb(summaryview, 0, 0);
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+#define KEY_PRESS_EVENT_STOP() \
+ if (gtk_signal_n_emissions_by_name \
+ (GTK_OBJECT(ctree), "key_press_event") > 0) { \
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
+ "key_press_event"); \
+ }
+
static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
case GDK_g: /* Go */
case GDK_G:
BREAK_ON_MODIFIER_KEY();
-
- if (gtk_signal_n_emissions_by_name
- (GTK_OBJECT(ctree), "key_press_event") > 0)
- gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
- "key_press_event");
-
+ KEY_PRESS_EVENT_STOP();
to_folder = foldersel_folder_sel(NULL);
if (to_folder) {
debug_print(_("Go to %s\n"), to_folder->path);
return;
case GDK_w: /* Write new message */
BREAK_ON_MODIFIER_KEY();
- if (summaryview->folder_item)
- compose_new(summaryview->folder_item->folder->account);
- else
+ if (summaryview->folder_item) {
+ PrefsAccount *ac;
+ ac = summaryview->folder_item->folder->account;
+ if (ac && ac->protocol == A_NNTP)
+ compose_new_with_recipient
+ (ac, summaryview->folder_item->path);
+ else
+ compose_new(ac);
+ } else
compose_new(NULL);
return;
case GDK_D: /* Empty trash */
BREAK_ON_MODIFIER_KEY();
- if (gtk_signal_n_emissions_by_name
- (GTK_OBJECT(ctree), "key_press_event") > 0)
- gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
- "key_press_event");
+ KEY_PRESS_EVENT_STOP();
main_window_empty_trash(summaryview->mainwin, TRUE);
return;
case GDK_Q: /* Quit */
if (alertpanel(_("Exit"), _("Exit this program?"),
_("OK"), _("Cancel"), NULL)
== G_ALERTDEFAULT) {
+ manage_window_focus_in
+ (summaryview->mainwin->window,
+ NULL, NULL);
app_will_exit(NULL, summaryview->mainwin);
}
}
case GDK_x: /* Execute */
case GDK_X:
BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
summary_execute(summaryview);
break;
case GDK_a: /* Reply to the message */
}
}
+#undef BREAK_ON_MODIFIER_KEY
+#undef KEY_PRESS_EVENT_STOP
+
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (summaryview->folder_item->stype == F_DRAFT)
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
+
+ CHANGE_FLAGS(msginfo);
+
summary_set_row_marks(summaryview, row);
} else
summary_mark_row(summaryview, row);
case S_COL_NUMBER:
prefs_common.summary_col_number = width;
break;
+ case S_COL_SCORE:
+ prefs_common.summary_col_score = width;
+ break;
case S_COL_SIZE:
prefs_common.summary_col_size = width;
break;
switch ((ComposeReplyMode)action) {
case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE);
+ compose_reply(msginfo, TRUE, FALSE, FALSE);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE);
+ compose_reply(msginfo, FALSE, FALSE, FALSE);
+ break;
+ case COMPOSE_REPLY_TO_SENDER:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ compose_followup_and_reply_to(msginfo,
+ prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE);
break;
case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE);
+ compose_reply(msginfo, TRUE, TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE);
+ compose_reply(msginfo, FALSE, TRUE, FALSE);
break;
case COMPOSE_FORWARD:
- compose_forward(msginfo, FALSE);
+ compose_forward(NULL, msginfo, FALSE);
break;
case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward(msginfo, TRUE);
+ compose_forward(NULL, msginfo, TRUE);
break;
default:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ g_warning("summary_reply_cb(): invalid action: %d\n", action);
}
summary_set_marks_selected(summaryview);
header_window_show_cb(summaryview->mainwin, action, widget);
}
+static void summary_add_sender_to_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget_)
+{
+ GtkWidget *submenu;
+ GList *groups, *tmp;
+ GtkMenuShell *menushell;
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GList *child;
+ gboolean found = FALSE;
+ MsgInfo *msginfo;
+ gchar *from_address;
+
+ menushell = GTK_MENU_SHELL(summaryview->popupmenu);
+ g_return_if_fail(menushell != NULL);
+ child = menushell->children;
+ g_return_if_fail(child);
+
+ /* we're iterating each menu item searching for the one with
+ * a "contacts" object data. if not found add the menu,
+ * else update it */
+ for (child = g_list_first(menushell->children); child; child = g_list_next(child)) {
+ if (gtk_object_get_data(GTK_OBJECT(child->data), "contacts")) {
+ found = TRUE;
+ break;
+ }
+ }
+
+ /* add item to default context menu if not present */
+ if (!found) {
+ submenu = gtk_menu_item_new_with_label(_("Add sender to address book"));
+ gtk_object_set_data(GTK_OBJECT(submenu), "contacts", (gpointer)1);
+ gtk_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, 12);
+ gtk_widget_show(submenu);
+ }
+ else {
+ submenu = (GtkWidget *) child->data;
+ }
+
+ /* get the address info from the summary view */
+ msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ summaryview->selected);
+
+ if (msginfo != NULL && msginfo->fromname != NULL && msginfo->from != NULL) {
+ gtk_widget_set_sensitive(GTK_WIDGET(submenu), TRUE);
+ from_address = g_strdup(msginfo->from);
+ eliminate_address_comment(from_address);
+ extract_address(from_address);
+ log_message("adding %s %s\n", msginfo->fromname, from_address);
+ addressbook_add_contact_by_menu(submenu, msginfo->fromname, from_address, NULL);
+ g_free(from_address);
+ }
+ else {
+ gtk_widget_set_sensitive(GTK_WIDGET(submenu), FALSE);
+ }
+}
+
static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_NUMBER);
}
+static void summary_score_clicked(GtkWidget *button,
+ SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_SCORE);
+}
+
static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_SIZE);
gtk_clist_set_column_visibility(clist, S_COL_UNREAD, prefs_common.show_unread);
gtk_clist_set_column_visibility(clist, S_COL_MIME, prefs_common.show_mime);
gtk_clist_set_column_visibility(clist, S_COL_NUMBER, prefs_common.show_number);
+ gtk_clist_set_column_visibility(clist, S_COL_SCORE, prefs_common.show_score);
gtk_clist_set_column_visibility(clist, S_COL_SIZE, prefs_common.show_size);
gtk_clist_set_column_visibility(clist, S_COL_DATE, prefs_common.show_date);
gtk_clist_set_column_visibility(clist, S_COL_FROM, prefs_common.show_from);
return strcasecmp(msginfo1->subject, msginfo2->subject);
}
+
+static gint summary_cmp_by_score(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+ int diff;
+
+ /* if score are equal, sort by date */
+
+ diff = msginfo1->threadscore - msginfo2->threadscore;
+ if (diff != 0)
+ return diff;
+ else
+ return summary_cmp_by_date(clist, ptr1, ptr2);
+}