sync with sylpheed 0.6.0cvs4
[claws.git] / src / mainwindow.c
index 8032f6b2528961b4baa586d23f7b532e6e4c3ee5..658d28319979413a07149d3b792bb6b094d297de 100644 (file)
@@ -27,6 +27,7 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkstatusbar.h>
+#include <gtk/gtkprogressbar.h>
 #include <gtk/gtkhpaned.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtkcheckmenuitem.h>
@@ -74,7 +75,8 @@
 #include "codeconv.h"
 #include "about.h"
 #include "manual.h"
-
+#include "prefs_templates.h"
+#include "version.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -149,6 +151,8 @@ static void toolbar_account_button_pressed  (GtkWidget      *widget,
 static void ac_label_button_pressed            (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
+static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,
+                                                gpointer        data);
 
 static gint main_window_close_cb (GtkWidget    *widget,
                                  GdkEventAny   *event,
@@ -204,7 +208,9 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
+static void separate_widget_cb (GtkCheckMenuItem *checkitem,
+                                guint action,
+                                GtkWidget *widget);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -320,6 +326,16 @@ static void prev_marked_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
+static void next_labeled_cb     (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
+
+static void prev_labeled_cb     (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
+
 static void goto_folder_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -365,6 +381,10 @@ static void activate_compose_button (MainWindow *mainwin,
                                ToolbarStyle      style,
                                ComposeButtonType type);
 
+static void prefs_templates_open_cb(MainWindow *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+
 #define  SEPARATE_ACTION  667
 
 static GtkItemFactoryEntry mainwin_entries[] =
@@ -527,6 +547,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Summary/N_ext unread message"),  NULL, next_unread_cb, 0, NULL},
        {N_("/_Summary/Prev marked message"),   NULL, prev_marked_cb, 0, NULL},
        {N_("/_Summary/Next marked message"),   NULL, next_marked_cb, 0, NULL},
+       {N_("/_Summary/Prev labeled message"),  NULL, prev_labeled_cb, 0, NULL},
+       {N_("/_Summary/Next labeled message"),  NULL, next_labeled_cb, 0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Go to other folder"),   "<alt>G", goto_folder_cb, 0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
@@ -558,6 +580,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering ..."),
                                                NULL, prefs_filtering_open_cb, 0, NULL},
+       {N_("/_Configuration/_Templates ..."),
+                                               NULL, prefs_templates_open_cb, 0, NULL},
        {N_("/_Configuration/_Preferences per account..."),
                                                NULL, prefs_account_open_cb, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
@@ -586,6 +610,8 @@ MainWindow *main_window_create(SeparateType type)
        GtkWidget *vbox_body;
        GtkWidget *hbox_stat;
        GtkWidget *statusbar;
+       GtkWidget *progressbar;
+       GtkWidget *statuslabel;
        GtkWidget *ac_button;
        GtkWidget *ac_label;
 
@@ -614,8 +640,11 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+
        gtk_widget_realize(window);
 
+       gtkut_widget_set_app_icon(window);
+
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -645,6 +674,13 @@ MainWindow *main_window_create(SeparateType type)
        statusbar = statusbar_create();
        gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
 
+       progressbar = gtk_progress_bar_new();
+       gtk_widget_set_usize(progressbar, 120, 1);
+       gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
+
+       statuslabel = gtk_label_new("");
+       gtk_box_pack_start(GTK_BOX(hbox_stat), statuslabel, FALSE, FALSE, 0);
+
        ac_button = gtk_button_new();
        gtk_button_set_relief(GTK_BUTTON(ac_button), GTK_RELIEF_NONE);
        GTK_WIDGET_UNSET_FLAGS(ac_button, GTK_CAN_FOCUS);
@@ -676,15 +712,17 @@ MainWindow *main_window_create(SeparateType type)
 
        messageview->mainwin     = mainwin;
 
-       mainwin->window    = window;
-       mainwin->vbox      = vbox;
-       mainwin->menubar   = menubar;
-       mainwin->handlebox = handlebox;
-       mainwin->vbox_body = vbox_body;
-       mainwin->hbox_stat = hbox_stat;
-       mainwin->statusbar = statusbar;
-       mainwin->ac_button = ac_button;
-       mainwin->ac_label  = ac_label;
+       mainwin->window      = window;
+       mainwin->vbox        = vbox;
+       mainwin->menubar     = menubar;
+       mainwin->handlebox   = handlebox;
+       mainwin->vbox_body   = vbox_body;
+       mainwin->hbox_stat   = hbox_stat;
+       mainwin->statusbar   = statusbar;
+       mainwin->progressbar = progressbar;
+       mainwin->statuslabel = statuslabel;
+       mainwin->ac_button   = ac_button;
+       mainwin->ac_label    = ac_label;
 
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
@@ -773,21 +811,23 @@ MainWindow *main_window_create(SeparateType type)
        gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
                                           GUINT_TO_POINTER(SEPARATE_MESSAGE));
 
-       /*
+
        menu_set_sensitive(ifactory, "/Summary/Thread view",
                           prefs_common.enable_thread ? FALSE : TRUE);
        menu_set_sensitive(ifactory, "/Summary/Unthread view",
                           prefs_common.enable_thread ? TRUE : FALSE);
-       */
-       main_window_set_thread_option(mainwin);
+       
+       /*main_window_set_thread_option(mainwin);*/
 
 
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
                (ifactory, "/Configuration/Change current account");
+       gtk_signal_connect(GTK_OBJECT(ac_menu), "selection_done",
+                          GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       main_window_set_toolbar_sensitive(mainwin, FALSE);
+       main_window_set_toolbar_sensitive(mainwin);
 
        /* show main window */
        gtk_widget_set_uposition(mainwin->window,
@@ -795,6 +835,7 @@ MainWindow *main_window_create(SeparateType type)
                                 prefs_common.mainwin_y);
        gtk_widget_set_usize(window, prefs_common.mainwin_width,
                             prefs_common.mainwin_height);
+                            
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -804,6 +845,8 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
+
+       mainwin->lock_count = 0;
        mainwin->cursor_count = 0;
 
        if (!watch_cursor)
@@ -816,6 +859,7 @@ MainWindow *main_window_create(SeparateType type)
 
 void main_window_cursor_wait(MainWindow *mainwin)
 {
+
        if (mainwin->cursor_count == 0)
                gdk_window_set_cursor(mainwin->window->window, watch_cursor);
 
@@ -835,6 +879,30 @@ void main_window_cursor_normal(MainWindow *mainwin)
        gdk_flush();
 }
 
+/* lock / unlock the user-interface */
+void main_window_lock(MainWindow *mainwin)
+{
+       if (mainwin->lock_count == 0)
+               gtk_widget_set_sensitive(mainwin->ac_button, FALSE);
+
+       mainwin->lock_count++;
+
+       main_window_set_menu_sensitive(mainwin);
+       main_window_set_toolbar_sensitive(mainwin);
+}
+
+void main_window_unlock(MainWindow *mainwin)
+{
+       if (mainwin->lock_count)
+               mainwin->lock_count--;
+
+       main_window_set_menu_sensitive(mainwin);
+       main_window_set_toolbar_sensitive(mainwin);
+
+       if (mainwin->lock_count == 0)
+               gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
+}
+
 void main_window_reflect_prefs_all(void)
 {
        GList *cur;
@@ -844,13 +912,8 @@ void main_window_reflect_prefs_all(void)
                mainwin = (MainWindow *)cur->data;
 
                main_window_show_cur_account(mainwin);
-               if (cur_account) {
-                       gtk_widget_set_sensitive(mainwin->get_btn,    TRUE);
-                       gtk_widget_set_sensitive(mainwin->getall_btn, TRUE);
-               } else {
-                       gtk_widget_set_sensitive(mainwin->get_btn,    FALSE);
-                       gtk_widget_set_sensitive(mainwin->getall_btn, FALSE);
-               }
+               main_window_set_menu_sensitive(mainwin);
+               main_window_set_toolbar_sensitive(mainwin);
 
                if (prefs_common.immediate_exec)
                        gtk_widget_hide(mainwin->exec_btn);
@@ -915,10 +978,11 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
-       buf = g_strdup_printf(_("Current account: %s"), ac_name);
-       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf);
+       /* buf = g_strdup_printf(_("Current account: %s"), ac_name);
+       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf);   */
+       gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
        gtk_widget_queue_resize(mainwin->ac_button);
-       g_free(buf);
+       /* g_free(buf); */
 
        g_free(ac_name);
 }
@@ -1054,12 +1118,10 @@ void main_window_add_mailbox(MainWindow *mainwin)
                g_free(path);
                return;
        }
-
        if (!strcmp(path, "Mail"))
                folder = folder_new(F_MH, _("Mailbox"), path);
        else
                folder = folder_new(F_MH, g_basename(path), path);
-
        g_free(path);
 
        if (folder->create_tree(folder) < 0) {
@@ -1125,85 +1187,144 @@ void main_window_add_mbox(MainWindow *mainwin)
        folderview_set(mainwin->folderview);
 }
 
-void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
+typedef enum
 {
-       gtk_widget_set_sensitive(mainwin->reply_btn,       sensitive);
-       gtk_widget_set_sensitive(mainwin->replyall_btn,    sensitive);
-       gtk_widget_set_sensitive(mainwin->replysender_btn, sensitive);
-       gtk_widget_set_sensitive(mainwin->fwd_btn,         sensitive);
-       gtk_widget_set_sensitive(mainwin->exec_btn,        sensitive);
-       gtk_widget_set_sensitive(mainwin->next_btn,        sensitive);
-
-       if (!mainwin->summaryview->folder_item ||
-           mainwin->summaryview->folder_item->folder->type == F_NEWS)
-               gtk_widget_set_sensitive(mainwin->delete_btn, FALSE);
-       else
-               gtk_widget_set_sensitive(mainwin->delete_btn, sensitive);
-}
+       M_UNLOCKED            = 1 << 0,
+       M_MSG_EXIST           = 1 << 1,
+       M_TARGET_EXIST        = 1 << 2,
+       M_SINGLE_TARGET_EXIST = 1 << 3,
+       M_EXEC                = 1 << 4,
+       M_ALLOW_REEDIT        = 1 << 5,
+       M_HAVE_ACCOUNT        = 1 << 6
+} SensitiveCond;
 
-void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
+static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 {
-       GtkItemFactory *ifactory;
-       gboolean sens;
-       gboolean exec;
-
-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       SensitiveCond state = 0;
+       SummarySelection selection;
 
-       if (selection == SUMMARY_SELECTED_SINGLE)
-               sens = TRUE;
-       else
-               sens = FALSE;
-       if (!mainwin->summaryview->folder_item ||
-           mainwin->summaryview->folder_item->folder->type == F_NEWS)
-               exec = FALSE;
-       else
-               exec = TRUE;
-
-       menu_set_sensitive(ifactory, "/File/Save as...", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
-       menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
-       menu_set_sensitive(ifactory, "/Message/Forward", TRUE);
-       menu_set_sensitive(ifactory, "/Message/Forward as attachment", TRUE);
-       menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/Message/Show all header", sens);
-       menu_set_sensitive(ifactory, "/Message/View source", sens);
-       if (sens && (!mainwin->summaryview->folder_item ||
-                    mainwin->summaryview->folder_item->stype != F_DRAFT))
-               sens = FALSE;
-       menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
+       selection = summary_get_selection_type(mainwin->summaryview);
 
+       if (mainwin->lock_count == 0)
+               state |= M_UNLOCKED;
+       if (selection != SUMMARY_NONE)
+               state |= M_MSG_EXIST;
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
-               sens = TRUE;
-       else
-               sens = FALSE;
+               state |= M_TARGET_EXIST;
+       if (selection == SUMMARY_SELECTED_SINGLE)
+               state |= M_SINGLE_TARGET_EXIST;
+       if (mainwin->summaryview->folder_item &&
+           mainwin->summaryview->folder_item->folder->type != F_NEWS)
+               state |= M_EXEC;
+       if (selection == SUMMARY_SELECTED_SINGLE &&
+           (mainwin->summaryview->folder_item &&
+            mainwin->summaryview->folder_item->stype == F_DRAFT))
+               state |= M_ALLOW_REEDIT;
+       if (cur_account)
+               state |= M_HAVE_ACCOUNT;
 
-       menu_set_sensitive(ifactory, "/File/Print..."  , sens);
-       menu_set_sensitive(ifactory, "/Message/Move...", sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Copy...", sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Delete" , sens && exec);
-       menu_set_sensitive(ifactory, "/Message/Mark"   , sens);
+       return state;
+}
 
-       if (selection != SUMMARY_NONE)
-               sens = TRUE;
-       else
-               sens = FALSE;
+void main_window_set_toolbar_sensitive(MainWindow *mainwin)
+{
+       SensitiveCond state;
+        gboolean sensitive;
+       gint i;
+
+       const struct {
+               GtkWidget *widget;
+               SensitiveCond cond;
+       } entry[] = {
+               {mainwin->get_btn         , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {mainwin->getall_btn      , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
+               {mainwin->compose_news_btn, M_HAVE_ACCOUNT},
+               {mainwin->reply_btn       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->replyall_btn    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->replysender_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {mainwin->fwd_btn         , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               /* {mainwin->prefs_btn      , M_UNLOCKED},
+               {mainwin->account_btn    , M_UNLOCKED}, */
+               {mainwin->next_btn        , M_MSG_EXIST},
+               {mainwin->delete_btn      , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {mainwin->exec_btn        , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {NULL, 0}
+       };
+
+       state = main_window_get_current_state(mainwin);
+
+       for (i = 0; entry[i].widget != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               gtk_widget_set_sensitive(entry[i].widget, sensitive);
+       }
+}
 
-       menu_set_sensitive(ifactory, "/Summary/Delete duplicated messages", sens && exec);
-       menu_set_sensitive(ifactory, "/Summary/Filter messages", sens && exec);
-       menu_set_sensitive(ifactory, "/Summary/Execute", sens);
-       menu_set_sensitive(ifactory, "/Summary/Prev message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Next message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
-       menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+void main_window_set_menu_sensitive(MainWindow *mainwin)
+{
+       GtkItemFactory *ifactory;
+       SensitiveCond state;
+       gboolean sensitive;
+       gint i;
 
-       if (mainwin->summaryview->folder_item &&
-           mainwin->summaryview->folder_item->folder->account)
-               sens = mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP;
-       else
-               sens = FALSE;
-       menu_set_sensitive(ifactory, "/Message/Follow-up and reply to", sens);
+       static const struct {
+               gchar *const entry;
+               SensitiveCond cond;
+       } entry[] = {
+               {"/File/Add mailbox..."        , M_UNLOCKED},
+                {"/File/Add mbox mailbox..."   , M_UNLOCKED},
+               {"/File/Update folder tree"    , M_UNLOCKED},
+               {"/File/Folder"                , M_UNLOCKED},
+               {"/File/Import mbox file..."   , M_UNLOCKED},
+               {"/File/Export to mbox file...", M_UNLOCKED},
+               {"/File/Empty trash"           , M_UNLOCKED},
+               {"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/File/Print..."  , M_TARGET_EXIST|M_UNLOCKED},
+               {"/File/Close", M_UNLOCKED},
+               {"/File/Exit" , M_UNLOCKED},
+
+               {"/Message/Get new mail"         , M_UNLOCKED},
+               {"/Message/Get from all accounts", M_UNLOCKED},
+               {"/Message/Reply"                , M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to sender"      , M_SINGLE_TARGET_EXIST},
+                {"/Message/Follow-up and reply to", M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to all"         , M_SINGLE_TARGET_EXIST},
+               {"/Message/Forward"              , M_SINGLE_TARGET_EXIST},
+               {"/Message/Forward as attachment", M_SINGLE_TARGET_EXIST},
+               {"/Message/Open in new window"   , M_SINGLE_TARGET_EXIST},
+               {"/Message/Show all header"      , M_SINGLE_TARGET_EXIST},
+               {"/Message/View source"          , M_SINGLE_TARGET_EXIST},
+               {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Delete" , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Message/Mark"   , M_TARGET_EXIST},
+               {"/Message/Re-edit", M_ALLOW_REEDIT},
+
+               {"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Filter messages"     , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Execute"             , M_MSG_EXIST|M_UNLOCKED},
+               {"/Summary/Prev message"        , M_MSG_EXIST},
+               {"/Summary/Next message"        , M_MSG_EXIST},
+               {"/Summary/Prev marked message" , M_MSG_EXIST},
+               {"/Summary/Next marked message" , M_MSG_EXIST},
+               {"/Summary/Prev labeled message", M_MSG_EXIST},
+               {"/Summary/Next labeled message", M_MSG_EXIST},
+               {"/Summary/Next unread message" , M_MSG_EXIST},
+               {"/Summary/Sort"                , M_MSG_EXIST},
+
+               {"/Configuration", M_UNLOCKED},
+
+               {NULL, 0}
+       };
+
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+        state = main_window_get_current_state(mainwin);
+
+       for (i = 0; entry[i].entry != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
+       }
 }
 
 void main_window_popup(MainWindow *mainwin)
@@ -1899,7 +2020,12 @@ static void toolbar_account_button_pressed(GtkWidget *widget,
        if (!event) return;
        if (event->button != 3) return;
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL, NULL, NULL,
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
+                           widget);
+
+       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+                      menu_button_position, widget,
                       event->button, event->time);
 }
 
@@ -1910,10 +2036,25 @@ static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
 
        if (!event) return;
 
-       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL, NULL, NULL,
+       gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+       gtk_object_set_data(GTK_OBJECT(mainwin->ac_menu), "menu_button",
+                           widget);
+
+       gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+                      menu_button_position, widget,
                       event->button, event->time);
 }
 
+static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+       GtkWidget *button;
+
+       button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
+       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
+}
+
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
@@ -2087,7 +2228,8 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
+
 {
        MainWindow *mainwin;
        SeparateType type;
@@ -2130,7 +2272,7 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        GList *list;
 
        if (procmsg_send_queue() < 0)
-               alertpanel_error(_("Sending queued message failed."));
+               alertpanel_error(_("Some errors occurred while sending queued messages."));
 
        statusbar_pop_all();
 
@@ -2334,7 +2476,7 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
        debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
 }
 
-void main_window_set_thread_option(MainWindow *mainwin)
+/*void main_window_set_thread_option(MainWindow *mainwin)
 {
        GtkItemFactory *ifactory;
        gboolean no_item = FALSE;
@@ -2356,7 +2498,7 @@ void main_window_set_thread_option(MainWindow *mainwin)
                                           "/Summary/Thread view",   FALSE);
                        menu_set_sensitive(ifactory,
                                           "/Summary/Unthread view", TRUE);
-                       summary_thread_build(mainwin->summaryview);
+                       summary_thread_build(mainwin->summaryview, TRUE);
                }
                else {
                        menu_set_sensitive(ifactory,
@@ -2367,29 +2509,30 @@ void main_window_set_thread_option(MainWindow *mainwin)
                }
                prefs_folder_item_save_config(mainwin->summaryview->folder_item);
        }
-}
+}*/
 
 static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       mainwin->summaryview->folder_item->prefs->enable_thread =
+       /*mainwin->summaryview->folder_item->prefs->enable_thread =
                !mainwin->summaryview->folder_item->prefs->enable_thread;
        main_window_set_thread_option(mainwin);
+        */
+
+        GtkItemFactory *ifactory;
+
+       ifactory = gtk_item_factory_from_widget(widget);
 
-       /*
        if (0 == action) {
-               summary_thread_build(mainwin->summaryview);
-               mainwin->summaryview->folder_item->prefs->enable_thread =
-                       TRUE;
+               summary_thread_build(mainwin->summaryview, FALSE);
+               prefs_common.enable_thread = TRUE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
        } else {
                summary_unthread(mainwin->summaryview);
-               mainwin->summaryview->folder_item->prefs->enable_thread =
-                       FALSE;
+               prefs_common.enable_thread = FALSE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
        }
-       */
 }
 
 static void set_display_item_cb(MainWindow *mainwin, guint action,
@@ -2473,6 +2616,18 @@ static void prev_marked_cb(MainWindow *mainwin, guint action,
        summary_select_prev_marked(mainwin->summaryview);
 }
 
+static void next_labeled_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_next_labeled(mainwin->summaryview);
+}
+
+static void prev_labeled_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_prev_labeled(mainwin->summaryview);
+}
+
 static void goto_folder_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2604,3 +2759,8 @@ static void activate_compose_button (MainWindow *mainwin,
        }
 }
 
+static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
+                                   GtkWidget *widget)
+{
+       prefs_templates_open();
+}