new filtering action : forward - some fixes

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index ba93d404eb5c0ec75806314d36e270fed7497ff7..2c7b0f9ab087a8693b7627fdc715b0b48eecbf59 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -628,7 +628,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        return FALSE;
        } else
 #endif
-               summary_write_cache(summaryview);
+               if (!is_refresh)
+                       summary_write_cache(summaryview);
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -843,7 +844,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Open in new window", sens);
        menu_set_sensitive(ifactory, "/View source", sens);
        menu_set_sensitive(ifactory, "/Show all header", sens);
-       if (summaryview->folder_item->stype == F_DRAFT)
+       if ((summaryview->folder_item->stype == F_DRAFT) ||
+           (summaryview->folder_item->stype == F_OUTBOX))
                menu_set_sensitive(ifactory, "/Reedit", sens);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
@@ -1456,8 +1458,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        gchar * s;
                                        parentinfo->threadscore =
                                                cur_msginfo->threadscore;
-                                       s = itos(parentinfo->threadscore);
 #if 0
+                                       s = itos(parentinfo->threadscore);
                                        gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
 #endif
                                }
@@ -3019,10 +3021,10 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                compose_reply(msginfo, FALSE, TRUE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(msginfo, FALSE);
+               compose_forward(NULL, msginfo, FALSE);
                break;
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(msginfo, TRUE);
+               compose_forward(NULL, msginfo, TRUE);
                break;
        default:
                compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);