static void summary_set_menu_sensitive (SummaryView *summaryview);
-static void summary_select_node (SummaryView *summaryview,
- GtkCTreeNode *node,
- gboolean display_msg);
-
static guint summary_get_msgnum (SummaryView *summaryview,
GtkCTreeNode *node);
static void summary_reply_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_execute_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
{N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
{N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
{N_("/_Delete"), NULL, summary_delete, 0, NULL},
- {N_("/E_xecute"), NULL, summary_execute, 0, NULL},
+ {N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Add sender to address _book"),
- NULL, summary_add_address_cb, 0, NULL},
+ {N_("/Add sender to address boo_k"),
+ NULL, summary_add_address_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Open in new _window"), NULL, summary_open_msg, 0, NULL},
- {N_("/View so_urce"), NULL, summary_view_source, 0, NULL},
- {N_("/Show all _header"), NULL, summary_show_all_header_cb, 0, NULL},
+ {N_("/_View"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Open in new _window"),
+ NULL, summary_open_msg, 0, NULL},
+ {N_("/_View/_Source"), NULL, summary_view_source, 0, NULL},
+ {N_("/_View/All _header"), NULL, summary_show_all_header_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
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;
gint sort_type;
static gboolean locked = FALSE;
- if (locked)
- return FALSE;
+ if (summary_is_locked(summaryview)) return FALSE;
inc_lock();
- locked = TRUE;
+ summary_lock(summaryview);
STATUSBAR_POP(summaryview->mainwin);
else if (G_ALERTALTERNATE == val)
summary_write_cache(summaryview);
else {
- locked = FALSE;
+ summary_unlock(summaryview);
inc_unlock();
- return FALSE;
+ return FALSE;
}
folder_update_op_count();
}
summary_clear_all(summaryview);
summaryview->folder_item = item;
gtk_clist_thaw(GTK_CLIST(ctree));
- locked = FALSE;
+ summary_unlock(summaryview);
inc_unlock();
return TRUE;
}
message, but do not display it */
node = summary_find_next_unread_msg(summaryview, NULL);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
- node = GTK_CTREE_NODE
- (GTK_CLIST(ctree)->row_list_end);
+ node = gtk_ctree_node_nth
+ (ctree, GTK_CLIST(ctree)->rows - 1);
summary_select_node(summaryview, node, FALSE);
}
} else {
else
node = summary_find_next_unread_msg(summaryview, NULL);
- if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
- summary_select_node(summaryview, node,
- prefs_common.open_unread_on_enter);
+ 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, GTK_CLIST(ctree)->rows - 1);
+ }
+ if (prefs_common.open_unread_on_enter) {
+ summary_unlock(summaryview);
+ summary_select_node(summaryview, node, TRUE);
+ summary_lock(summaryview);
+ } else
+ summary_select_node(summaryview, node, FALSE);
}
summary_status_show(summaryview);
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
main_window_cursor_normal(summaryview->mainwin);
- locked = FALSE;
+ summary_unlock(summaryview);
inc_unlock();
return TRUE;
summary_status_show(summaryview);
}
+void summary_lock(SummaryView *summaryview)
+{
+ summaryview->lock_count++;
+}
+
+void summary_unlock(SummaryView *summaryview)
+{
+ if (summaryview->lock_count)
+ summaryview->lock_count--;
+}
+
+gboolean summary_is_locked(SummaryView *summaryview)
+{
+ return summaryview->lock_count > 0;
+}
+
SummarySelection summary_get_selection_type(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
if (summaryview->folder_item->folder->type != F_NEWS) {
menu_set_sensitive(ifactory, "/Move...", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
- if (summaryview->folder_item->stype != F_TRASH)
- menu_set_sensitive(ifactory, "/Delete", TRUE);
+ menu_set_sensitive(ifactory, "/Delete", TRUE);
}
menu_set_sensitive(ifactory, "/Execute", TRUE);
menu_set_sensitive(ifactory, "/Add sender to address book", sens);
- menu_set_sensitive(ifactory, "/Open in new window", sens);
- menu_set_sensitive(ifactory, "/View source", sens);
- menu_set_sensitive(ifactory, "/Show all header", sens);
+ menu_set_sensitive(ifactory, "/View", sens);
+ menu_set_sensitive(ifactory, "/View/Open in new window", sens);
+ menu_set_sensitive(ifactory, "/View/Source", sens);
+ menu_set_sensitive(ifactory, "/View/All header", sens);
if ((summaryview->folder_item->stype == F_DRAFT) ||
(summaryview->folder_item->stype == F_OUTBOX) ||
(summaryview->folder_item->stype == F_QUEUE))
if (!node) {
AlertValue val;
- val = alertpanel(_("No more unread messages"),
- _("No unread message found. "
- "Search from the end?"),
- _("Yes"), _("No"), NULL);
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more unread messages"),
+ _("No unread message found. "
+ "Search from the end?"),
+ _("Yes"), _("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_unread_msg(summaryview, NULL);
}
} else {
AlertValue val;
- val = alertpanel(_("No more unread messages"),
- _("No unread message found. "
- "Go to next folder?"),
- _("Yes"), _("No"), NULL);
+ 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_ALERTDEFAULT;
+ 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)
* thread, if necessary) and unselect all others. If @display_msg is
* TRUE, display the corresponding message in the message view.
**/
-static void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
- gboolean display_msg)
+void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
+ gboolean display_msg)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if (current_node)
node = current_node;
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ 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)) break;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(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_UNREAD(msginfo->flags)) break;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
}
return node;
if (current_node)
node = GTK_CTREE_NODE_PREV(current_node);
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ 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 (current_node)
node = GTK_CTREE_NODE_PREV(current_node);
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ 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 (prefs_common.use_addr_book)
start_address_completion();
- /*main_window_set_thread_option(summaryview->mainwin)*/;
-
for (cur = mlist ; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
msginfo->threadscore = msginfo->score;
summaryview->folder_item->prefs->important_score;
}
- if (prefs_common.enable_thread) {
- /*if (summaryview->folder_item->prefs->enable_thread) { */
+ if (summaryview->folder_item->threaded) {
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
parent = NULL;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
gchar *filename;
- static gboolean lock = FALSE;
if (!new_window && summaryview->displayed == row) return;
g_return_if_fail(row != NULL);
- if (lock) return;
- lock = TRUE;
+ if (summary_is_locked(summaryview)) return;
+ summary_lock(summaryview);
STATUSBAR_POP(summaryview->mainwin);
GTK_EVENTS_FLUSH();
filename = procmsg_get_message_file(msginfo);
if (!filename) {
- lock = FALSE;
+ summary_unlock(summaryview);
return;
}
g_free(filename);
if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
header_window_show(summaryview->headerwin, msginfo);
- lock = FALSE;
+ summary_unlock(summaryview);
}
void summary_redisplay_msg(SummaryView *summaryview)
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
-
+
if (summaryview->msg_is_toggled_on)
summary_display_msg(summaryview, summaryview->selected, FALSE);
}
CHANGE_FLAGS(msginfo);
summaryview->deleted++;
- if (!prefs_common.immediate_exec)
+ if (!prefs_common.immediate_exec &&
+ summaryview->folder_item->stype != F_TRASH)
summary_set_row_marks(summaryview, row);
debug_print(_("Message %s/%d is set to delete\n"),
void summary_delete(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ FolderItem *item = summaryview->folder_item;
GList *cur;
+ GtkCTreeNode *dsp_last, *sel_last;
- if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ if (!item || item->folder->type == F_NEWS) return;
- /* if current folder is trash, don't delete */
- if (summaryview->folder_item->stype == F_TRASH) {
- alertpanel_notice(_("Current folder is Trash."));
- return;
+ if (summary_is_locked(summaryview)) return;
+
+ /* if current folder is trash, ask for confirmation */
+ if (item->stype == F_TRASH) {
+ AlertValue aval;
+
+ aval = alertpanel(_("Delete message(s)"),
+ _("Do you really want to delete message(s) from the trash?"),
+ _("Yes"), _("No"), NULL);
+ if (aval != G_ALERTDEFAULT) return;
}
- for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
- summary_delete_row(summaryview, GTK_CTREE_NODE(cur->data));
+ /* next code sets current row focus right. if the last selection
+ * is also the last displayed row, we need to scroll backwards.
+ * exception: if the last displayed row is an uncollapsed node,
+ * we don't scroll back. */
+ dsp_last = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+ sel_last = NULL;
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ sel_last = GTK_CTREE_NODE(cur->data);
+ summary_delete_row(summaryview, GTK_CTREE_NODE(sel_last));
+ }
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+ if (dsp_last == sel_last && GTK_CTREE_ROW(sel_last)->expanded)
+ summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
+ else
+ summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
- if (prefs_common.immediate_exec)
+ if (prefs_common.immediate_exec || item->stype == F_TRASH)
summary_execute(summaryview);
else
summary_status_show(summaryview);
if (!to_folder) return;
if (!summaryview->folder_item ||
summaryview->folder_item->folder->type == F_NEWS) return;
+
+ if (summary_is_locked(summaryview)) return;
+
if (summaryview->folder_item == to_folder) {
alertpanel_notice(_("Destination is same as current folder."));
return;
if (!to_folder) return;
if (!summaryview->folder_item ||
summaryview->folder_item->folder->type == F_NEWS) return;
+
+ if (summary_is_locked(summaryview)) return;
+
if (summaryview->folder_item == to_folder) {
alertpanel_notice
(_("Destination to copy is same as current folder."));
g_free(cmdline);
}
-void summary_execute(SummaryView *summaryview)
+gboolean summary_execute(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ summaryview->folder_item->folder->type == F_NEWS) return FALSE;
+
+ if (summary_is_locked(summaryview)) return FALSE;
+ summary_lock(summaryview);
gtk_clist_freeze(clist);
- /*if (summaryview->folder_item->prefs->enable_thread) */
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->threaded)
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- /*if (summaryview->folder_item->prefs->enable_thread) */
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->threaded)
summary_thread_build(summaryview, FALSE);
summaryview->selected = clist->selection ?
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
gtk_clist_thaw(clist);
+
+ summary_unlock(summaryview);
+ return TRUE;
}
static void summary_execute_move(SummaryView *summaryview)
if (summaryview->folder_item->folder->type == F_MH) {
g_return_if_fail(trash != NULL);
}
- if (summaryview->folder_item == trash) return;
/* search deleting messages and execute */
gtk_ctree_pre_recursive
if (!summaryview->mlist) return;
- for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo = cur->data;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- }
-
- folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ if (summaryview->folder_item != trash)
+ folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ else
+ folder_item_remove_msgs(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
- folder_item_scan(trash);
- folderview_update_item(trash, FALSE);
+ if (summaryview->folder_item != trash) {
+ folder_item_scan(trash);
+ folderview_update_item(trash, FALSE);
+ }
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
GtkCTreeNode *parent;
MsgInfo *msginfo;
+ summary_lock(summaryview);
+
debug_print(_("Building threads..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
main_window_cursor_wait(summaryview->mainwin);
next = GTK_CTREE_ROW(node)->sibling;
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+
+ /* alfons - claws seems to prefer subject threading before
+ * inreplyto threading. we should look more deeply in this,
+ * because inreplyto should have precedence... */
if (msginfo && msginfo->inreplyto) {
parent = g_hash_table_lookup(summaryview->msgid_table,
msginfo->inreplyto);
gtk_ctree_expand(ctree, node);
}
}
+ else if (msginfo && msginfo->subject) {
+ parent = g_hash_table_lookup
+ (summaryview->subject_table, msginfo->subject);
+ if (parent && parent != node) {
+ gtk_ctree_move(ctree, node, parent, NULL);
+ gtk_ctree_expand(ctree, node);
+ }
+ }
node = next;
}
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ summary_unlock(summaryview);
}
void summary_unthread(SummaryView *summaryview)
GtkCTreeNode *sibling;
GtkCTreeNode *next_child;
+ summary_lock(summaryview);
+
debug_print(_("Unthreading..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
main_window_cursor_wait(summaryview->mainwin);
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ summary_unlock(summaryview);
}
static void summary_unthread_for_exec(SummaryView *summaryview)
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ summary_lock(summaryview);
+
debug_print(_("Unthreading for execution..."));
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_thaw(GTK_CLIST(ctree));
debug_print(_("done.\n"));
+
+ summary_unlock(summaryview);
}
static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
{
if (!prefs_common.fltlist) return;
+ summary_lock(summaryview);
+
debug_print(_("filtering..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ summary_unlock(summaryview);
}
static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
gtk_signal_connect(GTK_OBJECT(label_menuitem), "activate",
GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_item_cb),
summaryview);
-
gtk_widget_show(label_menuitem);
menu = gtk_menu_new();
GtkCTreeNode *node;
FolderItem *to_folder;
+ if (summary_is_locked(summaryview)) return;
if (!event) return;
switch (event->keyval) {
break;
case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE);
+ TRUE, TRUE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
compose_reply(msginfo, TRUE, TRUE, FALSE);
summary_set_marks_selected(summaryview);
}
+static void summary_execute_cb(SummaryView *summaryview, guint action,
+ GtkWidget *widget)
+{
+ summary_execute(summaryview);
+}
+
static void summary_show_all_header_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
projects / claws.git / blobdiff