sync with 0.8.8cvs5
[claws.git] / src / mainwindow.c
index 1053638043cc5773f9fb23a06adf748a1452b014..d9162786ede64199f0060b1bf48a66159cd5c103 100644 (file)
@@ -60,7 +60,6 @@
 #include "import.h"
 #include "export.h"
 #include "prefs_common.h"
-#include "prefs_filter.h"
 #include "prefs_actions.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
@@ -68,7 +67,6 @@
 #include "prefs_folder_item.h"
 #include "prefs_summary_column.h"
 #include "prefs_template.h"
-#include "prefs_toolbar.h"
 #include "account.h"
 #include "addressbook.h"
 #include "logwindow.h"
 #include "manual.h"
 #include "version.h"
 #include "selective_download.h"
-
+#include "ssl_manager.h"
+#include "sslcertwindow.h"
+#include "prefs_gtk.h"
+#include "pluginwindow.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -188,123 +189,6 @@ static void log_window_show_cb    (MainWindow     *mainwin,
 static void sel_download_cb          (MainWindow *mainwin, 
                                 guint action,
                                 GtkWidget *widget);
-static void prefs_toolbar_cb        (MainWindow *mainwin, 
-                                guint action,
-                                GtkWidget *widget);
-
-static void reply_cb                             (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_mail_cb                                  (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_all_account_mail_cb              (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void send_queue_cb                        (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void compose_mail_cb                          (MainWindow       *mainwin, 
-                                        guint action,
-                                          GtkWidget         *widget);
-
-static void compose_news_cb                          (MainWindow       *mainwin, 
-                                        guint action,
-                                          GtkWidget         *widget);
-
-static void next_unread_cb                        (MainWindow  *mainwin,
-                                         guint          action,
-                                         GtkWidget     *widget);
-
-static void toolbar_inc_cb             (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_inc_all_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_send_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_compose_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_forward_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_delete_cb          (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_exec_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                        gpointer        data);
-
-
-static void toolbar_reply_popup_cb            (GtkWidget       *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-static void toolbar_reply_popup_closed_cb      (GtkMenuShell   *menu_shell,
-                                               gpointer         data);
-
-static void toolbar_reply_to_all_popup_cb      (GtkWidget      *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-
-static void toolbar_reply_to_all_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-
-static void toolbar_reply_to_list_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
-                                        GdkEventButton *event,
-                                        gpointer        data);
-static void toolbar_reply_to_sender_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_cb    (GtkWidget      *widget,
-                                        GdkEventButton    *event,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_closed_cb            
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void activate_compose_button     (MainToolbar       *toolbar,
-                                        ToolbarStyle      style,
-                                        ComposeButtonType type);
-static void toolbar_actions_execute_cb  (GtkWidget         *widget,
-                                        gpointer           data);
-static void toolbar_buttons_cb          (GtkWidget         *widget, 
-                                        ToolbarItem       *toolbar_item);
-static void toolbar_create              (MainWindow        *mainwin,
-                                        GtkWidget         *container);
-
-static void toolbar_update              (MainWindow        *mainwin);
 
 static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -410,7 +294,9 @@ static void prev_cb          (MainWindow    *mainwin,
 static void next_cb             (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void next_unread_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void prev_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -467,10 +353,14 @@ static void prefs_account_open_cb (MainWindow     *mainwin,
 static void prefs_scoring_open_cb      (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void prefs_filtering_open_cb (MainWindow        *mainwin,
+static void prefs_filtering_open_cb    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb        (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+#endif
 static void new_account_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -478,26 +368,22 @@ static void new_account_cb         (MainWindow    *mainwin,
 static void account_menu_cb     (GtkMenuItem   *menuitem,
                                  gpointer       data);
 
+static void prefs_open_cb      (GtkMenuItem    *menuitem,
+                                gpointer        data);
+static void plugins_open_cb    (GtkMenuItem    *menuitem,
+                                gpointer        data);
+
 static void online_switch_clicked(GtkButton     *btn, 
                                  gpointer data);
 
 static void manual_open_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void faq_open_cb                 (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
 
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
                                  
-static void key_pressed (GtkWidget *widget, 
-                               GdkEventKey *event,
-                               gpointer data);
-
-static void set_toolbar_style(MainWindow *mainwin);
-
 static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
 
 static void addr_harvest_cb     ( MainWindow  *mainwin,
@@ -508,6 +394,10 @@ static void addr_harvest_msg_cb     ( MainWindow  *mainwin,
                                   guint       action,
                                   GtkWidget   *widget );
 
+static gboolean mainwindow_focus_in_event      (GtkWidget      *widget, 
+                                                GdkEventFocus  *focus,
+                                                gpointer        data);
+
 #define  SEPARATE_ACTION 500 
 
 static GtkItemFactoryEntry mainwin_entries[] =
@@ -568,6 +458,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Sort/by s_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _date"),           NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _from"),           NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+       {N_("/_View/_Sort/by _recipient"),      NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _subject"),        NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
        {N_("/_View/_Sort/by _color label"),
                                                NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
@@ -628,7 +519,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Code set/7bit ascii (US-ASC_II)"),
         CODESET_ACTION(C_US_ASCII)},
 
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Unicode (_UTF-8)"),
         CODESET_ACTION(C_UTF_8)},
        CODESET_SEPARATOR,
@@ -638,7 +529,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Code set/Western European (ISO-8859-15)"),
         CODESET_ACTION(C_ISO_8859_15)},
        CODESET_SEPARATOR,
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Central European (ISO-8859-_2)"),
         CODESET_ACTION(C_ISO_8859_2)},
        CODESET_SEPARATOR,
@@ -663,7 +554,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #endif
        {N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
         CODESET_ACTION(C_ISO_2022_JP)},
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        {N_("/_View/_Code set/Japanese (ISO-2022-JP-2)"),
         CODESET_ACTION(C_ISO_2022_JP_2)},
 #endif
@@ -671,7 +562,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
         CODESET_ACTION(C_EUC_JP)},
        {N_("/_View/_Code set/Japanese (_Shift__JIS)"),
         CODESET_ACTION(C_SHIFT_JIS)},
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        CODESET_SEPARATOR,
        {N_("/_View/_Code set/Simplified Chinese (_GB2312)"),
         CODESET_ACTION(C_GB2312)},
@@ -769,27 +660,22 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, delete_duplicated_cb,   0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
+#ifdef USE_OPENSSL
+       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tools/SSL certi_ficates..."),    
+                                               NULL, ssl_manager_open_cb, 0, NULL},
+#endif
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Log window"),             "<shift><control>L", log_window_show_cb, 0, NULL},
 
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustomize toolbar"),
-                                               NULL, NULL, 0, "<Branch>"},
-       {N_("/_Configuration/C_ustomize toolbar/_Main toolbar..."),
-                                               NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
-       {N_("/_Configuration/C_ustomize toolbar/_Compose toolbar..."),
-                                               NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
-#if 0
-       {N_("/_Configuration/_Filter setting..."),
-                                               NULL, prefs_filter_open_cb, 0, NULL},
-#endif
        {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
-       {N_("/_Configuration/_Template..."),    NULL, prefs_template_open_cb, 0, NULL},
+       {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Configuration/_Preferences for current account..."),
@@ -800,52 +686,21 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, account_edit_open, 0, NULL},
        {N_("/_Configuration/C_hange current account"),
                                                NULL, NULL, 0, "<Branch>"},
+       {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
+       {N_("/_Configuration/Preferences..."),  NULL, prefs_open_cb, 0, NULL},
+       {N_("/_Configuration/Plugins..."),      NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual/_English"),         NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_Manual/_German"),          NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_Manual/_Spanish"),         NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_Manual/_French"),          NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_Manual/_Japanese"),        NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
-       {N_("/_Help/_FAQ"),                     NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_FAQ/_English"),            NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
-       {N_("/_Help/_FAQ/_German"),             NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
-       {N_("/_Help/_FAQ/_Spanish"),            NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
-       {N_("/_Help/_FAQ/_French"),             NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
-       {N_("/_Help/_FAQ/_Italian"),            NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
+       {N_("/_Help/_Manual (Local)"),          NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_MANUAL_SYLDOC, NULL},
+       {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
+       {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
 
-
-
-static GtkItemFactoryEntry reply_popup_entries[] =
-{
-       {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
-       {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replyall_popup_entries[] =
-{
-       {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replylist_popup_entries[] =
-{
-       {N_("/Reply to list with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
-       {N_("/_Reply to list without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry replysender_popup_entries[] =
-{
-       {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
-       {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry fwd_popup_entries[] =
-{
-       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
-};
-
 MainWindow *main_window_create(SeparateType type)
 {
        MainWindow *mainwin;
@@ -898,8 +753,11 @@ MainWindow *main_window_create(SeparateType type)
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
+       gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
+                          GTK_SIGNAL_FUNC(mainwindow_focus_in_event),
+                          mainwin);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                               GTK_SIGNAL_FUNC(key_pressed), mainwin);
+                               GTK_SIGNAL_FUNC(mainwindow_key_pressed), mainwin);
 
        gtk_widget_realize(window);
        gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
@@ -919,6 +777,9 @@ MainWindow *main_window_create(SeparateType type)
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
        ifactory = gtk_item_factory_from_widget(menubar);
 
+       menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
+       menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
+
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
@@ -927,7 +788,9 @@ MainWindow *main_window_create(SeparateType type)
        mainwin->window       = window;
        
        /* create toolbar */
-       toolbar_create(mainwin, handlebox);
+       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
+                                         handlebox, 
+                                         (gpointer)mainwin);
 
        /* vbox that contains body */
        vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -989,8 +852,6 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->mainwin     = mainwin;
-
        mainwin->vbox         = vbox;
        mainwin->menubar      = menubar;
        mainwin->menu_factory = ifactory;
@@ -1042,7 +903,7 @@ MainWindow *main_window_create(SeparateType type)
        gdk_colormap_alloc_colors(colormap, color, 4, FALSE, TRUE, success);
        for (i = 0; i < 4; i++) {
                if (success[i] == FALSE)
-                       g_warning(_("MainWindow: color allocation %d failed\n"), i);
+                       g_warning("MainWindow: color allocation %d failed\n", i);
        }
 
        debug_print("done.\n");
@@ -1094,11 +955,25 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        /* create actions menu */
        update_mainwin_actions_menu(ifactory, mainwin);
 
+       /* attach accel groups to main window */
+#define        ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win)        \
+       gtk_window_add_accel_group                      \
+               (GTK_WINDOW(win),                       \
+                gtk_item_factory_from_widget(menu)->accel_group)                
+       
+       ADD_MENU_ACCEL_GROUP_TO_WINDOW(summaryview->popupmenu,mainwin->window);
+       
+       /* connect the accelerators for equivalent 
+          menu items in different menus             */
+       menu_connect_identical_items();
+
+
+       
        /* show main window */
        gtk_widget_set_uposition(mainwin->window,
                                 prefs_common.mainwin_x,
@@ -1112,7 +987,9 @@ MainWindow *main_window_create(SeparateType type)
        summary_init(summaryview);
        messageview_init(messageview);
        log_window_init(mainwin->logwin);
-
+#ifdef USE_OPENSSL
+       sslcertwindow_register_hook();
+#endif
        mainwin->lock_count = 0;
        mainwin->menu_lock_count = 0;
        mainwin->cursor_count = 0;
@@ -1160,7 +1037,7 @@ void main_window_lock(MainWindow *mainwin)
        mainwin->lock_count++;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 }
 
 void main_window_unlock(MainWindow *mainwin)
@@ -1169,7 +1046,7 @@ void main_window_unlock(MainWindow *mainwin)
                mainwin->lock_count--;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        if (mainwin->lock_count == 0)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
@@ -1202,12 +1079,13 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 
                main_window_show_cur_account(mainwin);
                main_window_set_menu_sensitive(mainwin);
-               toolbar_set_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
 
                /* pixmap themes */
                if (pixmap_theme_changed) {
-                       toolbar_update(mainwin);
-                       set_toolbar_style(mainwin);
+                       toolbar_update(TOOLBAR_MAIN, mainwin);
+                       messageview_reflect_prefs_pixmap_theme();
+                       compose_reflect_prefs_pixmap_theme();
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
 
@@ -1303,7 +1181,8 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       GtkWidget *message_wid = mainwin->messageview->vbox;
 
        debug_print("Changing window separation type from %d to %d\n",
                    mainwin->type, type);
@@ -1470,13 +1349,6 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 
        procmsg_empty_trash();
 
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               folder = list->data;
-               if (folder && folder->trash) {
-                       folderview_update_item(folder->trash, TRUE);
-               }
-       }
-
        if (mainwin->summaryview->folder_item &&
            mainwin->summaryview->folder_item->stype == F_TRASH)
                gtk_widget_grab_focus(mainwin->folderview->ctree);
@@ -1739,6 +1611,8 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_path = "/View/Sort/by date"; break;
        case SORT_BY_FROM:
                menu_path = "/View/Sort/by from"; break;
+       case SORT_BY_TO:
+               menu_path = "/View/Sort/by recipient"; break;
        case SORT_BY_SUBJECT:
                menu_path = "/View/Sort/by subject"; break;
        case SORT_BY_LABEL:
@@ -1784,51 +1658,18 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 
 void main_window_popup(MainWindow *mainwin)
 {
-       gint x, y;
-       gint sx, sy;
-       GtkWidget *widget;
-
-       gdk_window_get_origin(mainwin->window->window, &x, &y);
-       sx = gdk_screen_width();
-       sy = gdk_screen_height();
-       x %= sx; if (x < 0) x = 0;
-       y %= sy; if (y < 0) y = 0;
-       gdk_window_move(mainwin->window->window, x, y);
-       gdk_window_raise(mainwin->window->window);
-       gdk_window_show(mainwin->window->window);
-
-       debug_print("window position: x = %d, y = %d\n", x, y);
+       gtkut_window_popup(mainwin->window);
 
        switch (mainwin->type) {
        case SEPARATE_FOLDER:
-               widget = mainwin->win.sep_folder.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_folder.folderwin);
                break;
        case SEPARATE_MESSAGE:
-               widget = mainwin->win.sep_message.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_message.messagewin);
                break;
        case SEPARATE_BOTH:
-               widget = mainwin->win.sep_both.folderwin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
-               widget = mainwin->win.sep_both.messagewin;
-               gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x = 0;
-               y %= sy; if (y < 0) y = 0;
-               gdk_window_move(widget->window, x, y);
-               gdk_window_raise(widget->window);
+               gtkut_window_popup(mainwin->win.sep_both.folderwin);
+               gtkut_window_popup(mainwin->win.sep_both.messagewin);
                break;
        default:
                break;
@@ -1844,6 +1685,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *vbox_body = mainwin->vbox_body;
        GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
+       GtkItemFactory *msgview_ifactory;
 
        debug_print("Setting widgets...");
 
@@ -1986,8 +1828,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainview_width,
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(hpaned);
-               gtk_container_add(GTK_CONTAINER(messagewin),
-                                 GTK_WIDGET_PTR(mainwin->messageview));
+
+               messageview_add_toolbar(mainwin->messageview, messagewin);
+               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
+               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
 
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
@@ -2062,8 +1906,8 @@ void main_window_destroy_all(void)
                
                /* free toolbar stuff */
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
 
                g_free(mainwin->toolbar);
                g_free(mainwin);
@@ -2287,680 +2131,10 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
                summary_toggle_view(mainwin->summaryview);
 }
 
-/* Toolbar handling */
-static void toolbar_inc_cb(GtkWidget   *widget,
-                          gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_inc_all_cb(GtkWidget       *widget,
-                              gpointer  data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_all_account_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_send_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       send_queue_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_compose_cb(GtkWidget  *widget,
-                              gpointer    data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS) 
-               compose_news_cb(mainwin, 0, NULL);
-       else
-               compose_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_reply_cb(GtkWidget   *widget, 
-                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (prefs_common.default_reply_list)
-               reply_cb(mainwin, 
-                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
-                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
-                        NULL);
-       else
-               reply_cb(mainwin, 
-                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                        : COMPOSE_REPLY_WITHOUT_QUOTE,
-                        NULL);
-}
-
-static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
-                                   gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
-                                   gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
-                                      gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_forward_cb(GtkWidget       *widget,
-                              gpointer          data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (prefs_common.forward_as_attachment)
-               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
-       else
-               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
-}
-
-static void toolbar_delete_cb(GtkWidget          *widget,
-                             gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_delete(mainwin->summaryview);
-}
-
-static void toolbar_exec_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_execute(mainwin->summaryview);
-}
-
-static void toolbar_next_unread_cb(GtkWidget   *widget,
-                                  gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       next_unread_cb(mainwin, 0, NULL);
-}
-
-/* popup callback functions */
-static void toolbar_reply_popup_cb(GtkWidget       *widget, 
-                                  GdkEventButton  *event, 
-                                  gpointer         data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->reply_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->reply_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replyall_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replyall_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replysender_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       MainWindow *mainwindow = (MainWindow *) data;
-       
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->fwd_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
-                                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void activate_compose_button (MainToolbar       *toolbar,
-                                    ToolbarStyle      style,
-                                    ComposeButtonType type)
-{
-       if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
-               return;
-
-       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
-                       : toolbar->compose_news_btn);
-       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
-                       : toolbar->compose_mail_btn);
-       toolbar->compose_btn_type = type;       
-}
-
-void toolbar_set_compose_button(MainToolbar       *toolbar, 
-                               ComposeButtonType  compose_btn_type)
-{
-       if (toolbar->compose_btn_type != compose_btn_type)
-               activate_compose_button(toolbar, 
-                                       prefs_common.toolbar_style,
-                                       compose_btn_type);
-}
-
-static void toolbar_buttons_cb(GtkWidget         *widget, 
-                              ToolbarItem       *t_item)
-{
-       struct {
-               gint   index;
-               void (*func)(GtkWidget *widget, gpointer data);
-       } toolbar_action[] = {
-               { A_RECEIVE_ALL,    toolbar_inc_all_cb         },
-               { A_RECEIVE_CUR,    toolbar_inc_cb             },
-               { A_SEND_QUEUED,    toolbar_send_cb            },
-               { A_COMPOSE_EMAIL,  toolbar_compose_cb         },
-               { A_REPLY_MESSAGE,  toolbar_reply_cb           },
-               { A_REPLY_SENDER,   toolbar_reply_to_sender_cb },
-               { A_REPLY_ALL,      toolbar_reply_to_all_cb    },
-               { A_REPLY_ML,       toolbar_reply_to_list_cb   },
-               { A_FORWARD,        toolbar_forward_cb         },
-               { A_DELETE,         toolbar_delete_cb          },
-               { A_EXECUTE,        toolbar_exec_cb            },
-               { A_GOTO_NEXT,      toolbar_next_unread_cb     },
-               { A_SYL_ACTIONS,    toolbar_actions_execute_cb },
-               
-               { A_COMPOSE_NEWS,   toolbar_compose_cb         },    
-               { A_SEPARATOR,      NULL                       }};
-
-       gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
-       gint i;
-
-       for (i = A_RECEIVE_ALL; i < num_items; i++) {
-
-               if (toolbar_action[i].index == t_item->index) {
-                       MainWindow *mainwin = (MainWindow*)t_item->parent;
-                       toolbar_action[i].func(widget, mainwin);
-                       break;
-               }
-       }
-}
-
-static void toolbar_actions_execute_cb(GtkWidget *widget,
-                                      gpointer   data)
-{
-       MainWindow *mainwin = (MainWindow*)data;
-
-       toolbar_action_execute(widget, mainwin->toolbar->t_action_list, data, TOOLBAR_MAIN);
-}
-
-void toolbar_set_sensitive(MainWindow *mainwin)
-{
-       SensitiveCond state;
-       gboolean sensitive;
-       MainToolbar *toolbar = mainwin->toolbar;
-       GSList *cur;
-       GSList *entry_list = NULL;
-       
-       typedef struct _Entry Entry;
-       struct _Entry {
-               GtkWidget *widget;
-               SensitiveCond cond;
-               gboolean empty;
-       };
-
-#define SET_WIDGET_COND(w, c)     \
-{ \
-       Entry *e = g_new0(Entry, 1); \
-       e->widget = w; \
-       e->cond   = c; \
-       entry_list = g_slist_append(entry_list, e); \
-}
-
-       SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
-       SET_WIDGET_COND(toolbar->reply_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replyall_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replylist_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->replysender_btn,
-                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
-       SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
-
-       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
-       SET_WIDGET_COND(toolbar->delete_btn,
-                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
-
-       for (cur = toolbar->t_action_list; cur != NULL;  cur = cur->next) {
-               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
-               
-               SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
-       }
-
-#undef SET_WIDGET_COND
-
-       state = main_window_get_current_state(mainwin);
-
-       for (cur = entry_list; cur != NULL; cur = cur->next) {
-               Entry *e = (Entry*) cur->data;
-
-               if (e->widget != NULL) {
-                       sensitive = ((e->cond & state) == e->cond);
-                       gtk_widget_set_sensitive(e->widget, sensitive); 
-               }
-       }
-       
-       while (entry_list != NULL) {
-               Entry *e = (Entry*) entry_list->data;
-
-               if (e)
-                       g_free(e);
-               entry_list = g_slist_remove(entry_list, e);
-       }
-
-       g_slist_free(entry_list);
-
-       activate_compose_button(toolbar, 
-                               prefs_common.toolbar_style,
-                               toolbar->compose_btn_type);
-}
-
-static void toolbar_update(MainWindow *mainwin)
-{
-       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
-                            GTK_WIDGET(mainwin->toolbar->toolbar));
-       
-       mainwin->toolbar->toolbar    = NULL;
-       mainwin->toolbar->get_btn    = NULL;
-       mainwin->toolbar->getall_btn = NULL;
-       mainwin->toolbar->send_btn   = NULL;
-       mainwin->toolbar->compose_mail_btn = NULL;
-       mainwin->toolbar->compose_news_btn = NULL;
-       mainwin->toolbar->reply_btn        = NULL;      
-       mainwin->toolbar->replyall_btn     = NULL;      
-       mainwin->toolbar->replylist_btn     = NULL;     
-       mainwin->toolbar->replysender_btn  = NULL;      
-       mainwin->toolbar->fwd_btn    = NULL;    
-       mainwin->toolbar->delete_btn = NULL;    
-       mainwin->toolbar->next_btn   = NULL;    
-       mainwin->toolbar->exec_btn   = NULL;
-
-       toolbar_clear_list(TOOLBAR_MAIN);
-       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-       toolbar_create(mainwin, mainwin->handlebox);    
-       toolbar_set_sensitive(mainwin);
-
-}
-
-static void toolbar_create(MainWindow *mainwin,
-                          GtkWidget  *container)
-{
-       ToolbarItem *toolbar_item;
-
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid  = NULL;
-       GtkWidget *icon_news = NULL;
-       GtkWidget *item_news = NULL;
-       GtkWidget *item;
-       GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *t_action_item;
-       GSList *cur;
-       GSList *toolbar_list;
-
-       guint n_menu_entries;
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
-
-       toolbar_tips = gtk_tooltips_new();
-
-       if (mainwin->toolbar != NULL) {
-               toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
-               g_free(mainwin->toolbar);
-       }
-
-       toolbar_read_config_file(TOOLBAR_MAIN);
-       toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
-
-       mainwin->toolbar = g_new0(MainToolbar, 1); 
-
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
-       
-       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-       
-               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-                       continue;
-               }
-               
-               toolbar_item = g_new0(ToolbarItem, 1); 
-               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
-               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
-               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-
-               toolbar_item->parent = (gpointer)mainwin;
-
-               /* collect toolbar items in list to keep track */
-               mainwin->toolbar->t_item_list = g_slist_append(mainwin->toolbar->t_item_list, 
-                                                             toolbar_item);
-               
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, toolbar_buttons_cb, 
-                                               toolbar_item);
-               
-               switch (toolbar_item->index) {
-               case A_RECEIVE_ALL:
-                       mainwin->toolbar->getall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->getall_btn, 
-                                          _("Receive Mail on all Accounts"), NULL);
-                       break;
-               case A_RECEIVE_CUR:
-                       mainwin->toolbar->get_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->get_btn,
-                                          _("Receive Mail on current Account"), NULL);
-                       break;
-               case A_SEND_QUEUED:
-                       mainwin->toolbar->send_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->send_btn,
-                                          _("Send Queued Message(s)"), NULL);
-                       break;
-               case A_COMPOSE_EMAIL:
-                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
-                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("News"),
-                                                           (""),
-                                                           (""),
-                                                           icon_news, toolbar_buttons_cb, 
-                                                           toolbar_item);
-                       mainwin->toolbar->compose_mail_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_mail_btn,
-                                          _("Compose Email"), NULL);
-                       mainwin->toolbar->compose_news_btn = item_news;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_news_btn,
-                                          _("Compose News"), NULL);
-                       break;
-               case A_REPLY_MESSAGE:
-                       mainwin->toolbar->reply_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->reply_btn,
-                                          _("Reply to Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->reply_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(reply_popup_entries) /
-                               sizeof(reply_popup_entries[0]);
-                       reply_popup = popupmenu_create(mainwin->window, reply_popup_entries, n_menu_entries,
-                                                      "<ReplyPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
-                       mainwin->toolbar->reply_popup       = reply_popup;
-                       break;
-               case A_REPLY_SENDER:
-                       mainwin->toolbar->replysender_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replysender_btn,
-                                          _("Reply to Sender"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replysender_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replysender_popup_entries) /
-                               sizeof(replysender_popup_entries[0]);
-                       replysender_popup = popupmenu_create(mainwin->window, 
-                                                            replysender_popup_entries, n_menu_entries,
-                                                            "<ReplySenderPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replysender_popup = replysender_popup;
-                       break;
-               case A_REPLY_ALL:
-                       mainwin->toolbar->replyall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replyall_btn,
-                                          _("Reply to All"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replyall_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replyall_popup_entries) /
-                               sizeof(replyall_popup_entries[0]);
-                       replyall_popup = popupmenu_create(mainwin->window, 
-                                                         replyall_popup_entries, n_menu_entries,
-                                                         "<ReplyAllPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replyall_popup    = replyall_popup;
-                       break;
-               case A_REPLY_ML:
-                       mainwin->toolbar->replylist_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replylist_btn,
-                                          _("Reply to Mailing-list"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replylist_popup_entries) /
-                               sizeof(replylist_popup_entries[0]);
-                       replylist_popup = popupmenu_create(mainwin->window, 
-                                                         replylist_popup_entries, n_menu_entries,
-                                                         "<ReplyMlPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replylist_popup    = replylist_popup;
-                       break;
-               case A_FORWARD:
-                       mainwin->toolbar->fwd_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->fwd_btn,
-                                          _("Forward Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->fwd_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(fwd_popup_entries) /
-                               sizeof(fwd_popup_entries[0]);
-                       fwd_popup = popupmenu_create(mainwin->window, 
-                                                    fwd_popup_entries, n_menu_entries,
-                                                    "<ForwardPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
-                       mainwin->toolbar->fwd_popup         = fwd_popup;
-                       break;
-               case A_DELETE:
-                       mainwin->toolbar->delete_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->delete_btn,
-                                          _("Delete Message"), NULL);
-                       break;
-               case A_EXECUTE:
-                       mainwin->toolbar->exec_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->exec_btn,
-                                          _("Execute"), NULL);
-                       break;
-               case A_GOTO_NEXT:
-                       mainwin->toolbar->next_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->next_btn,
-                                          _("Goto Next Message"), NULL);
-                       break;
-               case A_SYL_ACTIONS:
-                       t_action_item = g_new0(ToolbarSylpheedActions, 1);
-                       t_action_item->widget = item;
-                       t_action_item->name   = g_strdup(toolbar_item->text);
-
-                       mainwin->toolbar->t_action_list = 
-                               g_slist_append(mainwin->toolbar->t_action_list,
-                                              t_action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            t_action_item->name, NULL);
-
-                       gtk_widget_show(item);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       mainwin->toolbar->toolbar = toolbar;
-
-       activate_compose_button(mainwin->toolbar, 
-                               prefs_common.toolbar_style, 
-                               mainwin->toolbar->compose_btn_type);
-
-       gtk_widget_show_all(toolbar);
-}
-
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       switch ((ToolbarStyle)action) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-
-       if (action != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-
-       mainwin->toolbar_style = (ToolbarStyle)action;
-       prefs_common.toolbar_style = (ToolbarStyle)action;
+       toolbar_toggle(action, mainwin);
 }
 
 /* END Toolbar Stuff */
@@ -2993,13 +2167,17 @@ static void separate_widget_cb(MainWindow *mainwin, guint action,
        prefs_common.sep_msg    = (type & SEPARATE_MESSAGE) != 0;
 }
 
-static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline)
 {
-       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+       if (offline)
                online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
-       } else {
-               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);           
-       }
+       else
+               online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
+}
+
+static void toggle_work_offline_cb (MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       main_window_toggle_work_offline(mainwin, GTK_CHECK_MENU_ITEM(widget)->active);
 }
 
 static void online_switch_clicked (GtkButton *btn, gpointer data) 
@@ -3051,115 +2229,11 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
        selective_download(mainwin);
 }
 
-static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
-{
-       prefs_toolbar(action);
-}
-
-
-void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       inc_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
-void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
-                                   GtkWidget *widget)
-{
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
 static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
 }
 
-void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       GList *list;
-
-       if (prefs_common.work_offline)
-               if (alertpanel(_("Offline warning"), 
-                              _("You're working offline. Override?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
-               return;
-
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               if (folder->queue) {
-                       if (procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg) < 0)
-                               alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       statusbar_pop_all();
-                       folder_item_scan(folder->queue);
-                       folderview_update_item(folder->queue, TRUE);
-               }
-       }
-}
-
-void compose_mail_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
-
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
-               if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
-                       return;
-               }
-       }
-
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
-               return;
-       }
-
-       list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
-               ac = (PrefsAccount *) cur->data;
-               if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
-                       return;
-               }
-       }
-}
-
-void compose_news_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount * ac = NULL;
-       GList * list;
-       GList * cur;
-
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
-               if (ac && ac->protocol == A_NNTP) {
-                       compose_new(ac,
-                                   mainwin->summaryview->folder_item->path,
-                                   NULL);
-                       return;
-               }
-       }
-
-       list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
-               ac = (PrefsAccount *) cur->data;
-               if (ac->protocol == A_NNTP) {
-                       compose_new(ac, NULL, NULL);
-                       return;
-               }
-       }
-}
-
-void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       summary_reply(mainwin->summaryview, (ComposeMode)action);
-}
-
 static void move_to_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_move_to(mainwin->summaryview);
@@ -3243,13 +2317,15 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 {
        const gchar *str;
 
-       str = conv_get_charset_str((CharSet)action);
-       g_free(prefs_common.force_charset);
-       prefs_common.force_charset = str ? g_strdup(str) : NULL;
-
-       summary_redisplay_msg(mainwin->summaryview);
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               str = conv_get_charset_str((CharSet)action);
+               g_free(prefs_common.force_charset);
+               prefs_common.force_charset = str ? g_strdup(str) : NULL;
 
-       debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+               summary_redisplay_msg(mainwin->summaryview);
+               
+               debug_print("forced charset: %s\n", str ? str : "Auto-Detect");
+       }
 }
 
 static void hide_read_messages (MainWindow *mainwin, guint action,
@@ -3300,7 +2376,8 @@ static void sort_summary_cb(MainWindow *mainwin, guint action,
        GtkWidget *menuitem;
 
        if (mainwin->menu_lock_count) return;
-       if (item) {
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item) {
                menuitem = gtk_item_factory_get_item
                        (mainwin->menu_factory, "/View/Sort/Ascending");
                summary_sort(mainwin->summaryview, (FolderSortKey)action,
@@ -3315,7 +2392,8 @@ static void sort_summary_type_cb(MainWindow *mainwin, guint action,
        FolderItem *item = mainwin->summaryview->folder_item;
 
        if (mainwin->menu_lock_count) return;
-       if (item)
+
+       if (GTK_CHECK_MENU_ITEM(widget)->active && item)
                summary_sort(mainwin->summaryview,
                             item->sort_key, (FolderSortType)action);
 }
@@ -3378,7 +2456,7 @@ static void prev_unread_cb(MainWindow *mainwin, guint action,
        summary_select_prev_unread(mainwin->summaryview);
 }
 
-void next_unread_cb(MainWindow *mainwin, guint action,
+static void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
@@ -3487,21 +2565,20 @@ static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
 {
        prefs_actions_open(mainwin);
 }
-
+#ifdef USE_OPENSSL
+static void ssl_manager_open_cb(MainWindow *mainwin, guint action,
+                                 GtkWidget *widget)
+{
+       ssl_manager_open(mainwin);
+}
+#endif
 static void prefs_account_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
        if (!cur_account) {
                new_account_cb(mainwin, 0, widget);
        } else {
-               gboolean prev_default = cur_account->is_default;
-
-               prefs_account_open(cur_account);
-               if (!prev_default && cur_account->is_default)
-                       account_set_as_default(cur_account);
-               account_save_config_all();
-               account_set_menu();
-               main_window_reflect_prefs_all();
+               account_open(cur_account);
        }
 }
 
@@ -3518,15 +2595,20 @@ static void account_menu_cb(GtkMenuItem *menuitem, gpointer data)
        main_window_reflect_prefs_all();
 }
 
-static void manual_open_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
-       manual_open((ManualLang)action);
+       prefs_gtk_open();
 }
 
-static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void plugins_open_cb(GtkMenuItem *menuitem, gpointer data)
+{
+       pluginwindow_create();
+}
+
+static void manual_open_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
 {
-       faq_open((ManualLang)action);
+       manual_open((ManualType)action);
 }
 
 static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
@@ -3548,10 +2630,24 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        g_free(str);
 }
 
+static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focus,
+                                         gpointer data)
+{
+       SummaryView *summary;
+
+       g_return_val_if_fail(data, FALSE);
+       summary = ((MainWindow *)data)->summaryview;
+       g_return_val_if_fail(summary, FALSE);
+       if (summary->selected != summary->displayed)
+               summary_select_node(summary, summary->displayed, FALSE, TRUE);
+       return FALSE;
+}
+
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-static void key_pressed (GtkWidget *widget, GdkEventKey *event,        gpointer data)
+void mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
 {
        MainWindow *mainwin = (MainWindow*) data;
        
@@ -3564,8 +2660,12 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
                app_exit_cb(mainwin, 0, NULL);
                return;
        case GDK_space:
-               if (mainwin->summaryview && !mainwin->summaryview->selected) 
-                       summary_select_next_unread(mainwin->summaryview);
+               if (mainwin->folderview && mainwin->summaryview
+                   && !mainwin->summaryview->displayed) {
+                       summary_lock(mainwin->summaryview);
+                       folderview_select_next_unread(mainwin->folderview);
+                       summary_unlock(mainwin->summaryview);
+               }
                break;
        default:
                break;
@@ -3574,32 +2674,6 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
 #undef BREAK_ON_MODIFIER_KEY
 
-static void set_toolbar_style(MainWindow *mainwin)
-{
-       switch (prefs_common.toolbar_style) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-               break;
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-       
-       if (prefs_common.toolbar_style != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-}
-
 /*
  * Harvest addresses for selected folder.
  */
@@ -3620,6 +2694,19 @@ static void addr_harvest_msg_cb( MainWindow *mainwin,
        summary_harvest_address( mainwin->summaryview );
 }
 
+/*!
+ *\brief       get a MainWindow
+ *
+ *\return      MainWindow * The first mainwindow in the mainwin_list
+ */
+MainWindow *mainwindow_get_mainwindow(void)
+{
+       if (mainwin_list && mainwin_list->data)
+               return (MainWindow *)(mainwin_list->data);
+       else
+               return NULL;
+}
+
 /*
 * End of Source.
 */