summary_update_msg, (gpointer) summaryview); \
}
+static void popup_menu_selection_done(GtkMenuShell *shell, gpointer user_data)
+{
+ SummaryView *summaryview = (SummaryView *)user_data;
+
+ cm_return_if_fail(summaryview != NULL);
+
+ /* If a message is displayed, place cursor back on the message. */
+ if (summaryview->displayed != NULL &&
+ summaryview->displayed != summaryview->selected) {
+ gtk_sctree_select(GTK_SCTREE(summaryview->ctree), summaryview->displayed);
+ }
+}
+
SummaryView *summary_create(MainWindow *mainwin)
{
SummaryView *summaryview;
g_slist_free(mlist);
- if (is_refresh) {
- if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
- summaryview->displayed =
- summary_find_msg_by_msgnum(summaryview,
- displayed_msgnum);
- if (!summaryview->displayed)
- messageview_clear(summaryview->messageview);
+ if (quicksearch_is_in_typing(summaryview->quicksearch) ||
+ quicksearch_is_running(summaryview->quicksearch)) {
+ summaryview->displayed =
+ summary_find_msg_by_msgnum(summaryview,
+ displayed_msgnum);
+ if (!summaryview->displayed)
+ messageview_clear(summaryview->messageview);
+ summary_unlock(summaryview);
+
+ if (quicksearch_is_running(summaryview->quicksearch))
+ summary_select_by_msgnum(summaryview, selected_msgnum,
+ OPEN_SELECTED_ON_SEARCH_RESULTS);
+ else
+ summary_select_by_msgnum(summaryview, selected_msgnum,
+ FALSE);
+
+ summary_lock(summaryview);
+ if (!summaryview->selected) {
+ /* no selected message - select first unread
+ message, but do not display it */
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
+ node = gtk_cmctree_node_nth
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CMCLIST(ctree)->rows - 1);
summary_unlock(summaryview);
if (quicksearch_is_running(summaryview->quicksearch))
- summary_select_by_msgnum(summaryview, selected_msgnum,
+ summary_select_node(summaryview, node,
OPEN_SELECTED_ON_SEARCH_RESULTS);
else
- summary_select_by_msgnum(summaryview, selected_msgnum,
- FALSE);
+ summary_select_node(summaryview, node,
+ OPEN_SELECTED_ON_FOLDER_OPEN);
summary_lock(summaryview);
- if (!summaryview->selected) {
- /* no selected message - select first unread
- message, but do not display it */
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
- node = gtk_cmctree_node_nth
- (ctree,
- item->sort_type == SORT_DESCENDING
- ? 0 : GTK_CMCLIST(ctree)->rows - 1);
- summary_unlock(summaryview);
-
- if (quicksearch_is_running(summaryview->quicksearch))
- summary_select_node(summaryview, node,
- OPEN_SELECTED_ON_SEARCH_RESULTS);
- else
- summary_select_node(summaryview, node,
- OPEN_SELECTED_ON_FOLDER_OPEN);
-
- summary_lock(summaryview);
- }
- } else {
- /* just select first/last */
- if (GTK_CMCLIST(ctree)->row_list != NULL)
- node = gtk_cmctree_node_nth
- (ctree,
- item->sort_type == SORT_DESCENDING
- ? 0 : GTK_CMCLIST(ctree)->rows - 1);
- summary_select_node(summaryview, node, OPEN_SELECTED_ON_SEARCH_RESULTS);
}
} else {
/* backward compat */
if (node) {
gint open_selected = -1;
- if (!is_refresh) {
- if (OPEN_SELECTED_ON_FOLDER_OPEN)
- open_selected = 1;
- else
- open_selected = 0;
- }
+ if (OPEN_SELECTED_ON_FOLDER_OPEN)
+ open_selected = 1;
+ else
+ open_selected = 0;
summary_select_node(summaryview, node, open_selected);
}
for (cur = GTK_CMCLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
cur = cur->next) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
- mlist = g_slist_prepend(mlist, msginfo);
+ mlist = g_slist_prepend(mlist,
+ procmsg_msginfo_new_ref(msginfo));
}
mlist = g_slist_reverse(mlist);
n_new, n_unread, n_total,
to_human_readable((goffset)n_size));
+ g_signal_connect(G_OBJECT(summaryview->popupmenu), "selection-done",
+ G_CALLBACK(popup_menu_selection_done), summaryview);
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
to_text = to_text ? to_text : _("(No From)");
}
}
- snprintf(tmp2, BUFFSIZE-1, "ā %s", to_text);
+ snprintf(tmp2, BUFFSIZE+4, "ā %s", to_text);
tmp2[BUFFSIZE-1]='\0';
text[col_pos[S_COL_FROM]] = tmp2;
}
}
static gboolean defer_change(gpointer data);
+typedef enum {
+ FLAGS_UNSET,
+ FLAGS_SET,
+ FLAGS_CHANGE
+} ChangeType;
typedef struct _ChangeData {
MsgInfo *info;
- gint op; /* 0, 1, 2 for unset, set, change */
+ ChangeType op;
MsgPermFlags set_flags;
MsgTmpFlags set_tmp_flags;
MsgPermFlags unset_flags;
} else {
ChangeData *unset_data = g_new0(ChangeData, 1);
unset_data->info = msginfo;
- unset_data->op = 0;
+ unset_data->op = FLAGS_UNSET;
unset_data->unset_flags = flags;
unset_data->unset_tmp_flags = tmp_flags;
debug_print("flags: deferring unset\n");
} else {
ChangeData *set_data = g_new0(ChangeData, 1);
set_data->info = msginfo;
- set_data->op = 1;
+ set_data->op = FLAGS_SET;
set_data->set_flags = flags;
set_data->set_tmp_flags = tmp_flags;
debug_print("flags: deferring set\n");
} else {
ChangeData *change_data = g_new0(ChangeData, 1);
change_data->info = msginfo;
- change_data->op = 2;
+ change_data->op = FLAGS_CHANGE;
change_data->set_flags = add_flags;
change_data->set_tmp_flags = add_tmp_flags;
change_data->unset_flags = rem_flags;
} else {
debug_print("flags: finally doing it\n");
switch(chg->op) {
- case 0:
+ case FLAGS_UNSET:
procmsg_msginfo_unset_flags(chg->info, chg->unset_flags, chg->unset_tmp_flags);
break;
- case 1:
+ case FLAGS_SET:
procmsg_msginfo_set_flags(chg->info, chg->set_flags, chg->set_tmp_flags);
break;
- case 2:
+ case FLAGS_CHANGE:
procmsg_msginfo_change_flags(chg->info, chg->set_flags, chg->set_tmp_flags,
chg->unset_flags, chg->unset_tmp_flags);
break;
dest = g_strconcat(prefs_common.attach_save_dir, G_DIR_SEPARATOR_S,
dest, NULL);
dest = filesel_select_file_save(_("Save as"), dest);
+ if (!dest) return;
if (is_file_exist(dest)) {
aval = alertpanel(_("Append or Overwrite"),