GSList *mlist);
static void summary_set_header (SummaryView *summaryview,
gchar *text[],
- MsgInfo *msginfo);
+ MsgInfo *msginfo,
+ gboolean *free_from_to);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
GtkCTreeNode *row,
gint column,
SummaryView *summaryview);
+static void summary_unselected (GtkCTree *ctree,
+ GtkCTreeNode *row,
+ gint column,
+ SummaryView *summaryview);
static void summary_col_resized (GtkCList *clist,
gint column,
gint width,
gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
toggle_search,
- _("Toggle quick-search bar"), NULL);
+ _("Toggle quick search bar"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ if (!summaryview->folder_item)
+ return;
if (node) {
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
GTK_EVENTS_FLUSH();
gtk_widget_grab_focus(GTK_WIDGET(ctree));
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ if (GTK_CTREE_ROW(node) == NULL) {
+ g_warning("crash avoidance hack 1\n");
+ return;
+ }
+ if (((GtkCListRow *)(GTK_CTREE_ROW(node)))->state < GTK_STATE_NORMAL
+ || ((GtkCListRow *)(GTK_CTREE_ROW(node)))->state > GTK_STATE_INSENSITIVE) {
+ g_warning("crash avoidance hack 2\n");
+ return;
+ }
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
g_hash_table_destroy(subject_table);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
gtk_clist_thaw(clist);
gchar *spc;
gchar *itstr;
GList *rowlist, *cur;
- guint n_selected = 0;
- off_t sel_size = 0;
+ guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+ off_t sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
else {
sel_size += msginfo->size;
n_selected++;
+
}
}
+
+ if (summaryview->folder_item->hide_read_msgs
+ || quicksearch_is_active(summaryview->quicksearch)) {
+ rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+ for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ msginfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur));
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ n_size += msginfo->size;
+ n_total++;
+ if (MSG_IS_NEW(msginfo->flags))
+ n_new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ n_unread++;
+ }
+ }
+ } else {
+ n_new = summaryview->folder_item->new_msgs;
+ n_unread = summaryview->folder_item->unread_msgs;
+ n_total = summaryview->folder_item->total_msgs;
+ n_size = summaryview->total_size;
+ }
name = folder_item_get_name(summaryview->folder_item);
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->folder_item->new_msgs,
- summaryview->folder_item->unread_msgs,
- summaryview->folder_item->total_msgs,
- to_human_readable(summaryview->total_size));
+ n_new, n_unread, n_total,
+ to_human_readable(n_size));
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
gtk_sctree_sort_recursive(ctree, NULL);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
gtk_clist_thaw(clist);
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
-
- summary_set_header(summaryview, text, msginfo);
+ gboolean free_from_to = FALSE;
+
+ summary_set_header(summaryview, text, msginfo, &free_from_to);
gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
SET_TEXT(S_COL_TO);
/* SET_TEXT(S_COL_SUBJECT); already set by node info */
+ if (free_from_to) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ g_free(text[col_pos[S_COL_TO]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ text[col_pos[S_COL_TO]] = NULL;
+ }
+
#undef SET_TEXT
GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
+ gboolean free_from_to = FALSE;
+ gint *col_pos = summaryview->col_pos;
+
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(summaryview, text, msginfo);
+ summary_set_header(summaryview, text, msginfo, &free_from_to);
node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
+ if (free_from_to) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ g_free(text[col_pos[S_COL_TO]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ text[col_pos[S_COL_TO]] = NULL;
+ }
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
}
static void summary_set_header(SummaryView *summaryview, gchar *text[],
- MsgInfo *msginfo)
+ MsgInfo *msginfo, gboolean *free_from_to)
{
static gchar date_modified[80];
static gchar col_score[11];
if (!should_swap) {
text[col_pos[S_COL_FROM]] = from_text;
text[col_pos[S_COL_TO]] = to_text;
+ *free_from_to = FALSE;
} else {
gchar *tmp = NULL;
tmp = g_strconcat("-->", to_text, NULL);
text[col_pos[S_COL_FROM]] = tmp;
tmp = g_strconcat("<--", from_text, NULL);
text[col_pos[S_COL_TO]] = tmp;
+ *free_from_to = TRUE;
}
if (summaryview->simplify_subject_preg != NULL)
END_LONG_OPERATION(summaryview);
+ summaryview->display_msg = prefs_common.always_show_msg;
+
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
summary_unlock(summaryview);
summaryview->thread_collapsed = FALSE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_collapse_threads(SummaryView *summaryview)
summaryview->thread_collapsed = TRUE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_filter(SummaryView *summaryview, gboolean selected_only)
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
- g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(summary_selected), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "tree_unselect_row",
+ G_CALLBACK(summary_unselected), summaryview);
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
case GDK_l:
case GDK_c:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
+ g_signal_stop_emission_by_name(G_OBJECT(widget),
+ "key_press_event");
mimeview_pass_key_press_event(messageview->mimeview,
event);
break;
summary_set_row_marks(summaryview, node);
}
+static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
+ gint column, SummaryView *summaryview)
+{
+ if (summary_is_locked(summaryview)
+ || GTK_SCTREE(ctree)->selecting_range) {
+ return;
+ }
+
+ summary_status_show(summaryview);
+}
+
static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, SummaryView *summaryview)
{
projects / claws.git / blobdiff