*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "defs.h"
GSList *mlist);
static void summary_set_header (SummaryView *summaryview,
gchar *text[],
- MsgInfo *msginfo);
+ MsgInfo *msginfo,
+ gboolean *free_from_to);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
GtkCTreeNode *row,
FolderItem *to_folder);
-static void summary_execute_move (SummaryView *summaryview);
+static gint summary_execute_move (SummaryView *summaryview);
static void summary_execute_move_func (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data);
GtkCTreeNode *row,
gint column,
SummaryView *summaryview);
+static void summary_unselected (GtkCTree *ctree,
+ GtkCTreeNode *row,
+ gint column,
+ SummaryView *summaryview);
static void summary_col_resized (GtkCList *clist,
gint column,
gint width,
{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
"<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
- {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+ {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
{N_("/Move to _trash"), "<control>D", summary_delete_trash, 0, NULL},
{N_("/_Delete..."), NULL, summary_delete, 0, NULL},
- {N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
"<control><alt>N", summary_open_msg, 0, NULL},
{N_("/_View/_Source"), "<control>U", summary_view_source, 0, NULL},
{N_("/_View/All _header"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
+ {N_("/_Print..."), "<control>P", summary_print, 0, NULL},
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
- N_("M"), /* S_COL_MARK */
+ "", /* S_COL_MARK */
N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("To"), /* S_COL_TO */
N_("Date"), /* S_COL_DATE */
N_("Size"), /* S_COL_SIZE */
- N_("No."), /* S_COL_NUMBER */
+ N_("#"), /* S_COL_NUMBER */
N_("Score"), /* S_COL_SCORE */
- N_("L") /* S_COL_LOCKED */
+ "", /* S_COL_LOCKED */
};
#define START_LONG_OPERATION(summaryview) { \
gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
toggle_search,
- _("Toggle quick-search bar"), NULL);
+ _("Toggle quick search bar"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
if (!bold_style) {
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- font_desc = pango_font_description_from_string(BOLD_FONT);
+ font_desc = pango_font_description_from_string(NORMAL_FONT);
if (font_desc) {
pango_font_description_free(bold_style->font_desc);
bold_style->font_desc = font_desc;
guint displayed_msgnum = 0;
GSList *cur;
GSList *not_killed;
+ gboolean hidden_removed = FALSE;
if (summary_is_locked(summaryview)) return FALSE;
+ if (!summaryview->mainwin)
+ return FALSE;
+
inc_lock();
summary_lock(summaryview);
/* STATUSBAR_POP(summaryview->mainwin); */
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+
if (is_refresh) {
selected_msgnum = summary_get_msgnum(summaryview,
summaryview->selected);
gtk_clist_freeze(GTK_CLIST(ctree));
summary_clear_list(summaryview);
- summary_set_column_titles(summaryview);
buf = NULL;
if (!item || !item->path || !folder_item_parent(item) || item->no_select) {
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- if (MSG_IS_UNREAD(msginfo->flags) &&
- !MSG_IS_IGNORE_THREAD(msginfo->flags))
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
+ if (!msginfo->hidden) {
+ if (MSG_IS_UNREAD(msginfo->flags) &&
+ !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else if (MSG_IS_MARKED(msginfo->flags) ||
+ MSG_IS_LOCKED(msginfo->flags))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else if (is_refresh &&
+ (msginfo->msgnum == selected_msgnum ||
+ msginfo->msgnum == displayed_msgnum))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ } else
+ procmsg_msginfo_free(msginfo);
}
+ hidden_removed = TRUE;
g_slist_free(mlist);
mlist = not_killed;
} else {
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- if (quicksearch_match(summaryview->quicksearch, msginfo))
+ if (!msginfo->hidden && quicksearch_match(summaryview->quicksearch, msginfo))
not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
-
+ hidden_removed = TRUE;
if (quicksearch_is_running(summaryview->quicksearch)) {
/* only scan subfolders when quicksearch changed,
* not when search is the same and folder changed */
mlist = not_killed;
}
-#if 0
- if ((global_scoring || item->prefs->scoring)) {
- GSList *not_killed;
- gint kill_score;
-
- not_killed = NULL;
- kill_score = prefs_common.kill_score;
- if (item->prefs->kill_score > kill_score)
- kill_score = item->prefs->kill_score;
- for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
- MsgInfo * msginfo = (MsgInfo *) cur->data;
+ if (!hidden_removed) {
+ not_killed = NULL;
+ for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
- if (msginfo->score > kill_score)
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- }
+ if (!msginfo->hidden)
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ }
g_slist_free(mlist);
mlist = not_killed;
}
-#endif
- not_killed = NULL;
- for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
- MsgInfo * msginfo = (MsgInfo *) cur->data;
-
- if (!msginfo->hidden)
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- }
- g_slist_free(mlist);
- mlist = not_killed;
STATUSBAR_POP(summaryview->mainwin);
g_slist_free(mlist);
- gtk_clist_thaw(GTK_CLIST(ctree));
-
if (is_refresh) {
summaryview->displayed =
summary_find_msg_by_msgnum(summaryview,
summary_lock(summaryview);
}
- summary_set_column_titles(summaryview);
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
+
+ gtk_clist_thaw(GTK_CLIST(ctree));
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
{"/Reply to/all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Reply to/sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Reply to/mailing list" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Follow-up and reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
{"/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ {"/Forward as attachment" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
{"/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-
- {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
- {"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
- {"/Move to trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
- {"/Delete..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
- {"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+ {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+ {"/Copy..." , M_TARGET_EXIST|M_EXEC},
+ {"/Move to trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+ {"/Delete..." , M_TARGET_EXIST|M_ALLOW_DELETE},
{"/Mark" , M_TARGET_EXIST},
{"/Mark/Mark" , M_TARGET_EXIST},
{"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
{"/View/Source" , M_SINGLE_TARGET_EXIST},
{"/View/All header" , M_SINGLE_TARGET_EXIST},
-#if 0
- {"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
- {"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
-
- {"/Select thread" , M_SINGLE_TARGET_EXIST},
- {"/Select all" , M_TARGET_EXIST},
-#endif
+ {"/Save as..." , M_TARGET_EXIST},
+ {"/Print..." , M_TARGET_EXIST},
{NULL, 0}
};
node = summary_find_prev_flagged_msg
(summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
- if (!node) {
+ if (!node || node == summaryview->selected) {
AlertValue val = 0;
switch (prefs_common.next_unread_msg_dialog) {
void summary_select_next_unread(SummaryView *summaryview)
{
GtkCTreeNode *node = summaryview->selected;
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
gboolean skip_cur = FALSE;
if (summaryview->displayed
else {
node = summary_find_next_flagged_msg
(summaryview, NULL, MSG_UNREAD, FALSE);
- if (node == NULL) {
+ if (node == NULL || node == summaryview->selected) {
AlertValue val = 0;
switch (prefs_common.next_unread_msg_dialog) {
}
if (val == G_ALERTDEFAULT) {
- g_signal_stop_emission_by_name(G_OBJECT(ctree),
- "key_press_event");
folderview_select_next_unread(summaryview->folderview);
return;
}
void summary_select_prev_new(SummaryView *summaryview)
{
GtkCTreeNode *node;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping current\n");
+ skip_cur = TRUE;
+ }
node = summary_find_prev_flagged_msg
- (summaryview, summaryview->selected, MSG_NEW, FALSE);
+ (summaryview, summaryview->selected, MSG_NEW, skip_cur);
- if (!node) {
- AlertValue val;
+ if (!node || node == summaryview->selected) {
+ AlertValue val = 0;
- val = alertpanel(_("No more new messages"),
- _("No new message found. "
- "Search from the end?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Search from the end?"),
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTDEFAULT;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = !G_ALERTDEFAULT;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_NEW, 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?"),
- GTK_STOCK_YES, _("_Search again"),
- GTK_STOCK_NO);
- if (val == G_ALERTDEFAULT) {
- g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
- folderview_select_next_unread(summaryview->folderview);
- return;
- } else if (val == G_ALERTALTERNATE)
- node = NULL;
- else
- return;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping cur (%p %p)\n",
+ summaryview->displayed, summaryview->selected);
+ skip_cur = TRUE;
}
+
+ node = summary_find_next_flagged_msg
+ (summaryview, node, MSG_NEW, skip_cur);
+
if (node)
summary_select_node(summaryview, node, TRUE, FALSE);
+ else {
+ node = summary_find_next_flagged_msg
+ (summaryview, NULL, MSG_NEW, FALSE);
+ if (node == NULL || node == summaryview->selected) {
+ AlertValue val = 0;
+
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Go to next folder?"),
+ GTK_STOCK_YES, GTK_STOCK_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) {
+ folderview_select_next_new(summaryview->folderview);
+ return;
+ }
+ else
+ return;
+ } else
+ summary_select_node(summaryview, node, TRUE, FALSE);
+
+ }
}
void summary_select_prev_marked(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ if (!summaryview->folder_item)
+ return;
if (node) {
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
GTK_EVENTS_FLUSH();
gtk_widget_grab_focus(GTK_WIDGET(ctree));
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ if (GTK_CTREE_ROW(node) == NULL) {
+ g_warning("crash avoidance hack 1\n");
+ return;
+ }
+ if (((GtkCListRow *)(GTK_CTREE_ROW(node)))->state < GTK_STATE_NORMAL
+ || ((GtkCListRow *)(GTK_CTREE_ROW(node)))->state > GTK_STATE_INSENSITIVE) {
+ g_warning("crash avoidance hack 2\n");
+ return;
+ }
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
static guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTree *ctree =NULL;
MsgInfo *msginfo;
+ if (!summaryview)
+ return 0;
+ ctree = GTK_CTREE(summaryview->ctree);
if (!node)
return 0;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
g_hash_table_destroy(subject_table);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
gtk_clist_thaw(clist);
msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (MSG_IS_MOVE(msginfo->flags))
gchar *spc;
gchar *itstr;
GList *rowlist, *cur;
- guint n_selected = 0;
- off_t sel_size = 0;
+ guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+ off_t sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
else {
sel_size += msginfo->size;
n_selected++;
+
}
}
+
+ if (summaryview->folder_item->hide_read_msgs
+ || quicksearch_is_active(summaryview->quicksearch)) {
+ rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+ for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ msginfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur));
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ n_size += msginfo->size;
+ n_total++;
+ if (MSG_IS_NEW(msginfo->flags))
+ n_new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ n_unread++;
+ }
+ }
+ } else {
+ n_new = summaryview->folder_item->new_msgs;
+ n_unread = summaryview->folder_item->unread_msgs;
+ n_total = summaryview->folder_item->total_msgs;
+ n_size = summaryview->total_size;
+ }
name = folder_item_get_name(summaryview->folder_item);
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->folder_item->new_msgs,
- summaryview->folder_item->unread_msgs,
- summaryview->folder_item->total_msgs,
- to_human_readable(summaryview->total_size));
+ n_new, n_unread, n_total,
+ to_human_readable(n_size));
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
gint pos;
const gchar *title;
SummaryColumnType type;
- gboolean single_char;
GtkJustification justify;
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- 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;
else
title = col_label[type];
break;
- /* CLAWS: dummies for mark and locked headers */
- case S_COL_MARK:
- case S_COL_LOCKED:
- title = "";
- break;
default:
title = gettext(col_label[type]);
}
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
- }
- if (single_char) {
+ } else if (type == S_COL_MARK) {
+ label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_LOCKED) {
+ label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_STATUS) {
gtk_clist_set_column_title(clist, pos, title);
continue;
}
- /* CLAWS: changed so that locked and mark headers
- * show a pixmap instead of single character */
hbox = gtk_hbox_new(FALSE, 4);
-
- if (type == S_COL_LOCKED)
- label = gtk_pixmap_new(lockedxpm, lockedxpmmask);
- else if (type == S_COL_MARK)
- label = gtk_pixmap_new(markxpm, markxpmmask);
- else
- label = gtk_label_new(title);
-
+ label = gtk_label_new(title);
+
if (justify == GTK_JUSTIFY_RIGHT)
gtk_box_pack_end(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
void summary_reflect_prefs(void)
{
- SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
- bold_style = bold_marked_style = bold_deleted_style =
- small_style = small_marked_style = small_deleted_style = NULL;
- summary_set_fonts(summaryview);
+ static gchar *last_font = NULL;
+ gboolean update_font = TRUE;
+ SummaryView *summaryview = NULL;
+
+ if (!mainwindow_get_mainwindow())
+ return;
+ summaryview = mainwindow_get_mainwindow()->summaryview;
+
+ if (last_font && !strcmp(last_font, NORMAL_FONT))
+ update_font = FALSE;
+
+ if (last_font)
+ g_free(last_font);
+
+ last_font = g_strdup(NORMAL_FONT);
+
+ if (update_font) {
+ bold_style = bold_marked_style = bold_deleted_style =
+ small_style = small_marked_style = small_deleted_style = NULL;
+ summary_set_fonts(summaryview);
+ }
+
summary_set_column_titles(summaryview);
summary_show(summaryview, summaryview->folder_item);
}
gtk_sctree_sort_recursive(ctree, NULL);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
gtk_clist_thaw(clist);
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
+ gboolean free_from_to = FALSE;
+
+ summary_set_header(summaryview, text, msginfo, &free_from_to);
- summary_set_header(summaryview, text, msginfo);
-
- gtk_ctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+ gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
gnode->parent->parent ? TRUE : FALSE);
#define SET_TEXT(col) \
SET_TEXT(S_COL_DATE);
SET_TEXT(S_COL_FROM);
SET_TEXT(S_COL_TO);
- SET_TEXT(S_COL_SUBJECT);
+ /* SET_TEXT(S_COL_SUBJECT); already set by node info */
+
+ if (free_from_to) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ g_free(text[col_pos[S_COL_TO]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ text[col_pos[S_COL_TO]] = NULL;
+ }
#undef SET_TEXT
if (prefs_common.use_addr_book)
start_address_completion();
- for (cur = mlist ; cur != NULL && cur->data != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- msginfo->threadscore = msginfo->score;
- }
-
if (summaryview->threaded) {
GNode *root, *gnode;
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
+ gboolean free_from_to = FALSE;
+ gint *col_pos = summaryview->col_pos;
+
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(summaryview, text, msginfo);
+ summary_set_header(summaryview, text, msginfo, &free_from_to);
- node = gtk_ctree_insert_node
+ node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
- NULL, NULL, NULL, NULL, FALSE, FALSE);
+ NULL, NULL, NULL, NULL,
+ FALSE, FALSE);
+ if (free_from_to) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ g_free(text[col_pos[S_COL_TO]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ text[col_pos[S_COL_TO]] = NULL;
+ }
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
}
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
}
static void summary_set_header(SummaryView *summaryview, gchar *text[],
- MsgInfo *msginfo)
+ MsgInfo *msginfo, gboolean *free_from_to)
{
static gchar date_modified[80];
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
- FolderType ftype = F_UNKNOWN;
-
- text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_STATUS]] = NULL;
- text[col_pos[S_COL_MIME]] = NULL;
- text[col_pos[S_COL_LOCKED]] = NULL;
+ gchar *from_text = NULL, *to_text = NULL;
+ gboolean should_swap = FALSE;
+
+ text[col_pos[S_COL_FROM]] = "";
+ text[col_pos[S_COL_TO]] = "";
+ text[col_pos[S_COL_SUBJECT]]= "";
+ text[col_pos[S_COL_MARK]] = "";
+ text[col_pos[S_COL_STATUS]] = "";
+ text[col_pos[S_COL_MIME]] = "";
+ text[col_pos[S_COL_LOCKED]] = "";
+ text[col_pos[S_COL_DATE]] = "";
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
+ if (prefs_common.swap_from && msginfo->from && msginfo->to) {
+ gchar *addr = NULL;
+
+ addr = g_strdup(msginfo->from);
+
+ if (addr) {
+ extract_address(addr);
+ if (account_find_from_address(addr)) {
+ should_swap = TRUE;
+ }
+ g_free(addr);
+ }
+ }
+
if (!prefs_common.use_addr_book) {
- text[col_pos[S_COL_FROM]] = msginfo->fromname ?
- msginfo->fromname :
- _("(No From)");
+ from_text = msginfo->fromname ?
+ msginfo->fromname :
+ _("(No From)");
} else {
- gchar *tmp = summary_complete_address(msginfo->fromname);
- text[col_pos[S_COL_FROM]] = tmp ? tmp : (msginfo->fromname ?
- msginfo->fromname:
- _("(No From)"));
+ gchar *tmp = summary_complete_address(msginfo->from);
+ from_text = tmp ? tmp : (msginfo->fromname ?
+ msginfo->fromname:
+ _("(No From)"));
+ }
+
+ to_text = msginfo->to ? msginfo->to :
+ (msginfo->cc ? msginfo->cc :
+ (msginfo->newsgroups ? msginfo->newsgroups : _("(No Recipient)")
+ )
+ );
+
+ if (!should_swap) {
+ text[col_pos[S_COL_FROM]] = from_text;
+ text[col_pos[S_COL_TO]] = to_text;
+ *free_from_to = FALSE;
+ } else {
+ gchar *tmp = NULL;
+ tmp = g_strconcat("-->", to_text, NULL);
+ text[col_pos[S_COL_FROM]] = tmp;
+ tmp = g_strconcat("<--", from_text, NULL);
+ text[col_pos[S_COL_TO]] = tmp;
+ *free_from_to = TRUE;
}
- text[col_pos[S_COL_TO]] = msginfo->to ? msginfo->to :
- _("(No Recipient)");
- if (msginfo->folder && msginfo->folder->folder)
- ftype = msginfo->folder->folder->klass->type;
-
if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(buf, BUFFSIZE, msginfo->subject,
summary_display_msg_full(summaryview, row, FALSE, FALSE);
}
+static gboolean defer_change(gpointer data);
+typedef struct _ChangeData {
+ MsgInfo *info;
+ gint op; /* 0, 1, 2 for unset, set, change */
+ MsgPermFlags set_flags;
+ MsgTmpFlags set_tmp_flags;
+ MsgPermFlags unset_flags;
+ MsgTmpFlags unset_tmp_flags;
+} ChangeData;
+
+static void summary_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags flags, MsgTmpFlags tmp_flags)
+{
+ if (!msginfo->folder || !msginfo->folder->processing_pending) {
+ debug_print("flags: doing unset now\n");
+ procmsg_msginfo_unset_flags(msginfo, flags, tmp_flags);
+ } else {
+ ChangeData *unset_data = g_new0(ChangeData, 1);
+ unset_data->info = msginfo;
+ unset_data->op = 0;
+ unset_data->unset_flags = flags;
+ unset_data->unset_tmp_flags = tmp_flags;
+ debug_print("flags: deferring unset\n");
+ g_timeout_add(100, defer_change, unset_data);
+ }
+}
+
+static void summary_msginfo_set_flags(MsgInfo *msginfo, MsgPermFlags flags, MsgTmpFlags tmp_flags)
+{
+ if (!msginfo->folder || !msginfo->folder->processing_pending) {
+ debug_print("flags: doing set now\n");
+ procmsg_msginfo_set_flags(msginfo, flags, tmp_flags);
+ } else {
+ ChangeData *set_data = g_new0(ChangeData, 1);
+ set_data->info = msginfo;
+ set_data->op = 1;
+ set_data->set_flags = flags;
+ set_data->set_tmp_flags = tmp_flags;
+ debug_print("flags: deferring set\n");
+ g_timeout_add(100, defer_change, set_data);
+ }
+}
+
+static void summary_msginfo_change_flags(MsgInfo *msginfo,
+ MsgPermFlags add_flags, MsgTmpFlags add_tmp_flags,
+ MsgPermFlags rem_flags, MsgTmpFlags rem_tmp_flags)
+{
+ if (!msginfo->folder || !msginfo->folder->processing_pending) {
+ debug_print("flags: doing change now\n");
+ procmsg_msginfo_change_flags(msginfo, add_flags, add_tmp_flags,
+ rem_flags, rem_tmp_flags);
+ } else {
+ ChangeData *change_data = g_new0(ChangeData, 1);
+ change_data->info = msginfo;
+ change_data->op = 2;
+ change_data->set_flags = add_flags;
+ change_data->set_tmp_flags = add_tmp_flags;
+ change_data->unset_flags = rem_flags;
+ change_data->unset_tmp_flags = rem_tmp_flags;
+ debug_print("flags: deferring change\n");
+ g_timeout_add(100, defer_change, change_data);
+ }
+}
+
+gboolean defer_change(gpointer data)
+{
+ ChangeData *chg = (ChangeData *)data;
+ if (chg->info->folder && chg->info->folder->processing_pending) {
+ debug_print("flags: trying later\n");
+ return TRUE; /* try again */
+ } else {
+ debug_print("flags: finally doing it\n");
+ switch(chg->op) {
+ case 0:
+ procmsg_msginfo_unset_flags(chg->info, chg->unset_flags, chg->unset_tmp_flags);
+ break;
+ case 1:
+ procmsg_msginfo_set_flags(chg->info, chg->set_flags, chg->set_tmp_flags);
+ break;
+ case 2:
+ procmsg_msginfo_change_flags(chg->info, chg->set_flags, chg->set_tmp_flags,
+ chg->unset_flags, chg->unset_tmp_flags);
+ break;
+ default:
+ g_warning("shouldn't happen\n");
+ }
+ g_free(chg);
+ }
+ return FALSE;
+}
+
static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
GtkCTreeNode *row)
{
g_return_if_fail(msginfo != NULL);
g_return_if_fail(row != NULL);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags
+ summary_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
forwardedxpm, forwardedxpmmask);
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
- NULL);
+ "");
}
if (prefs_common.bold_unread &&
&summaryview->color_important);
#endif
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
}
if (MSG_IS_LOCKED(flags)) {
lockedxpm, lockedxpmmask);
}
else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
}
if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
}
if (!style)
style = small_style;
summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
}
-void summary_set_marks_selected(SummaryView *summaryview)
-{
- GList *cur;
- summary_lock(summaryview);
- for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
- cur = cur->next)
- summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
- summary_unlock(summaryview);
-}
-
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
summaryview->copied--;
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_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
changed = TRUE;
}
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_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+
summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
if (!MSG_IS_LOCKED(msginfo->flags))
return;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
+ summary_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is unlocked\n", msginfo->msgnum);
}
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
-
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_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);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
+ summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
- if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
- procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+ summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
}
if (!found) {
- alertpanel_error(_("You're not the author of the article\n"));
+ alertpanel_error(_("You're not the author of the article.\n"));
}
return found;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (!check_permission(summaryview, msginfo))
- return;
-
if (MSG_IS_LOCKED(msginfo->flags)) return;
if (MSG_IS_DELETED(msginfo->flags)) return;
summaryview->copied--;
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);
+ summary_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, MSG_MOVE | MSG_COPY);
summaryview->deleted++;
if (!prefs_common.immediate_exec &&
if (summary_is_locked(summaryview)) return;
- if (!summaryview->folder_item ||
- FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
+ if (!summaryview->folder_item) return;
aval = alertpanel(_("Delete message(s)"),
_("Do you really want to delete selected message(s)?"),
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
- summary_lock(summaryview);
- folder_item_update_freeze();
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ START_LONG_OPERATION(summaryview);
+ folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summary_delete_row(summaryview, sel_last);
}
- folder_item_update_thaw();
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- summary_unlock(summaryview);
+ folder_item_set_batch(summaryview->folder_item, FALSE);
+ END_LONG_OPERATION(summaryview);
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);
}
if (to_folder == NULL)
to_folder = summaryview->folder_item->folder->trash;
- if (to_folder == NULL || to_folder == summaryview->folder_item)
+ if (to_folder == NULL || to_folder == summaryview->folder_item
+ || folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
summary_delete(summaryview);
else
summary_move_selected_to(summaryview, to_folder);
summaryview->copied--;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
+ summary_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",
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
}
- 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);
+ summary_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED, MSG_COPY);
summaryview->moved++;
+ } else {
+ summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_COPY);
}
+
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
}
END_LONG_OPERATION(summaryview);
+ summaryview->display_msg = prefs_common.always_show_msg;
+
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
}
- 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);
+ summary_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED, MSG_MOVE);
summaryview->copied++;
+ } else {
+ summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
if (is_file_exist(dest)) {
aval = alertpanel(_("Append or Overwrite"),
_("Append or overwrite existing file?"),
- _("Append"), _("Overwrite"),
+ _("_Append"), _("_Overwrite"),
GTK_STOCK_CANCEL);
if (aval != 0 && aval != 1)
return;
g_free(tmp);
}
+#ifdef USE_GNOMEPRINT
+static void print_mimeview(MimeView *mimeview)
+{
+ if (!mimeview
+ || !mimeview->textview
+ || !mimeview->textview->text)
+ alertpanel_warning(_("Cannot print: the message doesn't "
+ "contain text."));
+ else
+ gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
+}
+#endif
+
void summary_print(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
MsgInfo *msginfo;
gchar *cmdline = NULL;
gchar *p;
-#else
- gboolean first = TRUE;
- GList *tmplist;
#endif
GList *cur;
g_free(cmdline);
return;
}
- for (cur = clist->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+ for (cur = clist->selection;
+ cur != NULL && cur->data != NULL;
+ cur = cur->next) {
msginfo = gtk_ctree_node_get_row_data
(ctree, GTK_CTREE_NODE(cur->data));
- if (msginfo) procmsg_print_message(msginfo, cmdline);
+ if (msginfo)
+ procmsg_print_message(msginfo, cmdline);
}
g_free(cmdline);
-
#else
- tmplist = g_list_copy(clist->selection);
- summary_unselect_all(summaryview);
- for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
- GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
- summary_select_node(summaryview, node, TRUE, TRUE);
- if (!summaryview->messageview->mimeview
- || !summaryview->messageview->mimeview->textview
- || !summaryview->messageview->mimeview->textview->text)
- alertpanel_warning(_("Cannot print: the message doesn't "
- "contain text."));
- gedit_print(
- GTK_TEXT_VIEW(summaryview->messageview->mimeview
- ->textview->text));
- }
- for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ for (cur = clist->selection;
+ cur != NULL && cur->data != NULL;
+ cur = cur->next) {
GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
- gtk_sctree_select_with_state(
- GTK_SCTREE(clist), node, first ? 0:GDK_CONTROL_MASK);
- first = FALSE;
+ if (node != summaryview->displayed) {
+ MessageView *tmpview = messageview_create(
+ summaryview->mainwin);
+ MsgInfo *msginfo = gtk_ctree_node_get_row_data(
+ GTK_CTREE(summaryview->ctree),
+ node);
+
+ messageview_init(tmpview);
+ tmpview->all_headers = summaryview->messageview->all_headers;
+ if (msginfo && messageview_show(tmpview, msginfo,
+ tmpview->all_headers) >= 0) {
+ print_mimeview(tmpview->mimeview);
+ }
+ messageview_destroy(tmpview);
+ } else {
+ print_mimeview(summaryview->messageview->mimeview);
+ }
}
- g_list_free(tmplist);
#endif
}
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
GtkCTreeNode *new_selected = NULL;
+ gint move_val = -1;
if (!summaryview->folder_item) return FALSE;
summary_unthread_for_exec(summaryview);
folder_item_update_freeze();
- summary_execute_move(summaryview);
+ move_val = summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
summary_unlock(summaryview);
+
+ if (move_val < 0)
+ summary_show(summaryview, summaryview->folder_item);
return TRUE;
}
-static void summary_execute_move(SummaryView *summaryview)
+static gint summary_execute_move(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GSList *cur;
-
+ gint val = -1;
/* search moving messages and execute */
gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
summaryview);
if (summaryview->mlist) {
- procmsg_move_messages(summaryview->mlist);
+ val = procmsg_move_messages(summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
+ return val;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
summaryview->mlist =
g_slist_prepend(summaryview->mlist, msginfo);
- procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
+ summary_msginfo_unset_flags(msginfo, 0, MSG_COPY);
summary_set_row_marks(summaryview, node);
}
}
summaryview->thread_collapsed = FALSE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_collapse_threads(SummaryView *summaryview)
summaryview->thread_collapsed = TRUE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_filter(SummaryView *summaryview, gboolean selected_only)
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+ summary_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0,
+ MSG_CLABEL_FLAG_MASK, 0);
}
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
summaryview->col_state[pos] = col_state[pos];
type = col_state[pos].type;
col_pos[type] = pos;
+ titles[pos] = "dummy";
}
col_state = summaryview->col_state;
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
- g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(summary_selected), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "tree_unselect_row",
+ G_CALLBACK(summary_unselected), summaryview);
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
{
GtkWidget *ctree;
GtkWidget *scrolledwin = summaryview->scrolledwin;
- GtkWidget *pixmap;
FolderItem *item;
guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
summaryview->ctree = ctree = summary_ctree_create(summaryview);
summary_set_fonts(summaryview);
- pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
- gtk_clist_set_column_widget(GTK_CLIST(ctree),
- summaryview->col_pos[S_COL_MIME], pixmap);
- gtk_widget_show(pixmap);
+ summary_set_column_titles(summaryview);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
BREAK_ON_MODIFIER_KEY();
summary_delete_trash(summaryview);
break;
+ case GDK_y:
+ case GDK_t:
+ case GDK_l:
+ case GDK_c:
+ if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
+ g_signal_stop_emission_by_name(G_OBJECT(widget),
+ "key_press_event");
+ mimeview_pass_key_press_event(messageview->mimeview,
+ event);
+ break;
+ }
default:
break;
}
}
}
+void summaryview_activate_quicksearch(SummaryView *summaryview)
+{
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(summaryview->toggle_search),
+ TRUE);
+ quicksearch_show(summaryview->quicksearch);
+}
+
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
SummaryView *summaryview)
{
summary_set_row_marks(summaryview, node);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
}
}
summary_set_row_marks(summaryview, node);
}
+static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
+ gint column, SummaryView *summaryview)
+{
+ if (summary_is_locked(summaryview)
+ || GTK_SCTREE(ctree)->selecting_range) {
+ return;
+ }
+
+ summary_status_show(summaryview);
+}
+
static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, SummaryView *summaryview)
{
break;
case S_COL_LOCKED:
if (MSG_IS_LOCKED(msginfo->flags)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
+ summary_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
}
else
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
- while (prefs_common.bold_unread && node) {
- GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
+ if (prefs_common.bold_unread) {
+ while (node) {
+ GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
}
END_TIMING();
}
if (GTK_CLIST(summaryview->ctree)->selection)
gtk_selection_data_set(selection_data,
selection_data->target, 8,
- "Dummy", 6);
+ "Dummy-Summaryview",
+ strlen("Dummy-Summaryview")+1);
}
}
/* if score are equal, sort by date */
- diff = msginfo1->threadscore - msginfo2->threadscore;
+ diff = msginfo1->score - msginfo2->score;
if (diff != 0)
return diff;
else
g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
debug_print(" <%s>", (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
+ summary_msginfo_change_flags(msginfo,
+ mff->account->crosspost_col, 0, MSG_NEW | MSG_UNREAD, 0);
}
g_hash_table_remove(mff->newsart, key);
g_free(key);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- 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_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as ignore thread\n",
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked++;
-
- procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
+ summary_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as unignore thread\n",
void summary_toggle_show_read_messages(SummaryView *summaryview)
{
- if (summaryview->folder_item->hide_read_msgs)
+ FolderItemUpdateData source;
+ if (summaryview->folder_item->hide_read_msgs)
summaryview->folder_item->hide_read_msgs = 0;
else
summaryview->folder_item->hide_read_msgs = 1;
+
+ source.item = summaryview->folder_item;
+ source.update_flags = F_ITEM_UPDATE_NAME;
+ source.msg = NULL;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
summary_show(summaryview, summaryview->folder_item);
}
g_return_val_if_fail(summaryview != NULL, FALSE);
if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
- node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+ node = gtk_ctree_find_by_row_data(
+ GTK_CTREE(summaryview->ctree), NULL,
+ msginfo_update->msginfo);
if (node)
summary_set_row_marks(summaryview, node);
projects / claws.git / blobdiff