/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
if (summaryview->sort_key == SORT_BY_NONE)
return;
- if(cmp_func != NULL) {
+ if (cmp_func != NULL) {
debug_print("Sorting summary...");
STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
main_window_cursor_wait(summaryview->mainwin);
+ gtk_clist_freeze(clist);
gtk_clist_set_compare_func(clist, cmp_func);
gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
-
- if (summaryview->threaded)
- summary_thread_init(summaryview);
+ gtk_clist_thaw(clist);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
g_node_destroy(root);
+
+ summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
cur = mlist;
msgview = summaryview->messageview;
summaryview->displayed = row;
- if (!messageview_is_visible(msgview))
+ if (!messageview_is_visible(msgview)) {
main_window_toggle_message_view(summaryview->mainwin);
+ GTK_EVENTS_FLUSH();
+ }
val = messageview_show(msgview, msginfo, all_headers);
if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
gtk_widget_grab_focus(summaryview->ctree);
- GTK_EVENTS_FLUSH();
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
compose_reedit(msginfo);
}
-void summary_step(SummaryView *summaryview, GtkScrollType type)
+gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
- if (summary_is_locked(summaryview)) return;
+ 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;
+ return FALSE;
} else {
if (summaryview->selected) {
node = GTK_CTREE_NODE_PREV(summaryview->selected);
- if (!node) return;
+ 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);
+ g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical", type, 0.0);
if (GTK_CLIST(ctree)->selection)
gtk_sctree_set_anchor_row
(GTK_SCTREE(ctree),
GTK_CTREE_NODE(GTK_CLIST(ctree)->selection->data));
+ return TRUE;
}
void summary_toggle_view(SummaryView *summaryview)
folder_item_update_thaw();
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+
if (prefs_common.immediate_exec)
summary_execute(summaryview);
else {
subst_for_filename(filename);
}
if (g_getenv ("G_BROKEN_FILENAMES") &&
- filename && g_utf8_validate(filename, -1, NULL)) {
+ filename && !g_utf8_validate(filename, -1, NULL)) {
gchar *oldstr = filename;
filename = conv_codeset_strdup(filename,
- CS_UTF_8,
- conv_get_locale_charset_str());
+ conv_get_locale_charset_str(),
+ CS_UTF_8);
if (!filename) {
g_warning("summary_save_as(): faild to convert character set.");
filename = g_strdup(oldstr);
GtkCTreeNode *next;
GtkCTreeNode *parent;
MsgInfo *msginfo;
+ GSList *reflist;
summary_lock(summaryview);
parent = NULL;
- /* 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);
+
+ if (!parent && msginfo->references) {
+ for (reflist = msginfo->references;
+ reflist != NULL; reflist = reflist->next)
+ if ((parent = g_hash_table_lookup
+ (summaryview->msgid_table,
+ reflist->data)))
+ break;
+ }
}
if (prefs_common.thread_by_subject && parent == NULL) {
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
+ SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(widget);
GtkCTreeNode *node;
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
return TRUE;
- case GDK_Up:
- case GDK_Down:
- if ((node = summaryview->selected) != NULL) {
- GtkCTreeNode *next = NULL;
- do {
- next = (event->keyval == GDK_Down)
- ? gtkut_ctree_node_next(ctree, next ? next:node)
- : gtkut_ctree_node_prev(ctree, next ? next:node);
- } while (next && !gtk_ctree_is_viewable(ctree, next));
-
- if (next) {
- gtk_sctree_select_with_state
- (GTK_SCTREE(ctree), next, event->state);
-
- /* Deprecated - what are the non-deprecated equivalents? */
- if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
- gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
- summaryview->selected = next;
- }
- }
- return TRUE;
case GDK_Home:
case GDK_End:
if ((node = summaryview->selected) != NULL) {
messageview = summaryview->messageview;
textview = messageview->mimeview->textview;
+ mod_pressed =
+ ((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
if (event->state & GDK_SHIFT_MASK)
summaryview->selected);
break;
}
- mod_pressed = ((event->state &
- (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
if (mod_pressed) {
if (!textview_scroll_page(textview, TRUE))
summary_select_prev_unread(summaryview);
summaryview->selected);
break;
}
- textview_scroll_one_line
- (textview, (event->state &
- (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+ textview_scroll_one_line(textview, mod_pressed);
break;
case GDK_Delete:
BREAK_ON_MODIFIER_KEY();
projects / claws.git / blobdiff