static GtkCMCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
- GtkCMCTreeNode *current_node);
+ GtkCMCTreeNode *current_node,
+ gboolean start_from_prev);
static GtkCMCTreeNode *summary_find_next_msg
(SummaryView *summaryview,
- GtkCMCTreeNode *current_node);
+ GtkCMCTreeNode *current_node,
+ gboolean start_from_next);
static GtkCMCTreeNode *summary_find_prev_flagged_msg
(SummaryView *summaryview,
if (summaryview->folder_pixmap)
gtk_widget_destroy(summaryview->folder_pixmap);
- pixmap = stock_pixmap_widget(summaryview->hbox_l, icon);
+ pixmap = stock_pixmap_widget(icon);
gtk_container_add(GTK_CONTAINER(summaryview->folder_pixmap_eventbox), pixmap);
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
GtkWidget *pixmap;
gtk_widget_realize(summaryview->ctree);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
- &markxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
- &deletedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
- &newxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
- &unreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
- &repliedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
- &forwardedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED,
- &repliedandforwardedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
- &clipxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
- &lockedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
- &ignorethreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_WATCHTHREAD,
- &watchthreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
- &clipkeyxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY_SIGN,
- &keysignxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
- &keyxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
- &gpgsignedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
- &clipgpgsignedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
- &spamxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
- &movedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
- &copiedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DELETED, &deletedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED, &repliedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP, &clipxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LOCKED, &lockedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY, &keyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_SPAM, &spamxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MOVED, &movedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_COPIED, &copiedxpm);
summary_set_fonts(summaryview);
summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_QUICKSEARCH);
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
gtk_widget_show(pixmap);
summaryview->multiple_sel_image = pixmap;
item->sort_type == SORT_DESCENDING
? 0 : GTK_CMCLIST(ctree)->rows - 1);
summary_unlock(summaryview);
- summary_select_node(summaryview, node, FALSE, TRUE);
+ summary_select_node(summaryview, node, 0);
summary_lock(summaryview);
}
} else {
}
summary_unlock(summaryview);
- if (node) {
- gboolean show = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
- (prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
- messageview_is_visible(summaryview->messageview));
- summary_select_node(summaryview, node, show, TRUE);
- }
+ if (node)
+ summary_select_node(summaryview, node, -1);
summary_lock(summaryview);
}
#endif
summary_unlock(summaryview);
}
+void summary_select_prev(SummaryView *summaryview)
+{
+ GtkCMCTreeNode *node = summaryview->selected;
+ GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+
+ node = gtkut_ctree_node_prev(ctree, node);
+
+ if (node && node != summaryview->selected)
+ summary_select_node(summaryview, node, -1);
+}
+
+void summary_select_next(SummaryView *summaryview)
+{
+ GtkCMCTreeNode *node = summaryview->selected;
+ GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+
+ node = gtkut_ctree_node_next(ctree, node);
+
+ if (node && node != summaryview->selected)
+ summary_select_node(summaryview, node, -1);
+}
void summary_select_prev_unread(SummaryView *summaryview)
{
if (!node)
alertpanel_notice(_("No unread messages."));
else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_next_unread(SummaryView *summaryview)
skip_cur = TRUE;
}
-
node = summary_find_next_flagged_msg
(summaryview, node, MSG_UNREAD, skip_cur);
if (node)
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
else {
node = summary_find_next_flagged_msg
(summaryview, NULL, MSG_UNREAD, FALSE);
}
if (val == G_ALERTALTERNATE)
- folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD);
} else {
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
}
}
if (!node)
alertpanel_notice(_("No new messages."));
else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_next_new(SummaryView *summaryview)
skip_cur = TRUE;
}
-
node = summary_find_next_flagged_msg
(summaryview, node, MSG_NEW, skip_cur);
if (node)
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
else {
node = summary_find_next_flagged_msg
(summaryview, NULL, MSG_NEW, FALSE);
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_NEW);
return;
}
else
return;
} else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
}
if (!node)
alertpanel_notice(_("No marked messages."));
else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_next_marked(SummaryView *summaryview)
skip_cur = TRUE;
}
-
node = summary_find_next_flagged_msg
(summaryview, node, MSG_MARKED, skip_cur);
if (node)
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
else {
node = summary_find_next_flagged_msg
(summaryview, NULL, MSG_MARKED, FALSE);
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED);
return;
}
else
return;
} else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
}
if (!node)
alertpanel_notice(_("No labeled messages."));
else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_next_labeled(SummaryView *summaryview)
if (!node)
alertpanel_notice(_("No labeled messages."));
else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_parent(SummaryView *summaryview)
if (summaryview->selected)
node = GTK_CMCTREE_ROW(summaryview->selected)->parent;
if (node)
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, -1);
}
void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
GtkCMCTreeNode *node;
node = summary_find_msg_by_msgnum(summaryview, msgnum);
- summary_select_node(summaryview, node, FALSE, TRUE);
+ summary_select_node(summaryview, node, 0);
}
void summary_display_by_msgnum(SummaryView *summaryview, guint msgnum)
GtkCMCTreeNode *node;
node = summary_find_msg_by_msgnum(summaryview, msgnum);
- summary_select_node(summaryview, node, TRUE, FALSE);
+ summary_select_node(summaryview, node, 1);
}
void summary_select_by_msg_list(SummaryView *summaryview, GSList *msginfos)
gint column;
SummaryView *summaryview;
gboolean display_msg;
- gboolean do_refresh;
} PostponedSelectData;
static gboolean summary_select_retry(void *data)
psdata->column, psdata->summaryview);
else if (psdata->node)
summary_select_node(psdata->summaryview, psdata->node,
- psdata->display_msg, psdata->do_refresh);
- else
- summary_step(psdata->summaryview, psdata->type);
+ psdata->display_msg);
g_free(psdata);
return FALSE;
}
* summary_select_node:
* @summaryview: Summary view.
* @node: Summary tree node.
- * @display_msg: TRUE to display the selected message.
- * @do_refresh: TRUE to refresh the widget.
+ * @force_display: -1 unset, 0 don't show the msg, 1 show the msg.
*
* Select @node (bringing it into view by scrolling and expanding its
- * thread, if necessary) and unselect all others. If @display_msg is
- * TRUE, display the corresponding message in the message view.
- * If @do_refresh is TRUE, the widget is refreshed.
+ * thread, if necessary) and unselect all others. If @force_display is
+ * 1, display the corresponding message in the message view, if
+ * @force_display is -1, obey prefs_common.always_show_msg.
**/
void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
- gboolean display_msg, gboolean do_refresh)
+ gint force_display)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+ gboolean display_msg;
+ display_msg = force_display > -1? force_display :
+ (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
+ ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
+ messageview_is_visible(summaryview->messageview)));
+
if (summary_is_locked(summaryview)
&& !GTK_SCTREE(ctree)->selecting_range
&& summaryview->messageview->mimeview
data->node = node;
data->summaryview = summaryview;
data->display_msg = display_msg;
- data->do_refresh = do_refresh;
debug_print("postponing open of message till end of load\n");
g_timeout_add(100, summary_select_retry, data);
return;
if (node) {
summary_cancel_mark_read_timeout(summaryview);
gtkut_ctree_expand_parent_all(ctree, node);
- if (do_refresh) {
- summary_lock(summaryview);
- GTK_EVENTS_FLUSH();
- summary_unlock(summaryview);
- gtk_widget_grab_focus(GTK_WIDGET(ctree));
- gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
- }
+
+ summary_lock(summaryview);
+ GTK_EVENTS_FLUSH();
+ summary_unlock(summaryview);
+ gtk_widget_grab_focus(GTK_WIDGET(ctree));
+ gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
+
if (display_msg && summaryview->displayed == node)
summaryview->displayed = NULL;
summaryview->display_msg = display_msg;
}
static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
- GtkCMCTreeNode *current_node)
+ GtkCMCTreeNode *current_node,
+ gboolean start_from_prev)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkCMCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = current_node;
- else
+ if (current_node) {
+ if (start_from_prev)
+ node = gtkut_ctree_node_prev(ctree, current_node);
+ else
+ node = current_node;
+ } else
node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
- for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+ for (; node != NULL; node = gtkut_ctree_node_prev(ctree, node)) {
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
}
static GtkCMCTreeNode *summary_find_next_msg(SummaryView *summaryview,
- GtkCMCTreeNode *current_node)
+ GtkCMCTreeNode *current_node,
+ gboolean start_from_next)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
GtkCMCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = 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_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
if (current_node) {
if (start_from_prev)
- node = GTK_CMCTREE_NODE_PREV(current_node);
+ node = gtkut_ctree_node_prev(ctree, current_node);
else
node = current_node;
} else
node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
- for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+ for (; node != NULL; node = gtkut_ctree_node_prev(ctree, node)) {
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
}
MsgInfo *src_msginfo, *dst_msginfo;
GHashTable *subject_table;
- debug_print("Attracting messages by subject...");
+ debug_print("Attracting messages by subject...\n");
STATUSBAR_PUSH(summaryview->mainwin,
_("Attracting messages by subject..."));
summary_thaw(summaryview);
- debug_print("done.\n");
+ debug_print("Attracting messages by subject done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
last_boldfont = g_strdup(BOLD_FONT);
last_derive = prefs_common.derive_from_normal_font;
- if (update_font) {
- bold_style = bold_marked_style = bold_deleted_style =
- small_style = small_marked_style = small_deleted_style = NULL;
+#define STYLE_FREE(s) \
+ if (s != NULL) { \
+ g_object_unref(s); \
+ s = NULL; \
+ }
+
+ if (update_font) {
+ STYLE_FREE(bold_style);
+ STYLE_FREE(bold_style);
+ STYLE_FREE(bold_marked_style);
+ STYLE_FREE(bold_deleted_style);
+ STYLE_FREE(small_style);
+ STYLE_FREE(small_marked_style);
+ STYLE_FREE(small_deleted_style);
summary_set_fonts(summaryview);
}
+#undef STYLE_FREE
+
summary_set_column_titles(summaryview);
summary_relayout(summaryview);
goto unlock;
if (cmp_func != NULL) {
- debug_print("Sorting summary...");
+ debug_print("Sorting summary...\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
main_window_cursor_wait(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
- debug_print("done.\n");
+ debug_print("Sorting summary done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
unlock:
if (!mlist) return;
- debug_print("\tSetting summary from message data...\n");
+ debug_print("Setting summary from message data...\n");
STATUSBAR_PUSH(summaryview->mainwin,
_("Setting summary from message data..."));
gdk_flush();
if (prefs_common.use_addr_book)
end_address_completion();
- debug_print("done.\n");
+ debug_print("Setting summary from message data done.\n");
STATUSBAR_POP(summaryview->mainwin);
if (debug_get_mode()) {
debug_print("\tmsgid hash table size = %d\n",
compose_reedit(msginfo, FALSE);
}
-gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
-{
- GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
- GtkCMCTreeNode *node;
-
- if (summary_is_locked(summaryview)
- && !GTK_SCTREE(ctree)->selecting_range
- && summaryview->messageview->mimeview
- && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
- && summaryview->messageview->mimeview->textview->loading) {
- PostponedSelectData *data = g_new0(PostponedSelectData, 1);
- summaryview->messageview->mimeview->textview->stop_loading = TRUE;
-
- data->ctree = ctree;
- data->row = NULL;
- data->node = NULL;
- data->type = type;
- data->summaryview = summaryview;
- debug_print("postponing open of message till end of load\n");
- g_timeout_add(100, summary_select_retry, data);
- return FALSE;
- }
- if (summary_is_locked(summaryview))
- return FALSE;
- if (type == GTK_SCROLL_STEP_FORWARD) {
- node = gtkut_ctree_node_next(ctree, summaryview->selected);
- if (node)
- gtkut_ctree_expand_parent_all(ctree, node);
- else
- return FALSE;
- } else {
- if (summaryview->selected) {
- node = GTK_CMCTREE_NODE_PREV(summaryview->selected);
- if (!node) return FALSE;
- }
- }
-
- if (messageview_is_visible(summaryview->messageview))
- summaryview->display_msg = TRUE;
-
- g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical", type, 0.0);
-
- if (GTK_CMCLIST(ctree)->selection)
- gtk_sctree_set_anchor_row
- (GTK_SCTREE(ctree),
- GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->selection->data));
-
- return TRUE;
-}
-
gboolean summary_is_list(SummaryView *summaryview)
{
return (gtk_notebook_get_current_page(
END_LONG_OPERATION(summaryview);
if (summaryview->sort_type == SORT_ASCENDING) {
- node = summary_find_next_msg(summaryview, sel_last);
+ node = summary_find_next_msg(summaryview, sel_last, TRUE);
if (!node || prefs_common.next_on_delete == FALSE)
- node = summary_find_prev_msg(summaryview, sel_last);
+ node = summary_find_prev_msg(summaryview, sel_last,TRUE);
} else {
- node = summary_find_prev_msg(summaryview, sel_last);
+ node = summary_find_prev_msg(summaryview, sel_last,TRUE);
if (!node || prefs_common.next_on_delete == FALSE)
- node = summary_find_next_msg(summaryview, sel_last);
+ node = summary_find_next_msg(summaryview, sel_last,TRUE);
}
- summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+ summary_select_node(summaryview, node, -1);
if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
summary_execute(summaryview);
}
END_LONG_OPERATION(summaryview);
- summaryview->display_msg = (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
- ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
- messageview_is_visible(summaryview->messageview)));
-
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
GtkCMCTreeNode *node = NULL;
if (summaryview->sort_type == SORT_ASCENDING) {
- node = summary_find_next_msg(summaryview, sel_last);
+ node = summary_find_next_msg(summaryview, sel_last,TRUE);
if (!node || prefs_common.next_on_delete == FALSE)
- node = summary_find_prev_msg(summaryview, sel_last);
+ node = summary_find_prev_msg(summaryview, sel_last,TRUE);
} else {
- node = summary_find_prev_msg(summaryview, sel_last);
+ node = summary_find_prev_msg(summaryview, sel_last,TRUE);
if (!node || prefs_common.next_on_delete == FALSE)
- node = summary_find_next_msg(summaryview, sel_last);
+ node = summary_find_next_msg(summaryview, sel_last,TRUE);
}
- summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
+ summary_select_node(summaryview, node, -1);
summary_status_show(summaryview);
}
GtkCMCTreeNode *node = gtk_cmctree_node_nth (GTK_CMCTREE(summaryview->ctree),
GTK_CMCLIST(summaryview->ctree)->rows - 1);
if (node)
- summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
+ summary_select_node(summaryview, node, -1);
}
}
gtkut_ctree_node_is_selected(ctree, node)) {
summary_unselect_all(summaryview);
if (summaryview->sort_type == SORT_ASCENDING) {
- new_selected = summary_find_next_msg(summaryview, node);
+ new_selected = summary_find_next_msg(summaryview, node,TRUE);
if (!new_selected || prefs_common.next_on_delete == FALSE)
- new_selected = summary_find_prev_msg(summaryview, node);
+ new_selected = summary_find_prev_msg(summaryview, node,TRUE);
} else {
- new_selected = summary_find_prev_msg(summaryview, node);
+ new_selected = summary_find_prev_msg(summaryview, node,TRUE);
if (!new_selected || prefs_common.next_on_delete == FALSE)
- new_selected = summary_find_next_msg(summaryview, node);
+ new_selected = summary_find_next_msg(summaryview, node,TRUE);
}
}
if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
menu_set_insensitive_all
(GTK_MENU_SHELL(summaryview->popupmenu));
- gtk_widget_grab_focus(summaryview->folderview->ctree);
+ folderview_grab_focus(summaryview->folderview);
} else {
menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
gtk_widget_grab_focus(summaryview->ctree);
if (!new_selected &&
gtkut_ctree_node_is_selected(ctree, node)) {
summary_unselect_all(summaryview);
- new_selected = summary_find_next_msg(summaryview, node);
+ new_selected = summary_find_next_msg(summaryview, node,TRUE);
if (!new_selected)
new_selected = summary_find_prev_msg
- (summaryview, node);
+ (summaryview, node,TRUE);
}
gtk_sctree_remove_node((GtkSCTree *)ctree, node);
if (!GTK_CMCLIST(summaryview->ctree)->row_list) {
menu_set_insensitive_all
(GTK_MENU_SHELL(summaryview->popupmenu));
- gtk_widget_grab_focus(summaryview->folderview->ctree);
+ folderview_grab_focus(summaryview->folderview);
} else {
menu_set_sensitive_all(GTK_MENU_SHELL(summaryview->popupmenu), TRUE);
gtk_widget_grab_focus(summaryview->ctree);
summary_lock(summaryview);
- debug_print("Building threads...");
+ debug_print("Building threads...\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
main_window_cursor_wait(summaryview->mainwin);
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- debug_print("done.\n");
+ debug_print("Building threads done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
gboolean froze = FALSE;
- debug_print("Unthreading for execution...");
+ debug_print("Unthreading for execution...\n");
START_LONG_OPERATION(summaryview, TRUE);
for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
END_LONG_OPERATION(summaryview);
- debug_print("done.\n");
+ debug_print("Unthreading for execution done.\n");
}
static void summary_unthread_for_exec_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
folder_item_update_freeze();
- debug_print("filtering...");
+ debug_print("filtering...\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
summary_thaw(summaryview);
folder_item_update_thaw();
- debug_print("done.\n");
+ debug_print("filtering done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
SummaryView *summaryview)
{
if (event) {
- gtk_widget_grab_focus(summaryview->folderview->ctree);
+ folderview_grab_focus(summaryview->folderview);
mainwindow_exit_folder(summaryview->mainwin);
}
return TRUE;
break;
/* FALLTHROUGH */
case GDK_KEY_Escape:
- gtk_widget_grab_focus(summaryview->folderview->ctree);
+ folderview_grab_focus(summaryview->folderview);
mainwindow_exit_folder(summaryview->mainwin);
return TRUE;
case GDK_KEY_Home: case GDK_KEY_KP_Home:
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
{
- GtkWidget *ctree = summaryview->ctree;
GtkWidget *pixmap;
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DELETED, &deletedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED, &repliedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP, &clipxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LOCKED, &lockedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY, &keyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_SPAM, &spamxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MOVED, &movedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_COPIED, &copiedxpm);
summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_QUICKSEARCH);
gtk_container_remove (GTK_CONTAINER(summaryview->toggle_search),
summaryview->quick_search_pixmap);
gtk_container_add(GTK_CONTAINER(summaryview->toggle_search), pixmap);
summaryview->quick_search_pixmap = pixmap;
#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn),
summaryview->multiple_sel_image);
gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
node = gtk_cmctree_node_nth(GTK_CMCTREE(summaryview->ctree), 0);
if (node)
- summary_select_node(summaryview, node, TRUE, TRUE);
+ summary_select_node(summaryview, node, 1);
}
gint summaryview_export_mbox_list(SummaryView *summaryview)
projects / claws.git / blobdiff