{N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
- {N_("/_Mark/Make it as _being read"),
+ {N_("/_Mark/Mark as rea_d"),
NULL, summary_mark_as_read, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {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_("/Forward as an a_ttachment"),
+ {N_("/Forward as a_ttachment"),
NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, 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_("/Re_edit"), NULL, summary_reedit, 0, NULL},
+ {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
gchar *buf;
gboolean is_refresh;
guint prev_msgnum = 0;
+ GtkCTreeNode *selected_node = summaryview->folderview->selected;
GSList *cur;
gint sort_mode;
gint sort_type;
} else
summary_write_cache(summaryview);
- summaryview->folderview->opened = summaryview->folderview->selected;
+ summaryview->folderview->opened = selected_node;
gtk_clist_freeze(GTK_CLIST(ctree));
g_hash_table_destroy(summaryview->msgid_table);
summaryview->msgid_table = NULL;
}
+ if (summaryview->subject_table) {
+ g_hash_table_destroy(summaryview->subject_table);
+ summaryview->subject_table = NULL;
+ }
summaryview->mlist = NULL;
if (summaryview->folder_table) {
g_hash_table_destroy(summaryview->folder_table);
menu_set_sensitive(ifactory, "/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", sens);
- menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
+ menu_set_sensitive(ifactory, "/Forward as attachment", sens);
menu_set_sensitive(ifactory, "/Open in new window", sens);
menu_set_sensitive(ifactory, "/View source", sens);
if ((summaryview->folder_item->stype == F_DRAFT) ||
(summaryview->folder_item->stype == F_OUTBOX) ||
(summaryview->folder_item->stype == F_QUEUE))
- menu_set_sensitive(ifactory, "/Reedit", sens);
+ menu_set_sensitive(ifactory, "/Re-edit", sens);
menu_set_sensitive(ifactory, "/Save as...", sens);
menu_set_sensitive(ifactory, "/Print...", TRUE);
menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Make it as being read", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
menu_set_sensitive(ifactory, "/Select all", TRUE);
+
+ if (summaryview->folder_item->folder->account)
+ sens = summaryview->folder_item->folder->account->protocol
+ == A_NNTP;
+ else
+ sens = FALSE;
+ menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
}
void summary_select_next_unread(SummaryView *summaryview)
node = summary_find_msg_by_msgnum(summaryview, msgnum);
if (node) {
+ GTK_EVENTS_FLUSH();
+ gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ gtk_widget_grab_focus(GTK_WIDGET(ctree));
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
- if (summaryview->displayed == node)
- summaryview->displayed = NULL;
- summary_display_msg(summaryview, node, FALSE);
+ if (summaryview->msg_is_toggled_on) {
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
}
}
main_window_cursor_normal(summaryview->mainwin);
}
+static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
+ gchar * subject)
+{
+ if (g_strncasecmp(subject, "Re: ", 4) == 0)
+ return g_hash_table_lookup(subject_table, subject + 4);
+ else
+ return g_hash_table_lookup(subject_table, subject);
+}
+
+static void subject_table_insert(GHashTable *subject_table, gchar * subject,
+ GtkCTreeNode * node)
+{
+ if (g_strncasecmp(subject, "Re: ", 4) == 0)
+ g_hash_table_insert(subject_table, subject + 4, node);
+ else
+ g_hash_table_insert(subject_table, subject, node);
+}
+
static void summary_set_ctree_from_list(SummaryView *summaryview,
GSList *mlist)
{
GtkCTreeNode *node, *parent;
gchar *text[N_SUMMARY_COLS];
GHashTable *msgid_table;
+ GHashTable *subject_table;
GSList * cur;
GtkCTreeNode *cur_parent;
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
summaryview->msgid_table = msgid_table;
+ subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+ summaryview->subject_table = subject_table;
if (prefs_common.use_addr_book)
start_address_completion();
if (global_scoring || summaryview->folder_item->prefs->scoring) {
summaryview->important_score = prefs_common.important_score;
- if (summaryview->folder_item->prefs->important_score <
+ if (summaryview->folder_item->prefs->important_score >
summaryview->important_score)
summaryview->important_score =
summaryview->folder_item->prefs->important_score;
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
}
+ if (parent == NULL && msginfo->subject) {
+ parent = subject_table_lookup
+ (subject_table, msginfo->subject);
+ }
summary_set_header(text, msginfo);
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+ if (msginfo->subject &&
+ subject_table_lookup(subject_table,
+ msginfo->subject) == NULL) {
+ subject_table_insert(subject_table,
+ msginfo->subject, node);
+ }
cur_parent = parent;
cur_msginfo = msginfo;
*cur_msginfo->inreplyto) {
cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
}
+ if (cur_parent == NULL && cur_msginfo->subject) {
+ cur_parent = subject_table_lookup(subject_table, cur_msginfo->subject);
+ }
}
}
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+
+ if (msginfo->subject &&
+ subject_table_lookup(subject_table,
+ msginfo->subject) == NULL)
+ subject_table_insert(subject_table,
+ msginfo->subject, node);
}
}
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
- if (debug_mode)
+ if (debug_mode) {
debug_print("\tmsgid hash table size = %d\n",
g_hash_table_size(msgid_table));
+ debug_print("\tsubject hash table size = %d\n",
+ g_hash_table_size(subject_table));
+ }
}
struct wcachefp
text[S_COL_MARK] = NULL;
text[S_COL_UNREAD] = NULL;
- text[S_COL_MIME] = NULL;
+ text[S_COL_MIME] = NULL;
text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
text[S_COL_SIZE] = to_human_readable(msginfo->size);
#if 0
CHANGE_FLAGS(msginfo);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as being read\n"),
+ debug_print(_("Message %d is marked as read\n"),
msginfo->msgnum);
}
}
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
gtk_clist_thaw(clist);
+
+ if (summaryview->folder_item->folder->type == F_IMAP)
+ summary_show(summaryview, summaryview->folder_item, FALSE);
}
static void summary_execute_move(SummaryView *summaryview)
gtk_ctree_pre_recursive_to_depth
(GTK_CTREE(summaryview->ctree), NULL, 1,
GTK_CTREE_FUNC(summary_thread_func),
- summaryview->msgid_table);
+ summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
{
MsgInfo *msginfo;
GtkCTreeNode *parent;
- GHashTable *msgid_table = (GHashTable *)data;
+
+ SummaryView * summaryview = (SummaryView *) data;
+ GHashTable *msgid_table = summaryview->msgid_table;
+ GHashTable *subject_table = summaryview->subject_table;
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (!msginfo || !msginfo->inreplyto) return;
parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
+ if (parent == NULL && msginfo->subject) {
+ parent = subject_table_lookup(subject_table, msginfo->subject);
+ }
if (parent && parent != node) {
gtk_ctree_move(ctree, node, parent, NULL);
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+#define KEY_PRESS_EVENT_STOP() \
+ 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"); \
+ }
+
static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
case GDK_g: /* Go */
case GDK_G:
BREAK_ON_MODIFIER_KEY();
-
- 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");
-
+ KEY_PRESS_EVENT_STOP();
to_folder = foldersel_folder_sel(NULL);
if (to_folder) {
debug_print(_("Go to %s\n"), to_folder->path);
return;
case GDK_w: /* Write new message */
BREAK_ON_MODIFIER_KEY();
- if (summaryview->folder_item)
- compose_new(summaryview->folder_item->folder->account);
- else
+ if (summaryview->folder_item) {
+ PrefsAccount *ac;
+ ac = summaryview->folder_item->folder->account;
+ if (ac && ac->protocol == A_NNTP)
+ compose_new_with_recipient
+ (ac, summaryview->folder_item->path);
+ else
+ compose_new(ac);
+ } else
compose_new(NULL);
return;
case GDK_D: /* Empty trash */
case GDK_x: /* Execute */
case GDK_X:
BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
summary_execute(summaryview);
break;
case GDK_a: /* Reply to the message */
}
}
+#undef BREAK_ON_MODIFIER_KEY
+#undef KEY_PRESS_EVENT_STOP
+
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (summaryview->folder_item->stype == F_DRAFT)
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, TRUE);
break;
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ compose_followup_and_reply_to(msginfo,
+ prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
compose_reply(msginfo, TRUE, FALSE, TRUE);
break;
projects / claws.git / blobdiff