nickname bug / options disabled when on inbox

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 906b308aec2e558bec9d72133e5a6e155b96bca2..58def0230f2c496105e59dc27555e7a8c793230c 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2093,7 +2093,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                }
        }
 
-       if ((text[S_COL_FROM] != to) && prefs_common.use_addr_book &&
+       if ((text[col_pos[S_COL_FROM]] != to) && prefs_common.use_addr_book &&
            msginfo->from) {
                gint count;
                gchar *from;
@@ -2108,7 +2108,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                                from = get_complete_address(1);
                                from_name = procheader_get_fromname(from);
                                g_free(from);
-                               text[S_COL_FROM] = from_name;
+                               text[col_pos[S_COL_FROM]] = from_name;
                        }
                }
        }
@@ -2649,14 +2649,16 @@ void summary_delete(SummaryView *summaryview)
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
-       if (node == gtkut_ctree_node_next(ctree, sel_last))
-               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-       else if (node == GTK_CTREE_NODE_PREV(sel_last))
-               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-       else
-               summary_select_node
-                       (summaryview, node,
-                        summaryview->msg_is_toggled_on);
+
+       if (node) {
+               if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
+                       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+               else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
+                       summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
+               else
+                       summary_select_node(summaryview, node,
+                                           summaryview->msg_is_toggled_on);
+       }
 
        if (prefs_common.immediate_exec || item->stype == F_TRASH)
                summary_execute(summaryview);
@@ -3434,7 +3436,10 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 void summary_filter(SummaryView *summaryview)
 {
-       if (!prefs_common.fltlist) return;
+       if (!prefs_common.fltlist && !prefs_filtering) {
+               alertpanel_error(_("No filter rules defined."));
+               return;
+       }
 
        summary_lock(summaryview);
 
@@ -3765,7 +3770,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_TRIANGLE);
 #endif
-       gtk_ctree_set_indent(GTK_CTREE(ctree), 18);
+       gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
        gtk_object_set_user_data(GTK_OBJECT(ctree), summaryview);
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {