2013-02-11 [paul] 3.9.0cvs61
[claws.git] / src / mainwindow.c
index ed944f64e389b6ffa482014c01a78dd6319fb57c..6bd5625fac86c83111639d7f9b985f9a8347b028 100644 (file)
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-   Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
 
    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
@@ -23,6 +23,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "main.h"
 #include "mainwindow.h"
@@ -186,6 +187,8 @@ static void filtering_debug_window_show_cb  (GtkAction      *action,
 
 static void inc_cancel_cb              (GtkAction      *action,
                                  gpointer       data);
+static void send_cancel_cb             (GtkAction      *action,
+                                 gpointer       data);
 
 static void open_msg_cb                        (GtkAction      *action,
                                  gpointer       data);
@@ -641,6 +644,7 @@ static GtkActionEntry mainwin_entries[] =
        {"Message/Receive/---",                 NULL, "---" },
        {"Message/Receive/PlaceHolder",         NULL, "PlaceHolder,", NULL, NULL, G_CALLBACK(mainwindow_nothing_cb) },
        {"Message/SendQueue",                   NULL, N_("_Send queued messages"), NULL, NULL, G_CALLBACK(mw_send_queue_cb) },
+       {"Message/CancelSending",       NULL, N_("Cancel sending"), NULL, NULL, G_CALLBACK(send_cancel_cb) },
 
        {"Message/---",                         NULL, "---" },
 
@@ -1131,7 +1135,7 @@ void mainwin_accel_changed_cb (GtkAccelGroup *accelgroup, guint keyval, GdkModif
                        GtkLabel *label = g_object_get_data(G_OBJECT(item), "accel_label");
                        gchar *new_accel;
                        
-                       if (keyval == GDK_KEY_BackSpace) {
+                       if (keyval == GDK_KEY_Delete) {
                                const gchar *accel_path;
                                accel_path = gtk_menu_item_get_accel_path(item);
                                keyval = 0; modifier = 0;
@@ -1178,8 +1182,11 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
        accel_path = g_strdup_printf("<ClawsColorLabels>/None");
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
+#if !GTK_CHECK_VERSION(2, 24, 0)
+       gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
+#else
        gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-
+#endif
        item = gtk_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        gtk_widget_show(item);
@@ -1197,9 +1204,13 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
                gtk_widget_show(item);
                accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
                gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+               g_free(accel_path);
                if (i < 9)
+#if !GTK_CHECK_VERSION(2, 24, 0)
+                       gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+#else
                        gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-               g_free(accel_path);
+#endif
                g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager), 
                        "accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
 
@@ -1303,8 +1314,11 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
        accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
+#if !GTK_CHECK_VERSION(2, 24, 0)
+       gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
+#else
        gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_KEY_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-
+#endif
        g_slist_free(orig);
        gtk_widget_show(menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
@@ -1791,11 +1805,11 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
-        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator4", "View/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
@@ -1888,6 +1902,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Receive", "Separator1", "Message/Receive/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Receive", "PlaceHolder", "Message/Receive/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "SendQueue", "Message/SendQueue", GTK_UI_MANAGER_MENUITEM)
+       MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "CancelSending", "Message/CancelSending", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ComposeEmail", "Message/ComposeEmail", GTK_UI_MANAGER_MENUITEM)
@@ -3112,9 +3127,9 @@ static void main_window_add_mailbox(MainWindow *mainwin)
        folder_set_ui_func(folder, NULL, NULL);
 }
 
-SensitiveCond main_window_get_current_state(MainWindow *mainwin)
+SensitiveCondMask main_window_get_current_state(MainWindow *mainwin)
 {
-       SensitiveCond state = 0;
+       SensitiveCondMask state = 0;
        SummarySelection selection;
        FolderItem *item = mainwin->summaryview->folder_item;
        GList *account_list = account_get_list();
@@ -3122,88 +3137,93 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        
        selection = summary_get_selection_type(mainwin->summaryview);
 
+#define UPDATE_STATE(...) \
+       do { \
+               state |= main_window_get_mask(__VA_ARGS__, -1); \
+       } while (0)
+
        if (mainwin->lock_count == 0 && !claws_is_starting())
-               state |= M_UNLOCKED;
+               UPDATE_STATE(M_UNLOCKED);
        if (selection != SUMMARY_NONE)
-               state |= M_MSG_EXIST;
+               UPDATE_STATE(M_MSG_EXIST);
        if (item && item->path && folder_item_parent(item) && !item->no_select) {
-               state |= M_EXEC;
+               UPDATE_STATE(M_EXEC);
                /*              if (item->folder->type != F_NEWS) */
-               state |= M_ALLOW_DELETE;
+               UPDATE_STATE(M_ALLOW_DELETE);
 
                if (prefs_common.immediate_exec == 0
                    && mainwin->lock_count == 0)
-                       state |= M_DELAY_EXEC;
+                       UPDATE_STATE(M_DELAY_EXEC);
 
                if ((selection == SUMMARY_NONE && item->hide_read_msgs)
                    || selection != SUMMARY_NONE)
-                       state |= M_HIDE_READ_MSG;
+                       UPDATE_STATE(M_HIDE_READ_MSG);
 
                if ((selection == SUMMARY_NONE && item->hide_read_threads)
                    || selection != SUMMARY_NONE)
-                       state |= M_HIDE_READ_THREADS;
+                       UPDATE_STATE(M_HIDE_READ_THREADS);
        }               
        if (mainwin->summaryview->threaded)
-               state |= M_THREADED;
+               UPDATE_STATE(M_THREADED);
        else
-               state |= M_UNTHREADED;  
+               UPDATE_STATE(M_UNTHREADED);
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
-               state |= M_TARGET_EXIST;
+               UPDATE_STATE(M_TARGET_EXIST);
        if (selection == SUMMARY_SELECTED_SINGLE)
-               state |= M_SINGLE_TARGET_EXIST;
+               UPDATE_STATE(M_SINGLE_TARGET_EXIST);
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->folder->klass->type == F_NEWS)
-               state |= M_NEWS;
+               UPDATE_STATE(M_NEWS);
        else
-               state |= M_NOT_NEWS;
+               UPDATE_STATE(M_NOT_NEWS);
        if (mainwin->summaryview->folder_item &&
            (mainwin->summaryview->folder_item->stype != F_TRASH ||
             !folder_has_parent_of_type(mainwin->summaryview->folder_item, F_TRASH)))
-               state |= M_NOT_TRASH;
+               UPDATE_STATE(M_NOT_TRASH);
 
        if (prefs_common.actions_list && g_slist_length(prefs_common.actions_list))
-               state |= M_ACTIONS_EXIST;
+               UPDATE_STATE(M_ACTIONS_EXIST);
 
        tmp = tags_get_list();
        if (tmp && g_slist_length(tmp))
-               state |= M_TAGS_EXIST;
+               UPDATE_STATE(M_TAGS_EXIST);
        g_slist_free(tmp);
 
        if (procmsg_have_queued_mails_fast() && !procmsg_is_sending())
-               state |= M_HAVE_QUEUED_MAILS;
+               UPDATE_STATE(M_HAVE_QUEUED_MAILS);
 
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (item &&
             (folder_has_parent_of_type(item, F_DRAFT) ||
              folder_has_parent_of_type(item, F_OUTBOX) ||
              folder_has_parent_of_type(item, F_QUEUE))))
-               state |= M_ALLOW_REEDIT;
+               UPDATE_STATE(M_ALLOW_REEDIT);
        if (cur_account)
-               state |= M_HAVE_ACCOUNT;
+               UPDATE_STATE(M_HAVE_ACCOUNT);
        
        if (cur_account && cur_account->protocol != A_NONE)
-               state |= M_HAVE_RETRIEVABLE_ACCOUNT;
+               UPDATE_STATE(M_HAVE_RETRIEVABLE_ACCOUNT);
 
        if (any_folder_want_synchronise())
-               state |= M_WANT_SYNC;
+               UPDATE_STATE(M_WANT_SYNC);
 
        if (item && item->prefs->processing && selection != SUMMARY_NONE)
-               state |= M_HAVE_PROCESSING;
+               UPDATE_STATE(M_HAVE_PROCESSING);
 
        if (g_list_length(account_list) > 1)
-               state |= M_HAVE_MULTI_ACCOUNT;
+               UPDATE_STATE(M_HAVE_MULTI_ACCOUNT);
 
-       for ( ; account_list != NULL; account_list = account_list->next) {
+       for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                if (((PrefsAccount*)account_list->data)->protocol != A_NONE) {
-                       state |= M_HAVE_ANY_RETRIEVABLE_ACCOUNT;
+                       UPDATE_STATE(M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
                        break;
                }
        }
 
-       for ( ; account_list != NULL; account_list = account_list->next) {
+       for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
-                       state |= M_HAVE_NEWS_ACCOUNT;
+                       UPDATE_STATE(M_HAVE_NEWS_ACCOUNT);
                        break;
                }
        }
@@ -3212,48 +3232,74 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
            (mainwin->summaryview->folder_item &&
             mainwin->summaryview->folder_item->folder->klass->type != F_UNKNOWN &&
             mainwin->summaryview->folder_item->folder->klass->type != F_NEWS)) {
-               state |= M_CAN_LEARN_SPAM;
+               UPDATE_STATE(M_CAN_LEARN_SPAM);
        }
 
        if (mainwin->summaryview->folder_item) {
-               state |= M_FOLDER_SELECTED;
+               UPDATE_STATE(M_FOLDER_SELECTED);
        }
 
        if (inc_is_active())
-               state |= M_INC_ACTIVE;
+               UPDATE_STATE(M_INC_ACTIVE);
        if (imap_cancel_all_enabled())
-               state |= M_INC_ACTIVE;
+               UPDATE_STATE(M_INC_ACTIVE);
+
+       if (send_is_active() | procmsg_is_sending())
+               UPDATE_STATE(M_SEND_ACTIVE);
 
        if (mainwin->summaryview->deleted > 0)
-               state |= M_DELETED_EXISTS;
+               UPDATE_STATE(M_DELETED_EXISTS);
 
        if (mainwin->summaryview->deleted > 0 ||
            mainwin->summaryview->moved > 0 ||
            mainwin->summaryview->copied > 0)
-               state |= M_DELAY_EXEC;
+               UPDATE_STATE(M_DELAY_EXEC);
 
        if (summary_is_list(mainwin->summaryview))
-               state |= M_SUMMARY_ISLIST;
+               UPDATE_STATE(M_SUMMARY_ISLIST);
 
        if (prefs_common.layout_mode != SMALL_LAYOUT || mainwin->in_folder)
-               state |= M_IN_MSGLIST;
+               UPDATE_STATE(M_IN_MSGLIST);
 
        for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
                PrefsAccount *account = account_list->data;
                if (account->session_passwd || account->session_smtp_passwd) {
-                       state |= M_SESSION_PASSWORDS;
+                       UPDATE_STATE(M_SESSION_PASSWORDS);
                        break;
                }
        }
+#undef UPDATE_STATE
 
        return state;
 }
 
+SensitiveCondMask main_window_get_mask(SensitiveCond cond, ...)
+{
+       va_list args;
+       gint i;
+       SensitiveCondMask value;
+       static SensitiveCondMask SensitiveCond_table[M_MAX_RESERVED];
+       static gboolean first_time = TRUE;
+
+       if (first_time) {
+               for (i = 0; i < M_MAX_RESERVED; i++)
+                       SensitiveCond_table[i] = (SensitiveCondMask) ((SensitiveCondMask)1 << i);
+               first_time = FALSE;
+       }
+
+       value = 0;
+
+       va_start(args, cond); 
+       for (i = (gint) cond; i >= 0; i = va_arg(args, gint))
+               value |= SensitiveCond_table[i];
+       va_end(args);
 
+       return value;
+}
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-       SensitiveCond state;
+       SensitiveCondMask state;
        gboolean sensitive;
        SummaryView *summaryview;
        gchar *menu_path;
@@ -3262,103 +3308,109 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        gint i;
        gboolean mimepart_selected = FALSE;
 
-       static const struct {
-               gchar *const entry;
-               SensitiveCond cond;
-       } entry[] = {
-               {"Menu/File/SaveAs", M_TARGET_EXIST},
-               {"Menu/File/SavePartAs", M_SINGLE_TARGET_EXIST},
-               {"Menu/File/Print"  , M_TARGET_EXIST},
-               {"Menu/File/SynchroniseFolders", M_WANT_SYNC},
-               {"Menu/File/Exit"      , M_UNLOCKED},
-
-               {"Menu/Edit/SelectThread"                  , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Edit/DeleteThread"                  , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Edit/Find", M_SINGLE_TARGET_EXIST},
-               {"Menu/Edit/QuickSearch",                    M_IN_MSGLIST},
-
-               {"Menu/View/SetColumns/Folderlist"      , M_UNLOCKED|M_SUMMARY_ISLIST}, 
-               {"Menu/View/Sort"                      , M_EXEC|M_SUMMARY_ISLIST},
-               {"Menu/View/ThreadView"               , M_EXEC|M_SUMMARY_ISLIST},
-               {"Menu/View/ExpandThreads"        , M_MSG_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/View/CollapseThreads"      , M_MSG_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/View/HideReadThreads"       , M_HIDE_READ_THREADS|M_SUMMARY_ISLIST},
-               {"Menu/View/HideReadMessages"      , M_HIDE_READ_MSG|M_SUMMARY_ISLIST},
-               {"Menu/View/HideDelMessages"       , M_SUMMARY_ISLIST},
-               {"Menu/View/Goto/Prev"        , M_MSG_EXIST},
-               {"Menu/View/Goto/Next"        , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevUnread" , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevNew"    , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevMarked" , M_MSG_EXIST},
-               {"Menu/View/Goto/PrevLabeled", M_MSG_EXIST},
-               {"Menu/View/Goto/NextLabeled", M_MSG_EXIST},
-               {"Menu/View/Goto/ParentMessage"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Goto/NextPart"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Goto/PrevPart"      , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/OpenNewWindow"        , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/MessageSource"            , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Part"            , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/AllHeaders"                    , M_SINGLE_TARGET_EXIST},
-               {"Menu/View/Quotes"                    , M_SINGLE_TARGET_EXIST},
-
-               {"Menu/Message/Receive/CurrentAccount"
-                                                , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT},
-               {"Menu/Message/Receive/AllAccounts"
-                                                , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT},
-               {"Menu/Message/Receive/CancelReceiving"
-                                                , M_INC_ACTIVE},
-               {"Menu/Message/SendQueue"  , M_HAVE_ACCOUNT|M_HAVE_QUEUED_MAILS},
-               {"Menu/Message/ComposeEmail", M_HAVE_ACCOUNT},
-               {"Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT},
-               {"Menu/Message/Reply"                 , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/ReplyTo"              , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/FollowupReply", M_HAVE_ACCOUNT|M_TARGET_EXIST|M_NEWS|M_SUMMARY_ISLIST},
-               {"Menu/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/ForwardAtt" , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Redirect"                  , M_HAVE_ACCOUNT|M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Move"              , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-               {"Menu/Message/Copy"              , M_TARGET_EXIST|M_EXEC},
-               {"Menu/Message/Trash"     , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
-               {"Menu/Message/Delete"            , M_TARGET_EXIST|M_ALLOW_DELETE},
-               {"Menu/Message/CancelNews" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NEWS},
-               {"Menu/Message/Mark"              , M_TARGET_EXIST|M_SUMMARY_ISLIST},
-               {"Menu/Message/Mark/MarkSpam"     , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menu/Message/Mark/MarkHam"      , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menu/Message/Mark/IgnoreThread"    , M_TARGET_EXIST},
-               {"Menu/Message/Mark/UnignoreThread"  , M_TARGET_EXIST},
-               {"Menu/Message/Mark/Lock"         , M_TARGET_EXIST},
-               {"Menu/Message/Mark/Unlock"       , M_TARGET_EXIST},
-               {"Menu/Message/ColorLabel"                , M_TARGET_EXIST},
-               {"Menu/Message/Tags"              , M_TARGET_EXIST},
-               {"Menu/Message/Reedit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-               {"Menu/Message/CheckSignature"               , M_SINGLE_TARGET_EXIST},
-
-               {"Menu/Tools/AddSenderToAB"   , M_SINGLE_TARGET_EXIST},
-               {"Menu/Tools/CollectAddresses"            , M_FOLDER_SELECTED},
-               {"Menu/Tools/CollectAddresses/FromFolder"
-                                                      , M_FOLDER_SELECTED},
-               {"Menu/Tools/CollectAddresses/FromSelected"
-                                                      , M_TARGET_EXIST},
-               {"Menu/Tools/FilterFolder", M_MSG_EXIST|M_EXEC},
-               {"Menu/Tools/FilterSelected"     , M_TARGET_EXIST|M_EXEC},
-               {"Menu/Tools/RunProcessing"  , M_HAVE_PROCESSING},
-               {"Menu/Tools/CreateFilterRule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"Menu/Tools/CreateProcessingRule"       , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
-               {"Menu/Tools/ListUrls"                 , M_TARGET_EXIST},
-               {"Menu/Tools/Actions"                      , M_TARGET_EXIST|M_ACTIONS_EXIST},
-               {"Menu/Tools/Execute"                      , M_DELAY_EXEC},
-               {"Menu/Tools/Expunge"                      , M_DELETED_EXISTS},
-               {"Menu/Tools/ForgetSessionPasswords"       , M_SESSION_PASSWORDS},
-               {"Menu/Tools/DeleteDuplicates/SelFolder"   , M_MSG_EXIST|M_ALLOW_DELETE},
-
-               {"Menu/Configuration", M_UNLOCKED},
-               {"Menu/Configuration/ChangeAccount", M_HAVE_MULTI_ACCOUNT},
-               {"Menu/Configuration/AccountPrefs", M_UNLOCKED},
-               {"Menu/Configuration/CreateAccount", M_UNLOCKED},
-               {"Menu/Configuration/EditAccounts", M_UNLOCKED},
-
-               {NULL, 0}
-       };
+#define N_ENTRIES 82
+       static struct {
+               const gchar *entry;
+               SensitiveCondMask cond;
+       } entry[N_ENTRIES];
+
+       i = 0;
+#define FILL_TABLE(entry_str, ...) \
+do { \
+       entry[i].entry = (const gchar *) entry_str; entry[i++].cond = main_window_get_mask(__VA_ARGS__, -1); \
+} while (0)
+
+       FILL_TABLE("Menu/File/SaveAs", M_TARGET_EXIST);
+       FILL_TABLE("Menu/File/SavePartAs", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/File/Print", M_TARGET_EXIST);
+       FILL_TABLE("Menu/File/SynchroniseFolders", M_WANT_SYNC);
+       FILL_TABLE("Menu/File/Exit", M_UNLOCKED);
+
+       FILL_TABLE("Menu/Edit/SelectThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Edit/DeleteThread", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Edit/Find", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/Edit/QuickSearch", M_IN_MSGLIST);
+
+       FILL_TABLE("Menu/View/SetColumns/Folderlist", M_UNLOCKED, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/Sort", M_EXEC, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/ThreadView", M_EXEC, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/ExpandThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/CollapseThreads", M_MSG_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/HideReadThreads", M_HIDE_READ_THREADS, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/HideReadMessages", M_HIDE_READ_MSG, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/HideDelMessages", M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/View/Goto/Prev", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/Next", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevUnread", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevNew", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevMarked", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevLabeled", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/NextLabeled", M_MSG_EXIST);
+       FILL_TABLE("Menu/View/Goto/ParentMessage", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/Goto/NextPart", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/Goto/PrevPart", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/MessageSource", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/Part", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/AllHeaders", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/View/Quotes", M_SINGLE_TARGET_EXIST);
+
+       FILL_TABLE("Menu/Message/Receive/CurrentAccount", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_RETRIEVABLE_ACCOUNT);
+       FILL_TABLE("Menu/Message/Receive/AllAccounts", M_HAVE_ACCOUNT, M_UNLOCKED, M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
+       FILL_TABLE("Menu/Message/Receive/CancelReceiving", M_INC_ACTIVE);
+       FILL_TABLE("Menu/Message/SendQueue", M_HAVE_ACCOUNT, M_HAVE_QUEUED_MAILS);
+       FILL_TABLE("Menu/Message/CancelSending", M_SEND_ACTIVE);
+       FILL_TABLE("Menu/Message/ComposeEmail", M_HAVE_ACCOUNT);
+       FILL_TABLE("Menu/Message/ComposeNews", M_HAVE_NEWS_ACCOUNT);
+       FILL_TABLE("Menu/Message/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/FollowupReply", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_NEWS, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
+       FILL_TABLE("Menu/Message/Copy", M_TARGET_EXIST, M_EXEC);
+       FILL_TABLE("Menu/Message/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
+       FILL_TABLE("Menu/Message/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
+       FILL_TABLE("Menu/Message/CancelNews", M_TARGET_EXIST, M_ALLOW_DELETE, M_NEWS);
+       FILL_TABLE("Menu/Message/Mark", M_TARGET_EXIST, M_SUMMARY_ISLIST);
+       FILL_TABLE("Menu/Message/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       FILL_TABLE("Menu/Message/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       FILL_TABLE("Menu/Message/Mark/IgnoreThread", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/Mark/UnignoreThread", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/Mark/Lock", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/Mark/Unlock", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/ColorLabel", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/Tags", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Message/Reedit", M_HAVE_ACCOUNT, M_ALLOW_REEDIT);
+       FILL_TABLE("Menu/Message/CheckSignature", M_SINGLE_TARGET_EXIST);
+
+       FILL_TABLE("Menu/Tools/AddSenderToAB", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menu/Tools/CollectAddresses", M_FOLDER_SELECTED);
+       FILL_TABLE("Menu/Tools/CollectAddresses/FromFolder", M_FOLDER_SELECTED);
+       FILL_TABLE("Menu/Tools/CollectAddresses/FromSelected", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Tools/FilterFolder", M_MSG_EXIST, M_EXEC);
+       FILL_TABLE("Menu/Tools/FilterSelected", M_TARGET_EXIST, M_EXEC);
+       FILL_TABLE("Menu/Tools/RunProcessing", M_HAVE_PROCESSING);
+       FILL_TABLE("Menu/Tools/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
+       FILL_TABLE("Menu/Tools/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
+       FILL_TABLE("Menu/Tools/ListUrls", M_TARGET_EXIST);
+       FILL_TABLE("Menu/Tools/Actions", M_TARGET_EXIST, M_ACTIONS_EXIST);
+       FILL_TABLE("Menu/Tools/Execute", M_DELAY_EXEC);
+       FILL_TABLE("Menu/Tools/Expunge", M_DELETED_EXISTS);
+       FILL_TABLE("Menu/Tools/ForgetSessionPasswords", M_SESSION_PASSWORDS);
+       FILL_TABLE("Menu/Tools/DeleteDuplicates/SelFolder", M_MSG_EXIST, M_ALLOW_DELETE);
+
+       FILL_TABLE("Menu/Configuration", M_UNLOCKED);
+       FILL_TABLE("Menu/Configuration/ChangeAccount", M_HAVE_MULTI_ACCOUNT);
+       FILL_TABLE("Menu/Configuration/AccountPrefs", M_UNLOCKED);
+       FILL_TABLE("Menu/Configuration/CreateAccount", M_UNLOCKED);
+       FILL_TABLE("Menu/Configuration/EditAccounts", M_UNLOCKED);
+       FILL_TABLE(NULL, -1);
+#undef FILL_TABLE
+       if (i > N_ENTRIES)
+               g_error("main window menu entry table overrun (%d/%d)", i, N_ENTRIES);
+#undef ENTRIES
 
        state = main_window_get_current_state(mainwin);
 
@@ -3380,7 +3432,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
        for (; cur_item != NULL; cur_item = cur_item->next) {
                gtk_widget_set_sensitive(GTK_WIDGET(cur_item->data),
-                                        (M_UNLOCKED & state) != 0);
+                                        (main_window_get_mask(M_UNLOCKED, -1) & state) != 0);
        }
 
        g_list_free(children);
@@ -3446,10 +3498,10 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        &&  mainwin->messageview->mimeview->textview)
                cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/AllHeaders",
                                                prefs_common.show_all_headers);
-       cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & M_THREADED) != 0);
-       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & M_THREADED) != 0);
+       cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/ThreadView", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/ExpandThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/CollapseThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
+       cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", (state & main_window_get_mask(M_THREADED, -1)) != 0);
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
        cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));
@@ -4425,6 +4477,11 @@ static void inc_cancel_cb(GtkAction *action, gpointer data)
        imap_cancel_all();
 }
 
+static void send_cancel_cb(GtkAction *action, gpointer data)
+{
+       send_cancel();
+}
+
 static void move_to_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;