#include "prefs_common.h"
#include "prefs_summary_column.h"
#include "prefs_filter.h"
+#include "prefs_filtering.h"
#include "account.h"
#include "compose.h"
#include "utils.h"
static GtkCTreeNode *summary_find_next_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_unread_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_unread_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_marked_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_marked_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_labeled_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_labeled_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
+
+static GtkCTreeNode *summary_find_prev_flagged_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_prev);
+static GtkCTreeNode *summary_find_next_flagged_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_next);
+
static GtkCTreeNode *summary_find_msg_by_msgnum
(SummaryView *summaryview,
guint msgnum);
static GtkWidget *summary_ctree_create (SummaryView *summaryview);
-static void summary_toggle_view(SummaryView *summarview);
-
/* callback functions */
-static void summary_toggle_view_cb (GtkWidget *widget,
- gpointer data);
+static void summary_toggle_pressed (GtkWidget *eventbox,
+ GdkEventButton *event,
+ SummaryView *summaryview);
static void summary_button_pressed (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
gconstpointer ptr1,
gconstpointer ptr2);
-static void news_process_crossposted (MsgInfo *msginfo);
static void news_flag_crosspost (MsgInfo *msginfo);
GtkTargetEntry summary_drag_types[1] =
{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_("/Bounce"), NULL, summary_reply_cb, COMPOSE_BOUNCE, NULL},
+ {N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *hbox_spc;
- GtkWidget *toggle_view_btn;
- GtkWidget *toggle_view_arrow;
+ GtkWidget *toggle_eventbox;
+ GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
gint n_entries;
statlabel_select = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
- /* toggle view buttons */
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+ /* toggle view button */
+ toggle_eventbox = gtk_event_box_new();
+ gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
+ toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
+ gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
+ GTK_SIGNAL_FUNC(summary_toggle_pressed),
+ summaryview);
statlabel_msgs = gtk_label_new("");
gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
- summaryview->toggle_view_btn = toggle_view_btn;
- summaryview->toggle_view_arrow = toggle_view_arrow;
+ summaryview->toggle_eventbox = toggle_eventbox;
+ summaryview->toggle_arrow = toggle_arrow;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
- summaryview->msg_is_toggled_on = TRUE;
summaryview->lock_count = 0;
- summaryview->sort_mode = SORT_BY_NONE;
- summaryview->sort_type = GTK_SORT_ASCENDING;
gtk_widget_show_all(vbox);
guint displayed_msgnum = 0;
GtkCTreeNode *selected_node = summaryview->folderview->selected;
GSList *cur;
- gint sort_mode;
- gint sort_type;
- static gboolean locked = FALSE;
if (summary_is_locked(summaryview)) return FALSE;
main_window_cursor_wait(summaryview->mainwin);
+/*
mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
+ !!! NEW !!!
+ USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
+ BY OTHER PROGRAMS TO THE FOLDER
+*/
+ mlist = folder_item_get_msg_list(item);
+
summary_processing(summaryview, mlist);
for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
if (summaryview->folder_item->hide_read_msgs) {
GSList *not_killed;
- gint kill_score;
summary_set_hide_read_msgs_menu(summaryview, TRUE);
not_killed = NULL;
g_slist_free(mlist);
+ folderview_update_msg_num(summaryview->folderview,
+ summaryview->folderview->opened);
+
+ if (item->sort_key != SORT_BY_NONE)
+ summary_sort(summaryview, item->sort_key, item->sort_type);
+
summary_write_cache(summaryview);
gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), 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) {
summaryview->displayed =
summary_find_msg_by_msgnum(summaryview,
if (!summaryview->selected) {
/* no selected message - select first unread
message, but do not display it */
- node = summary_find_next_unread_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
node = gtk_ctree_node_nth
- (ctree, sort_type ==
- GTK_SORT_DESCENDING ? 0 :
- GTK_CLIST(ctree)->rows - 1);
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
summary_select_node(summaryview, node, FALSE, TRUE);
}
} else {
/* select first unread message */
- if (sort_mode == SORT_BY_SCORE)
+ if (item->sort_key == SORT_BY_SCORE)
node = summary_find_next_important_score(summaryview,
NULL);
else
- node = summary_find_next_unread_msg(summaryview, NULL);
-
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
- /* Get the last visible node on screen */
- /* FIXME: huh, what happens if node is null? that allowed?? */
- node = gtk_ctree_node_nth(ctree, sort_type ==
- GTK_SORT_DESCENDING ? 0 :
- GTK_CLIST(ctree)->rows - 1);
- }
+ node = gtk_ctree_node_nth
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
+ }
if (prefs_common.open_unread_on_enter) {
summary_unlock(summaryview);
summary_select_node(summaryview, node, TRUE, TRUE);
g_hash_table_destroy(summaryview->folder_table);
summaryview->folder_table = NULL;
}
- summaryview->sort_mode = SORT_BY_NONE;
- summaryview->sort_type = GTK_SORT_ASCENDING;
gtk_clist_clear(clist);
if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
menu_set_sensitive(ifactory, "/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", TRUE);
- menu_set_sensitive(ifactory, "/Bounce", TRUE);
+ menu_set_sensitive(ifactory, "/Redirect", sens);
menu_set_sensitive(ifactory, "/Add sender to address book", sens);
menu_set_sensitive(ifactory, "/Create filter rule", sens);
{
GtkCTreeNode *node;
- node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
if (!node) {
- AlertValue val;
+ AlertValue val = 0;
switch (prefs_common.next_unread_msg_dialog) {
case NEXTUNREADMSGDIALOG_ALWAYS:
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_unread_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
}
if (!node)
GtkCTreeNode *node = summaryview->selected;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- while ((node = summary_find_next_unread_msg(summaryview, node)) == NULL) {
+ node = summary_find_next_flagged_msg
+ (summaryview, node, MSG_UNREAD, FALSE);
+
+ if (node)
+ summary_select_node(summaryview, node, TRUE, FALSE);
+ else {
+ node = summary_find_next_flagged_msg
+ (summaryview, NULL, MSG_UNREAD, FALSE);
+ if (node == NULL) {
+ AlertValue val = 0;
+
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more unread messages"),
+ _("No unread message found. "
+ "Go to next folder?"),
+ _("Yes"), _("No"), NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTDEFAULT;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
+
+ if (val == G_ALERTDEFAULT) {
+ 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");
+ folderview_select_next_unread(summaryview->folderview);
+ return;
+ }
+ else
+ return;
+ } else
+ summary_select_node(summaryview, node, TRUE, FALSE);
+
+ }
+}
+
+void summary_select_prev_new(SummaryView *summaryview)
+{
+ GtkCTreeNode *node;
+
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_NEW, FALSE);
+
+ if (!node) {
AlertValue val;
- switch (prefs_common.next_unread_msg_dialog) {
- case NEXTUNREADMSGDIALOG_ALWAYS:
- val = alertpanel(_("No more unread messages"),
- _("No unread message found. "
- "Go to next folder?"),
- _("Yes"), _("Search again"), _("No"));
- break;
- case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
- break;
- case NEXTUNREADMSGDIALOG_ASSUME_NO:
- val = G_ALERTOTHER;
- break;
- default:
- debug_print(
- _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
- }
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Search from the end?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ }
+
+ if (!node)
+ alertpanel_notice(_("No new messages."));
+ else
+ summary_select_node(summaryview, node, TRUE, FALSE);
+}
+
+void summary_select_next_new(SummaryView *summaryview)
+{
+ GtkCTreeNode *node = summaryview->selected;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ while ((node = summary_find_next_flagged_msg
+ (summaryview, node, MSG_NEW, FALSE)) == NULL) {
+ AlertValue val;
+
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Go to next folder?"),
+ _("Yes"), _("Search again"), _("No"));
if (val == G_ALERTDEFAULT) {
if (gtk_signal_n_emissions_by_name
(GTK_OBJECT(ctree), "key_press_event") > 0)
{
GtkCTreeNode *node;
- node = summary_find_prev_marked_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_MARKED, TRUE);
if (!node) {
AlertValue val;
"Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_marked_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_MARKED, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_next_marked_msg(summaryview, summaryview->selected);
+ node = summary_find_next_flagged_msg
+ (summaryview, summaryview->selected, MSG_MARKED, TRUE);
if (!node) {
AlertValue val;
"Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_marked_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
if (!node) {
AlertValue val;
"Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_labeled_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_CLABEL_FLAG_MASK, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_next_labeled_msg(summaryview, summaryview->selected);
+ node = summary_find_next_flagged_msg
+ (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
if (!node) {
AlertValue val;
"Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_labeled_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_CLABEL_FLAG_MASK, TRUE);
}
if (!node)
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 (!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;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = current_node;
- else
- node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
- for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = current_node;
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
+ if (!MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
}
-static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_prev)
{
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_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
- 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_next_marked_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = gtkut_ctree_node_next(ctree, current_node);
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_MARKED(msginfo->flags)) break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_prev_labeled_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
+ if (current_node) {
+ if (start_from_prev)
+ node = GTK_CTREE_NODE_PREV(current_node);
+ else
+ node = current_node;
+ } else
node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ if ((msginfo->flags.perm_flags & flags) != 0) break;
}
return node;
}
-static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_next)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = gtkut_ctree_node_next(ctree, current_node);
- else
+ if (current_node) {
+ if (start_from_next)
+ node = gtkut_ctree_node_next(ctree, current_node);
+ else
+ node = current_node;
+ } else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ /* 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))
+ break;
}
return node;
n_selected++;
}
- if (summaryview->folder_item->folder->type == F_NEWS) {
+ 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));
}
gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
-
- summaryview->folder_item->new = summaryview->newmsgs;
- summaryview->folder_item->unread = summaryview->unread;
- summaryview->folder_item->total = summaryview->messages;
-
- folderview_update_msg_num(summaryview->folderview,
- summaryview->folderview->opened);
}
static void summary_set_column_titles(SummaryView *summaryview)
SummaryColumnType type;
gboolean single_char;
GtkJustification justify;
+ FolderItem *item = summaryview->folder_item;
- static SummarySortType sort_by[N_SUMMARY_COLS] = {
+ static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
SORT_BY_UNREAD,
SORT_BY_MIME,
gtk_box_pack_start(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
- if (summaryview->sort_mode == sort_by[type]) {
+ if (item && item->sort_key == sort_by[type]) {
arrow = gtk_arrow_new
- (summaryview->sort_type == GTK_SORT_ASCENDING
+ (item->sort_type == SORT_ASCENDING
? GTK_ARROW_DOWN : GTK_ARROW_UP,
GTK_SHADOW_IN);
if (justify == GTK_JUSTIFY_RIGHT)
}
}
-void summary_sort(SummaryView *summaryview, SummarySortType type)
+void summary_sort(SummaryView *summaryview,
+ FolderSortKey sort_key, FolderSortType sort_type)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func;
+ FolderItem *item = summaryview->folder_item;
- if (!summaryview->folder_item)
- return;
+ if (!item || !item->path || !item->parent || item->no_select) return;
- switch (type) {
+ switch (sort_key) {
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
break;
case SORT_BY_LABEL:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
break;
+ case SORT_BY_NONE:
+ item->sort_key = sort_key;
+ item->sort_type = SORT_ASCENDING;
+ summary_set_column_titles(summaryview);
+ summary_set_menu_sensitive(summaryview);
+ return;
default:
return;
}
gtk_clist_set_compare_func(clist, cmp_func);
- /* toggle sort type if the same column is selected */
- if (summaryview->sort_mode == type)
- summaryview->sort_type =
- summaryview->sort_type == GTK_SORT_ASCENDING
- ? GTK_SORT_DESCENDING : GTK_SORT_ASCENDING;
- else
- summaryview->sort_type = GTK_SORT_ASCENDING;
- gtk_clist_set_sort_type(clist, summaryview->sort_type);
- summaryview->sort_mode = type;
+ gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
+ item->sort_key = sort_key;
+ item->sort_type = sort_type;
summary_set_column_titles(summaryview);
+ summary_set_menu_sensitive(summaryview);
- gtk_ctree_sort_recursive(ctree, NULL);
+ gtk_sctree_sort_recursive(ctree, NULL);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
- 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);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
- MsgInfo *parentinfo;
- MsgInfo *cur_msginfo;
- GtkCTreeNode *node = NULL;
+ GtkCTreeNode *node = NULL;
GHashTable *msgid_table;
GHashTable *subject_table;
GSList * cur;
- GtkCTreeNode *cur_parent;
-
+
if (!mlist) return;
debug_print(_("\tSetting summary from message data..."));
if (!summaryview->folder_item || !summaryview->folder_item->path)
return -1;
+
+ if (!summaryview->folder_item->cache)
+ return -1;
+
+ folder_item_write_cache(summaryview->folder_item);
+ return 0;
if (summaryview->folder_item->folder->update_mark != NULL)
summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
{
static gchar date_modified[80];
static gchar *to = NULL;
- static gchar *from_name = NULL;
- static gchar col_number[11];
static gchar col_score[11];
static gchar buf[BUFFSIZE];
PrefsFolderItem *prefs = summaryview->folder_item->prefs;
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
-
-#if 0
- text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->threadscore);
-#else
text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
-#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
!MSG_IS_NEWS(msginfo->flags)) {
gchar *addr = NULL;
+ Xstrdup_a(addr, msginfo->from, return);
+ extract_address(addr);
+
if (prefs_common.use_addr_book) {
- Xstrdup_a(addr, msginfo->from, return);
- extract_address(addr);
-
- if (account_find_from_address(addr)) {
- addr = summary_complete_address(msginfo->to);
- g_free(to);
- to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
- text[col_pos[S_COL_FROM]] = to;
+ if (account_find_from_address(addr)) {
+ addr = summary_complete_address(msginfo->to);
+ g_free(to);
+ to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
+ text[col_pos[S_COL_FROM]] = to;
+ }
+ } else {
+ if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+ g_free(to);
+ to = g_strconcat("-->", msginfo->to, NULL);
+ text[col_pos[S_COL_FROM]] = to;
}
}
}
}
g_free(filename);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) ||
- MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
- }
+*/
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_set_row_marks(summaryview, row);
+ gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_status_show(summaryview);
flags = msginfo->flags;
msgview = summaryview->messageview;
summaryview->displayed = row;
- if (!summaryview->msg_is_toggled_on)
- summary_toggle_view(summaryview);
+ if (!messageview_is_visible(msgview))
+ main_window_toggle_message_view(summaryview->mainwin);
messageview_show(msgview, msginfo, all_headers);
if (msgview->type == MVIEW_TEXT ||
(msgview->type == MVIEW_MIME &&
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags) ||
- (MSG_IS_MIME(msginfo->flags) - MSG_IS_MIME(flags) != 0)) {
- MSG_UNSET_PERM_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);
- }
summary_set_menu_sensitive(summaryview);
main_window_set_toolbar_sensitive(summaryview->mainwin);
}
}
- if (summaryview->msg_is_toggled_on)
+ if (messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
}
-static void summary_toggle_view(SummaryView *summaryview)
-{
- MainWindow *mainwin = summaryview->mainwin;
- GtkItemFactory *ifactory;
-
- if (!mainwin) return;
-
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
- menu_toggle_toggle(ifactory, "/View/Expand Summary View");
-}
-
-void summary_toggle_view_real(SummaryView *summaryview)
+void summary_toggle_view(SummaryView *summaryview)
{
- MainWindow *mainwin = summaryview->mainwin;
- union CompositeWin *cwin = &mainwin->win;
- GtkWidget *vpaned = NULL;
- GtkWidget *container = NULL;
- GtkWidget *toggle_view_btn;
- GtkWidget *toggle_view_arrow;
- GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-
- switch (mainwin->type) {
- case SEPARATE_NONE:
- vpaned = cwin->sep_none.vpaned;
- container = cwin->sep_none.hpaned;
- break;
- case SEPARATE_FOLDER:
- vpaned = cwin->sep_folder.vpaned;
- container = mainwin->vbox_body;
- break;
- case SEPARATE_MESSAGE:
- case SEPARATE_BOTH:
- return;
- }
-
- if (vpaned->parent != NULL) {
- summaryview->msg_is_toggled_on = FALSE;
- summaryview->displayed = NULL;
- gtk_widget_ref(vpaned);
- gtkut_container_remove(GTK_CONTAINER(container), vpaned);
- gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-
- gtk_widget_destroy(summaryview->toggle_view_arrow);
- gtk_widget_destroy(summaryview->toggle_view_btn);
-
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
- gtk_widget_show_all(toggle_view_btn);
- menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
- } else {
- summaryview->msg_is_toggled_on = TRUE;
- gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
- gtk_container_add(GTK_CONTAINER(container), vpaned);
- gtk_widget_unref(vpaned);
-
- gtk_widget_destroy(summaryview->toggle_view_arrow);
- gtk_widget_destroy(summaryview->toggle_view_btn);
-
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
- gtk_widget_show_all(toggle_view_btn);
- menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
- }
-
- gtk_widget_grab_focus(summaryview->ctree);
-
- summaryview->toggle_view_btn = toggle_view_btn;
- summaryview->toggle_view_arrow = toggle_view_arrow;
+ if (!messageview_is_visible(summaryview->messageview) &&
+ summaryview->selected)
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ else
+ main_window_toggle_message_view(summaryview->mainwin);
}
static gboolean summary_search_unread_recursive(GtkCTree *ctree,
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_MARKED);
- CHANGE_FLAGS(msginfo);
+ 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);
debug_print(_("Message %s/%d is marked\n"), msginfo->folder->path, msginfo->msgnum);
}
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_LOCKED);
- CHANGE_FLAGS(msginfo);
+ 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);
}
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
- if (MSG_IS_NEW(msginfo->flags) ||
- MSG_IS_UNREAD(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
- CHANGE_FLAGS(msginfo);
- summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as read\n"),
- msginfo->msgnum);
- }
+*/
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_set_row_marks(summaryview, row);
+ debug_print(_("Message %d is marked as read\n"),
+ msginfo->msgnum);
}
void summary_mark_as_read(SummaryView *summaryview)
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+ procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
- if (!MSG_IS_UNREAD(msginfo->flags)) {
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_UNREAD);
+/* NOT NEEDED ANYMORE
+ if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
- debug_print(_("Message %d is marked as unread\n"),
- msginfo->msgnum);
- }
+*/
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+ debug_print(_("Message %d is marked as unread\n"),
+ msginfo->msgnum);
summary_set_row_marks(summaryview, row);
}
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
+ procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted++;
if (!prefs_common.immediate_exec &&
else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
else
- summary_select_node(summaryview, node,
- summaryview->msg_is_toggled_on,
- FALSE);
+ summary_select_node
+ (summaryview, node,
+ messageview_is_visible(summaryview->messageview),
+ FALSE);
}
if (prefs_common.immediate_exec || item->stype == F_TRASH)
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
+
debug_print(_("Message %s/%d is unmarked\n"),
msginfo->folder->path, msginfo->msgnum);
}
if (!prefs_common.immediate_exec)
msginfo->to_folder->op_count--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
summaryview->moved++;
changed = TRUE;
}
if (!prefs_common.immediate_exec)
msginfo->to_folder->op_count--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
summaryview->copied++;
changed = TRUE;
}
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folder_item_scan_foreach(summaryview->folder_table);
folderview_update_item_foreach(summaryview->folder_table);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
summaryview->mlist = NULL;
}
+ folderview_update_item(summaryview->folder_item, FALSE);
g_hash_table_destroy(summaryview->folder_table);
summaryview->folder_table = NULL;
}
if (summaryview->mlist) {
procmsg_copy_messages(summaryview->mlist);
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_slist_free(summaryview->mlist);
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
summary_set_row_marks(summaryview, node);
}
}
GSList *cur;
trash = summaryview->folder_item->folder->trash;
-
if (summaryview->folder_item->folder->type == F_MH) {
g_return_if_fail(trash != NULL);
}
summaryview->mlist = NULL;
if ((summaryview->folder_item != trash) && (trash != NULL)) {
- folder_item_scan(trash);
folderview_update_item(trash, FALSE);
}
+ folderview_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
GSList * processing_list;
FolderItem * folder_item;
GSList * cur;
- gchar * id;
gchar * buf;
folder_item = summaryview->folder_item;
summaryview->folder_table);
}
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_hash_table_destroy(summaryview->folder_table);
summary_unlock(summaryview);
}
+void summary_expand_threads(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ gtk_clist_freeze(GTK_CLIST(ctree));
+
+ while (node) {
+ if (GTK_CTREE_ROW(node)->children)
+ gtk_ctree_expand(ctree, node);
+ node = GTK_CTREE_NODE_NEXT(node);
+ }
+
+ gtk_clist_thaw(GTK_CLIST(ctree));
+
+ gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+}
+
+void summary_collapse_threads(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ gtk_clist_freeze(GTK_CLIST(ctree));
+
+ while (node) {
+ if (GTK_CTREE_ROW(node)->children)
+ gtk_ctree_collapse(ctree, node);
+ node = GTK_CTREE_ROW(node)->sibling;
+ }
+
+ gtk_clist_thaw(GTK_CLIST(ctree));
+
+ gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+}
+
void summary_filter(SummaryView *summaryview)
{
if (!prefs_common.fltlist && !global_processing) {
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_hash_table_destroy(summaryview->folder_table);
void summary_reply(SummaryView *summaryview, ComposeMode mode)
{
- GtkWidget *widget;
GList *sel = GTK_CLIST(summaryview->ctree)->selection;
MsgInfo *msginfo;
gchar *text;
break;
case COMPOSE_FORWARD:
if (prefs_common.forward_as_attachment) {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
+ summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
return;
} else {
- summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
+ summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, NULL);
return;
}
break;
g_slist_free(msginfo_list);
}
break;
- case COMPOSE_BOUNCE:
- compose_bounce(NULL, msginfo);
+ case COMPOSE_REDIRECT:
+ compose_redirect(NULL, msginfo);
break;
default:
g_warning("summary_reply_cb(): invalid action: %d\n", mode);
gint color_index;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
- MSG_SET_COLORLABEL_VALUE(msginfo->flags, labelcolor);
+ procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
-
item = summaryview->folder_item;
summary_lock(summaryview);
}
-
/* callback functions */
-static void summary_toggle_view_cb(GtkWidget *button,
- gpointer data)
+static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+ SummaryView *summaryview)
{
- SummaryView *summaryview = (SummaryView *) data;
-
- if (!summaryview->msg_is_toggled_on && summaryview->selected)
- summary_display_msg(summaryview, summaryview->selected);
- else
- summary_toggle_view(summaryview);
+ if (!event) return;
+
+ summary_toggle_view(summaryview);
}
static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
summaryview->display_msg = TRUE;
} else if (event->button == 1) {
if (!prefs_common.emulate_emacs &&
- summaryview->msg_is_toggled_on)
+ messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
}
}
textview_scroll_one_line(summaryview->messageview->textview,
(event->state & GDK_MOD1_MASK) != 0);
break;
+ case GDK_asterisk: /* Mark */
+ summary_mark(summaryview);
+ break;
+ case GDK_exclam: /* Mark as unread */
+ summary_mark_as_unread(summaryview);
+ break;
case GDK_Delete:
RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
} else
summary_mark_row(summaryview, row);
break;
case S_COL_LOCKED:
if (MSG_IS_LOCKED(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
}
else
break;
}
- if (summaryview->display_msg) {
+ 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_filter_open(summaryview, (PrefsFilterType)action);
}
+static void summary_sort_by_column_click(SummaryView *summaryview,
+ FolderSortKey sort_key)
+{
+ FolderItem *item = summaryview->folder_item;
+
+ if (!item) return;
+
+ if (item->sort_key == sort_key)
+ summary_sort(summaryview, sort_key,
+ item->sort_type == SORT_ASCENDING
+ ? SORT_DESCENDING : SORT_ASCENDING);
+ else
+ summary_sort(summaryview, sort_key, SORT_ASCENDING);
+}
+
static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_MARK);
+ summary_sort_by_column_click(summaryview, SORT_BY_MARK);
}
static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_UNREAD);
+ summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
}
static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_MIME);
+ summary_sort_by_column_click(summaryview, SORT_BY_MIME);
}
static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_NUMBER);
+ summary_sort_by_column_click(summaryview, SORT_BY_NUMBER);
}
-static void summary_score_clicked(GtkWidget *button,
- SummaryView *summaryview)
+static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_SCORE);
+ summary_sort_by_column_click(summaryview, SORT_BY_SIZE);
}
-static void summary_locked_clicked(GtkWidget *button,
- SummaryView *summaryview)
+static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_LOCKED);
+ summary_sort_by_column_click(summaryview, SORT_BY_DATE);
}
-static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_SIZE);
+ summary_sort_by_column_click(summaryview, SORT_BY_FROM);
}
-static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_subject_clicked(GtkWidget *button,
+ SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_DATE);
+ summary_sort_by_column_click(summaryview, SORT_BY_SUBJECT);
}
-static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_score_clicked(GtkWidget *button,
+ SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_FROM);
+ summary_sort_by_column_click(summaryview, SORT_BY_SCORE);
}
-static void summary_subject_clicked(GtkWidget *button,
- SummaryView *summaryview)
+static void summary_locked_clicked(GtkWidget *button,
+ SummaryView *summaryview)
{
- summary_sort(summaryview, SORT_BY_SUBJECT);
+ summary_sort_by_column_click(summaryview, SORT_BY_LOCKED);
}
static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
GString *line;
gpointer key;
gpointer value;
- MsgPermFlags flags;
Folder *mff = msginfo->folder->folder;
if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
debug_print(_("nfcp: checking <%s>"), line->str);
if (mff->newsart &&
g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
- debug_print(_(" <%s>"), value);
+ debug_print(_(" <%s>"), (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- MSG_SET_COLORLABEL_VALUE(msginfo->flags, mff->account->crosspost_col);
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
}
g_hash_table_remove(mff->newsart, key);
g_free(key);
}
}
-static void news_process_crossposted(MsgInfo *msginfo)
-{
- gchar **crossref;
- gchar **crp;
- gchar *cp;
- gint cnt;
- static char *read = "read";
- Folder *mff = msginfo->folder->folder;
-
- /* Get the Xref: line */
- if (msginfo->xref) {
- /* Retrieve the cross-posted groups and message ids */
- /* Format of Xref is Xref: server message:id message:id ... */
- crossref = g_strsplit(msginfo->xref, " ", 1024);
- for (crp = crossref+2, cnt = 0; *crp; crp++, cnt++) {
- if ((cp = strchr(*crp, ':'))) {
- *cp = '\0';
- if (!strcmp(*crp, msginfo->folder->path)) continue;
- *cp = ':';
-
- /* On first pass, create a GHashTable to hold the list of
- * article numbers per newsgroup that have been read. */
- if (!mff->newsart) {
- mff->newsart = g_hash_table_new(g_str_hash, g_str_equal);
- }
- /* When a summary is selected, the articles for that
- * newsgroup are marked based on this entry */
- g_hash_table_insert(mff->newsart, g_strdup(*crp), read);
- debug_print(_("Cross-reference %d: Hash <%s>\n"), cnt, *crp);
- }
- }
- g_strfreev(crossref);
- }
-}
-
static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
static void summary_select_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
{
- SummaryView *summaryview = (SummaryView *) data;
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
gtk_ctree_select(GTK_CTREE(ctree), row);
- debug_print(_("Message %d selected\n"),
- msginfo->msgnum);
+ debug_print(_("Message %d selected\n"), msginfo->msgnum);
}
/* select current thread */
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags))
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread--;
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
-
- CHANGE_FLAGS(msginfo);
+*/
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked as ignore thread\n"),
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags))
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread++;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+*/
+ procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
- CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked as unignore thread\n"),
msginfo->msgnum);
return FALSE;
processing = item->prefs->processing;
+
if (processing != NULL) {
gchar * buf;
GSList * mlist;
STATUSBAR_PUSH(summaryview->mainwin, buf);
g_free(buf);
+/*
mlist = item->folder->get_msg_list(item->folder, item,
TRUE);
-
+*/
+ mlist = folder_item_get_msg_list(item);
for(cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCList *clist = GTK_CLIST(summaryview->ctree);
- GtkCTreeNode *node;
+ GtkWidget *ctree = summaryview->ctree;
GtkWidget *pixmap;
gtk_widget_destroy(summaryview->folder_pixmap);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm, &unreadxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm, &repliedxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm, &forwardedxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm, &clipxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm, &lockedxpmmask);
+ 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);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
projects / claws.git / blobdiff