/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "matcher_parser.h"
#include "hooks.h"
#include "description_window.h"
+#include "folder.h"
#define SUMMARY_COL_MARK_WIDTH 10
-#define SUMMARY_COL_UNREAD_WIDTH 13
+#define SUMMARY_COL_STATUS_WIDTH 13
#define SUMMARY_COL_LOCKED_WIDTH 13
#define SUMMARY_COL_MIME_WIDTH 11
static GdkBitmap *keyxpmmask;
static GdkPixmap *clipkeyxpm;
static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;
static void summary_free_msginfo_func (GtkCTree *ctree,
GtkCTreeNode *node,
static void summary_mark_clicked (GtkWidget *button,
SummaryView *summaryview);
-static void summary_unread_clicked (GtkWidget *button,
+static void summary_status_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_mime_clicked (GtkWidget *button,
SummaryView *summaryview);
static gint summary_cmp_by_mark (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_unread (GtkCList *clist,
+static gint summary_cmp_by_status (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static gint summary_cmp_by_mime (GtkCList *clist,
static const gchar *const col_label[N_SUMMARY_COLS] = {
N_("M"), /* S_COL_MARK */
- N_("U"), /* S_COL_UNREAD */
+ N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
&clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
&keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+ &gpgsignedxpm, &gpgsignedxpmmask);
if (!small_style) {
small_style = gtk_style_copy
|| MSG_IS_LOCKED(msginfo->flags)
|| CURRENTLY_DISPLAYED(msginfo))
&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
}
if (search_type != S_SEARCH_EXTENDED) {
if (searched_header && strcasestr(searched_header, search_string) != NULL)
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
} else {
if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
MsgInfo * msginfo = (MsgInfo *) cur->data;
if (msginfo->score > kill_score)
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
/* set ctree and hash table from the msginfo list
creating thread, and count the number of messages */
+
summary_set_ctree_from_list(summaryview, mlist);
g_slist_free(mlist);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags)) break;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags)) break;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if ((msginfo->flags.perm_flags & flags) != 0) break;
+ if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
}
return node;
/* Find msg with matching flags but ignore messages with
ignore flags, if searching for new or unread messages */
if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
- ((msginfo->flags.perm_flags & flags) != 0))
+ (msginfo && (msginfo->flags.perm_flags & flags) != 0))
break;
}
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo->msgnum == msgnum) break;
+ if (msginfo && msginfo->msgnum == msgnum) break;
}
return node;
msginfo = gtk_ctree_node_get_row_data
(GTK_CTREE(summaryview->ctree),
GTK_CTREE_NODE(cur->data));
- sel_size += msginfo->size;
- n_selected++;
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ sel_size += msginfo->size;
+ n_selected++;
+ }
}
if (summaryview->folder_item->folder->type == F_NEWS) {
- gchar *group;
- group = get_abbrev_newsgroup_name
- (g_basename(summaryview->folder_item->path),
- prefs_common.ng_abbrev_len);
- gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
- g_free(group);
+ if (summaryview->folder_item->path != NULL) {
+ gchar *group;
+ group = get_abbrev_newsgroup_name
+ (g_basename(summaryview->folder_item->path),
+ prefs_common.ng_abbrev_len);
+ gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
+ g_free(group);
+ } else {
+ gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
+ }
} else {
gtk_label_set(GTK_LABEL(summaryview->statlabel_folder),
summaryview->folder_item->path);
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
- SORT_BY_UNREAD,
+ SORT_BY_STATUS,
SORT_BY_MIME,
SORT_BY_SUBJECT,
SORT_BY_FROM,
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+ single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
break;
- case SORT_BY_UNREAD:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+ case SORT_BY_STATUS:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
break;
case SORT_BY_MIME:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
-
- mlist = g_slist_reverse(mlist);
+ cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
msginfo->subject,
node);
}
- mlist = g_slist_reverse(mlist);
+ mlist = cur;
}
if (prefs_common.enable_hscrollbar &&
gint *col_pos = summaryview->col_pos;
text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_UNREAD]] = NULL;
+ text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_MIME]] = NULL;
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
/* set new/unread column */
if (MSG_IS_IGNORE_THREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
ignorethreadxpm, ignorethreadxpmmask);
} else if (MSG_IS_NEW(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
unreadxpm, unreadxpmmask);
} else if (MSG_IS_REPLIED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
repliedxpm, repliedxpmmask);
} else if (MSG_IS_FORWARDED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
forwardedxpm, forwardedxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
NULL);
}
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
}
- if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+ if (MSG_IS_SIGNED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+ gpgsignedxpm, gpgsignedxpmmask);
+ } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipkeyxpm, clipkeyxpmmask);
} else if (MSG_IS_ENCRYPTED(flags)) {
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
GtkCTreeNode *node;
gtk_clist_freeze(clist);
+ folder_item_update_freeze();
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
summary_set_row_marks(summaryview, node);
}
gtk_clist_thaw(clist);
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
if (aval != G_ALERTDEFAULT) return;
}
+ main_window_cursor_wait(summaryview->mainwin);
+
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
folder_item_update_freeze();
gtk_sctree_set_anchor_row(GTK_SCTREE(ctree), node);
} else
summary_status_show(summaryview);
+
+ main_window_cursor_normal(summaryview->mainwin);
}
void summary_delete_duplicated(SummaryView *summaryview)
STATUSBAR_PUSH(summaryview->mainwin,
_("Deleting duplicated messages..."));
+ folder_item_update_freeze();
+
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_delete_duplicated_func),
summaryview);
else
summary_status_show(summaryview);
+ folder_item_update_thaw();
+
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
+ GtkCTreeNode *new_selected = NULL;
if (!summaryview->folder_item) return FALSE;
folder_item_update_thaw();
node = GTK_CTREE_NODE(clist->row_list);
- while (node != NULL) {
+ for (; node != NULL; node = next) {
next = gtkut_ctree_node_next(ctree, node);
- if (gtk_ctree_node_get_row_data(ctree, node) == NULL) {
- if (node == summaryview->displayed) {
- messageview_clear(summaryview->messageview);
- summaryview->displayed = NULL;
- }
- if (GTK_CTREE_ROW(node)->children != NULL)
- g_warning("summary_execute(): children != NULL\n");
- else
- gtk_ctree_remove_node(ctree, node);
+ if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+
+ if (node == summaryview->displayed) {
+ messageview_clear(summaryview->messageview);
+ summaryview->displayed = NULL;
}
- node = next;
+ if (GTK_CTREE_ROW(node)->children != NULL) {
+ g_warning("summary_execute(): children != NULL\n");
+ continue;
+ }
+
+ if (!new_selected &&
+ gtkut_ctree_node_is_selected(ctree, node)) {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ new_selected = summary_find_next_msg(summaryview, node);
+ if (!new_selected)
+ new_selected = summary_find_prev_msg
+ (summaryview, node);
+ }
+
+ gtk_ctree_remove_node(ctree, node);
+ }
+
+ if (new_selected) {
+ gtk_sctree_select
+ (GTK_SCTREE(ctree),
+ summaryview->displayed ? summaryview->displayed
+ : new_selected);
}
if (summaryview->threaded)
msginfo->inreplyto);
}
- if (parent == NULL) {
+ if (prefs_common.thread_by_subject && parent == NULL) {
parent = subject_table_lookup
(summaryview->subject_table,
msginfo->subject);
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (!summaryview->folder_item->thread_collapsed)
+ if (!summaryview->thread_collapsed)
gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- if (!summaryview->folder_item->thread_collapsed) {
+ if (!summaryview->thread_collapsed) {
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
summary_lock(summaryview);
+ folder_item_update_freeze();
+
debug_print("filtering...");
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
}
+ folder_item_update_thaw();
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
prefs_filtering_open(NULL, header, key);
}
-void summary_reply(SummaryView *summaryview, ComposeMode mode)
-{
- GList *sel = GTK_CLIST(summaryview->ctree)->selection;
- MsgInfo *msginfo;
- gchar *text;
-
- msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
- summaryview->selected);
- if (!msginfo) return;
-
- text = gtkut_editable_get_selection
- (GTK_EDITABLE(summaryview->messageview->textview->text));
-
- if (!text && summaryview->messageview->type == MVIEW_MIME
- && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
- && summaryview->messageview->mimeview->textview
- && !summaryview->messageview->mimeview->textview->default_text) {
- text = gtkut_editable_get_selection (GTK_EDITABLE
- (summaryview->messageview->mimeview->textview->text));
- }
-
- switch (mode) {
- case COMPOSE_REPLY:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, text);
- else
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_WITH_QUOTE:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
- else
- compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_WITHOUT_QUOTE:
- if (prefs_common.default_reply_list)
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
- else
- compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_SENDER:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_FOLLOWUP_AND_REPLY_TO:
- compose_followup_and_reply_to(msginfo,
- prefs_common.reply_with_quote,
- FALSE, TRUE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
- break;
- case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
- break;
- case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
- break;
- case COMPOSE_REPLY_TO_LIST:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
- break;
- case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
- break;
- case COMPOSE_FORWARD:
- if (prefs_common.forward_as_attachment) {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
- return;
- } else {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL);
- return;
- }
- break;
- case COMPOSE_FORWARD_INLINE:
- if (!sel->next) {
- compose_forward(NULL, msginfo, FALSE, text);
- break;
- }
- /* if (sel->next) FALL THROUGH */
- case COMPOSE_FORWARD_AS_ATTACH:
- {
- GSList *msginfo_list = NULL;
- for ( ; sel != NULL; sel = sel->next)
- msginfo_list = g_slist_append(msginfo_list,
- gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
- GTK_CTREE_NODE(sel->data)));
- compose_forward_multiple(NULL, msginfo_list);
- g_slist_free(msginfo_list);
- }
- break;
- case COMPOSE_REDIRECT:
- compose_redirect(NULL, msginfo);
- break;
- default:
- g_warning("summary_reply_cb(): invalid action: %d\n", mode);
- }
-
- summary_set_marks_selected(summaryview);
- g_free(text);
-}
-
/* color label */
#define N_COLOR_LABELS colorlabel_get_color_count()
gtk_ctree_node_set_row_style(ctree, node, style);
}
-static void summary_set_row_colorlable(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ main_window_cursor_wait(summaryview->mainwin);
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
- summary_set_row_colorlable(summaryview,
+ summary_set_row_colorlabel(summaryview,
GTK_CTREE_NODE(cur->data), labelcolor);
+ folder_item_update_thaw();
+ main_window_cursor_normal(summaryview->mainwin);
}
static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
GTK_JUSTIFY_CENTER);
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
SUMMARY_COL_MARK_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
- SUMMARY_COL_UNREAD_WIDTH);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+ SUMMARY_COL_STATUS_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
SUMMARY_COL_LOCKED_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
summaryview)
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK , summary_mark_clicked);
- CLIST_BUTTON_SIGNAL_CONNECT(S_COL_UNREAD , summary_unread_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME , summary_mime_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
summary_status_show(summaryview);
if (GTK_CLIST(ctree)->selection &&
- GTK_CLIST(ctree)->selection->next) {
+ GTK_CLIST(ctree)->selection->next) {
summaryview->display_msg = FALSE;
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
summaryview->selected = row;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo != NULL);
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
} else
summary_mark_row(summaryview, row);
break;
- case S_COL_UNREAD:
+ case S_COL_STATUS:
if (MSG_IS_UNREAD(msginfo->flags)) {
summary_mark_row_as_read(summaryview, row);
summary_status_show(summaryview);
if (summaryview->display_msg ||
(prefs_common.show_msg_with_cursor_key &&
messageview_is_visible(summaryview->messageview))) {
- summary_display_msg(summaryview, row);
summaryview->display_msg = FALSE;
- } else {
- summary_set_menu_sensitive(summaryview);
- toolbar_main_set_sensitive(summaryview->mainwin);
+ if (summaryview->displayed != row) {
+ summary_display_msg(summaryview, row);
+ return;
+ }
}
+
+ summary_set_menu_sensitive(summaryview);
+ toolbar_main_set_sensitive(summaryview->mainwin);
}
static void summary_col_resized(GtkCList *clist, gint column, gint width,
prefs_common.summary_col_size[type] = width;
}
+
+/*
+ * \brief get List of msginfo selected in SummaryView
+ *
+ * \param summaryview
+ *
+ * \return GSList holding MsgInfo
+ */
+GSList *summary_get_selection(SummaryView *summaryview)
+{
+ GList *sel = NULL;
+ GSList *msginfo_list = NULL;
+
+ g_return_val_if_fail(summaryview != NULL, NULL);
+
+ sel = GTK_CLIST(summaryview->ctree)->selection;
+
+ g_return_val_if_fail(sel != NULL, NULL);
+
+ for ( ; sel != NULL; sel = sel->next)
+ msginfo_list =
+ g_slist_append(msginfo_list,
+ gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(sel->data)));
+ return msginfo_list;
+}
+
static void summary_reply_cb(SummaryView *summaryview, guint action,
GtkWidget *widget)
{
- summary_reply(summaryview, (ComposeMode)action);
+ MessageView *msgview = (MessageView*)summaryview->messageview;
+ GSList *msginfo_list;
+ gchar *body;
+
+ g_return_if_fail(msgview != NULL);
+
+ msginfo_list = summary_get_selection(summaryview);
+ g_return_if_fail(msginfo_list != NULL);
+
+ body = messageview_get_selection(msgview);
+
+ compose_reply_mode((ComposeMode)action, msginfo_list, body);
+ g_free(body);
+ g_slist_free(msginfo_list);
}
static void summary_execute_cb(SummaryView *summaryview, guint action,
summary_sort_by_column_click(summaryview, SORT_BY_MARK);
}
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+ summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
}
static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
CMP_FUNC_DEF(summary_cmp_by_mark,
MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
-CMP_FUNC_DEF(summary_cmp_by_unread,
+CMP_FUNC_DEF(summary_cmp_by_status,
MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_mime,
MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);