/*
* 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 "inc.h"
#include "imap.h"
#include "addressbook.h"
-#include "addr_compl.h"
#include "scoring.h"
#include "prefs_folder_item.h"
#include "filtering.h"
#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,
GtkCTreeNode *row);
static void summary_lock_row (SummaryView *summaryview,
GtkCTreeNode *row);
+static void summary_unlock_row (SummaryView *summaryview,
+ GtkCTreeNode *row);
static void summary_mark_row_as_read (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_mark_row_as_unread (SummaryView *summaryview,
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 gint summary_cmp_by_from (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_subject (GtkCList *clist,
- gconstpointer ptr1,
- gconstpointer ptr2);
static gint summary_cmp_by_simplified_subject
(GtkCList *clist,
gconstpointer ptr1,
static gint summary_cmp_by_to (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_subject (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_locked (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
+ {N_("/_Mark/Lock"), NULL, summary_msgs_lock, 0, NULL},
+ {N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
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 */
"Sg #", N_("messages whose size is greater than #"),
"Ss #", N_("messages whose size is smaller than #"),
"t S", N_("messages which have been sent to S"),
- "T", N_("marked marked"),
+ "T", N_("marked messages"),
"U", N_("unread messages"),
"x S", N_("messages which contain S in References header"),
"y S", N_("messages which contain S in X-Label header"),
&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
messageview_clear(summaryview->messageview);
buf = NULL;
- if (!item || !item->path || !item->parent || item->no_select ||
- (item->folder->type == F_MH &&
- ((buf = folder_item_get_path(item)) == NULL ||
- change_dir(buf) < 0))) {
+ if (!item || !item->path || !item->parent || item->no_select) {
g_free(buf);
debug_print("empty folder\n\n");
summary_set_hide_read_msgs_menu(summaryview, FALSE);
|| 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);
return;
}
- if (summaryview->folder_item->folder->type != F_NEWS)
+ if (FOLDER_TYPE(summaryview->folder_item->folder) != F_NEWS)
menu_set_sensitive(ifactory, "/Move...", TRUE);
else
menu_set_sensitive(ifactory, "/Move...", FALSE);
menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Lock", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Unlock", TRUE);
menu_set_sensitive(ifactory, "/Color label", TRUE);
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;
guint n_selected = 0;
off_t sel_size = 0;
MsgInfo *msginfo;
+ gchar *name;
if (!summaryview->folder_item) {
gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
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 &&
- prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
- 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),
- summaryview->folder_item->path);
- }
+ name = folder_item_get_name(summaryview->folder_item);
+ gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), name);
+ g_free(name);
if (summaryview->deleted)
del = g_strdup_printf(_("%d deleted"), summaryview->deleted);
g_free(cp);
g_free(itstr);
- if (FOLDER_IS_LOCAL(summaryview->folder_item->folder)) {
- str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages,
- to_human_readable(summaryview->total_size));
- } else {
- str = g_strdup_printf(_("%d new, %d unread, %d total"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages);
- }
+ str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+ summaryview->newmsgs,
+ summaryview->unread,
+ summaryview->messages,
+ to_human_readable(summaryview->total_size));
+
gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
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;
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();
-
for (cur = mlist ; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
msginfo->threadscore = msginfo->score;
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 &&
optimal_width);
}
- if (prefs_common.use_addr_book)
- end_address_completion();
-
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
if (debug_get_mode()) {
static gchar *summary_complete_address(const gchar *addr)
{
- gint count;
gchar *res, *tmp, *email_addr;
Xstrdup_a(email_addr, addr, return NULL);
* completion stuff must be already initialized
*/
res = NULL;
- if (1 < (count = complete_address(email_addr))) {
- tmp = get_complete_address(1);
+ tmp = addressbook_lookup_name( email_addr );
+ if( tmp ) {
res = procheader_get_fromname(tmp);
- g_free(tmp);
+ g_free(tmp);
}
-
+
return res;
}
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);
Xstrdup_a(addr, msginfo->from, return);
extract_address(addr);
-
if (prefs_common.use_addr_book) {
if (account_find_from_address(addr)) {
addr = summary_complete_address(msginfo->to);
g_free(addr);
}
} else {
- if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+ if (account_find_from_address(addr)) {
g_free(to);
to = g_strconcat("-->", msginfo->to, NULL);
text[col_pos[S_COL_FROM]] = to;
/* 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)) {
summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
}
-static gboolean summary_update_unread_children (SummaryView *summaryview, MsgInfo *info, gboolean newly_marked)
-{
- GSList *children = procmsg_find_children(info);
- GSList *cur;
- gboolean changed = FALSE;
- for (cur = children; cur != NULL; cur = g_slist_next(cur)) {
- MsgInfo *tmp = (MsgInfo *)cur->data;
- if(MSG_IS_UNREAD(tmp->flags) && !MSG_IS_IGNORE_THREAD(tmp->flags)) {
- if(newly_marked)
- summaryview->unreadmarked++;
- else
- summaryview->unreadmarked--;
- changed = TRUE;
- }
- procmsg_msginfo_free(tmp);
- }
- return changed;
-}
-
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
- changed |= summary_update_unread_children (summaryview, msginfo, TRUE);
+ procmsg_update_unread_children (msginfo, TRUE);
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- /* almost verbatim summary_mark_row(); may want a menu action? */
gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
summaryview->copied--;
changed = TRUE;
}
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
+static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+ gboolean changed = FALSE;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (!MSG_IS_LOCKED(msginfo->flags))
+ return;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
+ procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
+ summary_set_row_marks(summaryview, row);
+ debug_print("Message %d is unlocked\n", msginfo->msgnum);
+}
+
void summary_mark(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if(!MSG_IS_NEW(msginfo->flags) && !MSG_IS_UNREAD(msginfo->flags))
+ if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->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);
+}
+
+void summary_msgs_lock(SummaryView *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_lock_row(summaryview,
+ GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+
+ summary_status_show(summaryview);
+}
+void summary_msgs_unlock(SummaryView *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_unlock_row(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);
- for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
- node = gtkut_ctree_node_next(ctree, node)) {
- if (!GTK_CTREE_ROW(node)->expanded)
- summary_set_row_marks(summaryview, node);
- }
gtk_clist_thaw(clist);
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
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);
}
GList * cur;
gboolean found;
- switch (summaryview->folder_item->folder->type) {
+ switch (FOLDER_TYPE(summaryview->folder_item->folder)) {
case F_NEWS:
static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if (MSG_IS_DELETED(msginfo->flags)) return;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
- changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+ procmsg_update_unread_children (msginfo, FALSE);
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted++;
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();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summary_delete_row(summaryview, sel_last);
}
+ folder_item_update_thaw();
node = summary_find_next_msg(summaryview, sel_last);
if (!node)
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)
{
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
if (summaryview->folder_item->stype == F_TRASH) return;
main_window_cursor_wait(summaryview->mainwin);
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);
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- changed |= summary_update_unread_children (summaryview, msginfo, FALSE);
+ procmsg_update_unread_children (msginfo, FALSE);
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_MOVE(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
summaryview->moved++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
}
debug_print("Message %d is set to move to %s\n",
if (!to_folder) return;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
if (summary_is_locked(summaryview)) return;
FolderItem *to_folder;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
FOLDER_SEL_MOVE, NULL);
static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_COPY(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
summaryview->copied++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
- }
}
debug_print("Message %d is set to copy to %s\n",
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;
if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
+ folder_item_update_freeze();
summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
+ 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 = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
gtk_ctree_node_set_row_data(ctree, node, NULL);
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
GSList *cur;
trash = summaryview->folder_item->folder->trash;
- if (summaryview->folder_item->folder->type == F_MH) {
- g_return_if_fail(trash != NULL);
- }
/* search deleting messages and execute */
gtk_ctree_pre_recursive
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 (prefs_common.expand_thread)
+ 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 (prefs_common.expand_thread) {
+ if (!summaryview->thread_collapsed) {
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
gtk_clist_thaw(GTK_CLIST(ctree));
+ summaryview->thread_collapsed = FALSE;
+
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
}
gtk_clist_thaw(GTK_CLIST(ctree));
+
+ summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
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);
void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
{
- static HeaderEntry hentry[] = {{"X-BeenThere:", NULL, FALSE},
- {"X-ML-Name:", NULL, FALSE},
- {"X-List:", NULL, FALSE},
- {"X-Mailing-list:", NULL, FALSE},
- {"List-Id:", NULL, FALSE},
- {NULL, NULL, FALSE}};
-
- static gchar *header_strs[] = {"From", "from", "To", "to", "Subject", "subject"};
-
- static gchar *hentry_strs[] = {"X-BeenThere", "X-ML-Name", "X-List",
- "X-Mailing-List", "List-Id",
- "header \"X-BeenThere\"", "header \"X-ML-Name\"",
- "header \"X-List\"", "header \"X-Mailing-List\"",
- "header \"List-Id\""};
- enum
- {
- H_X_BEENTHERE = 0,
- H_X_ML_NAME = 1,
- H_X_LIST = 2,
- H_X_MAILING_LIST = 3,
- H_LIST_ID = 4
- };
-
- enum
- {
- H_FROM = 0,
- H_TO = 2,
- H_SUBJECT = 4
- };
-
MsgInfo *msginfo;
gchar *header = NULL;
gchar *key = NULL;
- FILE *fp;
- int header_offset;
- int hentry_offset;
if (!summaryview->selected) return;
summaryview->selected);
if (!msginfo) return;
- header_offset = 1;
- hentry_offset = 5;
-
- switch (type) {
- case FILTER_BY_NONE:
- break;
- case FILTER_BY_AUTO:
- if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- procheader_get_header_fields(fp, hentry);
- fclose(fp);
-
- if (hentry[H_X_BEENTHERE].body != NULL) {
- header = hentry_strs[H_X_BEENTHERE + hentry_offset];
- Xstrdup_a(key, hentry[H_X_BEENTHERE].body, );
- } else if (hentry[H_X_ML_NAME].body != NULL) {
- header = hentry_strs[H_X_ML_NAME + hentry_offset];
- Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
- } else if (hentry[H_X_LIST].body != NULL) {
- header = hentry_strs[H_X_LIST + hentry_offset];
- Xstrdup_a(key, hentry[H_X_LIST].body, );
- } else if (hentry[H_X_MAILING_LIST].body != NULL) {
- header = hentry_strs[H_X_MAILING_LIST + hentry_offset];
- Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
- } else if (hentry[H_LIST_ID].body != NULL) {
- header = hentry_strs[H_LIST_ID + hentry_offset];
- Xstrdup_a(key, hentry[H_LIST_ID].body, );
- } else if (msginfo->subject) {
- header = header_strs[H_SUBJECT + header_offset];
- key = msginfo->subject;
- }
-
- g_free(hentry[H_X_BEENTHERE].body);
- hentry[H_X_BEENTHERE].body = NULL;
- g_free(hentry[H_X_ML_NAME].body);
- hentry[H_X_ML_NAME].body = NULL;
- g_free(hentry[H_X_LIST].body);
- hentry[H_X_LIST].body = NULL;
- g_free(hentry[H_X_MAILING_LIST].body);
- hentry[H_X_MAILING_LIST].body = NULL;
- g_free(hentry[H_LIST_ID].body);
- hentry[H_LIST_ID].body = NULL;
-
- break;
- case FILTER_BY_FROM:
- header = header_strs[H_FROM + header_offset];
- key = msginfo->from;
- break;
- case FILTER_BY_TO:
- header = header_strs[H_TO + header_offset];
- key = msginfo->to;
- break;
- case FILTER_BY_SUBJECT:
- header = header_strs[H_SUBJECT + header_offset];
- key = msginfo->subject;
- break;
- default:
- break;
- }
-
- /*
- * NOTE: key may be allocated on the stack, so
- * prefs_filter[ing]_open() should have completed
- * and have set entries. Otherwise we're hosed.
- */
-
+ procmsg_get_filter_keyword(msginfo, &header, &key, type);
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);
+ g_free(header);
+ g_free(key);
}
/* color label */
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))
return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
}
-CMP_FUNC_DEF(summary_cmp_by_subject, subject);
CMP_FUNC_DEF(summary_cmp_by_to, to);
#undef CMP_FUNC_DEF
+static gint summary_cmp_by_subject(GtkCList *clist, \
+ gconstpointer ptr1, \
+ gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1->subject) \
+ return (msginfo2->subject != NULL); \
+ if (!msginfo2->subject) \
+ return -1; \
+ \
+ return subject_compare_for_sort \
+ (msginfo1->subject, msginfo2->subject); \
+}
+
static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
gconstpointer ptr2)
{
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
+
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
}
+ 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) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
}
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
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);
/* Threading */
summaryview->threaded = item->threaded;
+ summaryview->thread_collapsed = item->thread_collapsed;
/* Scoring */
if (global_scoring || item->prefs->scoring) {
/* Threading */
item->threaded = summaryview->threaded;
+ item->thread_collapsed = summaryview->thread_collapsed;
}
static gboolean summary_update_msg(gpointer source, gpointer data)
folderview_select(summaryview->mainwin->folderview, sent_folder);
}
+ gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
+ S_SEARCH_EXTENDED);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
+
gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
g_free(buf);
summary_show(summaryview, summaryview->folder_item);
projects / claws.git / blobdiff