2007-11-20 [colin] 3.1.0cvs11
[claws.git] / src / mainwindow.c
index b4ff0a88806e8fd6227f0afbc27140f9ca35c43b..eb2338063914b525fefbad2a9b878f239077495a 100644 (file)
@@ -98,6 +98,7 @@
 #include "textview.h"
 #include "imap.h"
 #include "socket.h"
+#include "printing.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -113,10 +114,10 @@ static void main_window_menu_callback_block       (MainWindow     *mainwin);
 static void main_window_menu_callback_unblock  (MainWindow     *mainwin);
 
 static void main_window_show_cur_account       (MainWindow     *mainwin);
-
+#ifndef MAEMO
 static void main_window_separation_change      (MainWindow     *mainwin,
                                                 LayoutType      layout_mode);
-
+#endif
 static void main_window_set_widgets            (MainWindow     *mainwin,
                                                 LayoutType      layout_mode);
 
@@ -126,11 +127,11 @@ static void toolbar_child_attached                (GtkWidget      *widget,
 static void toolbar_child_detached             (GtkWidget      *widget,
                                                 GtkWidget      *child,
                                                 gpointer        data);
-
+#ifndef MAEMO
 static gboolean ac_label_button_pressed                (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
-
+#endif
 static gint main_window_close_cb               (GtkWidget      *widget,
                                                 GdkEventAny    *event,
                                                 gpointer        data);
@@ -170,6 +171,12 @@ static void empty_trash_cb  (MainWindow    *mainwin,
 static void save_as_cb          (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+static void page_setup_cb       (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+#endif
+
 static void print_cb            (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -187,13 +194,17 @@ static void toggle_message_cb      (MainWindow    *mainwin,
 static void toggle_toolbar_cb   (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void toggle_col_headers_cb(MainWindow   *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+#ifndef MAEMO
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 static void set_layout_cb       (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+#endif
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
                                 GtkWidget      *widget);
@@ -267,6 +278,12 @@ static void ignore_thread_cb               (MainWindow     *mainwin,
 static void unignore_thread_cb         (MainWindow     *mainwin, 
                                         guint           action,
                                         GtkWidget      *widget);
+static void watch_thread_cb            (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void unwatch_thread_cb          (MainWindow     *mainwin, 
+                                        guint           action,
+                                        GtkWidget      *widget);
 static void lock_msgs_cb               (MainWindow     *mainwin, 
                                         guint           action,
                                         GtkWidget      *widget);
@@ -329,6 +346,9 @@ static void delete_duplicated_all_cb (MainWindow    *mainwin,
 static void filter_cb           (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void process_cb          (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void execute_summary_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -428,7 +448,7 @@ static void prefs_post_processing_open_cb (MainWindow       *mainwin,
 static void prefs_filtering_open_cb    (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-#ifdef USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void ssl_manager_open_cb        (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -441,9 +461,10 @@ static void account_selector_menu_cb        (GtkMenuItem   *menuitem,
                                          gpointer       data);
 static void account_receive_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
+#ifndef MAEMO
 static void account_compose_menu_cb     (GtkMenuItem   *menuitem,
                                          gpointer       data);
-
+#endif
 static void prefs_open_cb      (GtkMenuItem    *menuitem,
                                 gpointer        data);
 static void plugins_open_cb    (GtkMenuItem    *menuitem,
@@ -523,6 +544,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File/Empty all _Trash folders"), "<shift>D", empty_trash_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Save as..."),              "<control>S", save_as_cb, 0, NULL},
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+       {N_("/_File/Page setup..."),            NULL, page_setup_cb, 0, NULL},
+#endif
        {N_("/_File/_Print..."),                "<control>P", print_cb, 0, NULL},
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Work offline"),            "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},
@@ -543,8 +567,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Quick search"),            "slash", mainwindow_quicksearch, 0, NULL},
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de"),            NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Show or hi_de/_Message view"),
-                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
        {N_("/_View/Show or hi_de/_Toolbar"),
                                                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
@@ -555,15 +577,24 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
        {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
                                                NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
+#ifndef MAEMO
        {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
                                                NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
+#endif
+       {N_("/_View/Show or hi_de/_Message view"),
+                                               "V", toggle_message_cb, 0, "<ToggleItem>"},
+#ifndef MAEMO
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+#endif
+       {N_("/_View/Show or hi_de/Column headers"),
+                                               NULL, toggle_col_headers_cb, 0, "<ToggleItem>"},
        {N_("/_View/Set displayed _columns"),   NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Set displayed _columns/in _Folder list..."),        NULL, set_folder_display_item_cb, 0, NULL},
        {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+#ifndef MAEMO
        {N_("/_View/La_yout"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Layout/_Standard"),         NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
        {N_("/_View/Layout/_Three columns"),    NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
@@ -571,6 +602,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/Layout/S_mall screen"),     NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+#endif
        {N_("/_View/_Sort"),                    NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Sort/by _number"),         NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
        {N_("/_View/_Sort/by S_ize"),           NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
@@ -639,92 +671,91 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Character _encoding"),              NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Character _encoding/_Auto detect"),
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
-       {N_("/_View/Character _encoding/---"),          NULL, NULL, 0, "<Separator>"},
-       {N_("/_View/Character _encoding/7bit ascii (US-ASC_II)"),
+       ENC_SEPARATOR,
+
+       {N_("/_View/Character _encoding/7bit ASCII (US-ASC_II)"),
         ENC_ACTION(C_US_ASCII)},
        {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
         ENC_ACTION(C_UTF_8)},
        ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
+       {N_("/_View/Character _encoding/Western European"),NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Western European/ISO-8859-_1"),
         ENC_ACTION(C_ISO_8859_1)},
-       {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
+       {N_("/_View/Character _encoding/Western European/ISO-8859-15"),
         ENC_ACTION(C_ISO_8859_15)},
-       {N_("/_View/Character _encoding/Western European (Windows-1252)"),
+       {N_("/_View/Character _encoding/Western European/Windows-1252"),
         ENC_ACTION(C_WINDOWS_1252)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
         ENC_ACTION(C_ISO_8859_2)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
+       {N_("/_View/Character _encoding/Baltic"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Baltic/ISO-8859-13"),
         ENC_ACTION(C_ISO_8859_13)},
-       {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
+       {N_("/_View/Character _encoding/Baltic/ISO-8859-_4"),
         ENC_ACTION(C_ISO_8859_4)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
         ENC_ACTION(C_ISO_8859_7)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
+       {N_("/_View/Character _encoding/Hebrew"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Hebrew/ISO-8859-_8"),
         ENC_ACTION(C_ISO_8859_8)},
-       {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
+       {N_("/_View/Character _encoding/Hebrew/Windows-1255"),
         ENC_ACTION(C_CP1255)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
+       {N_("/_View/Character _encoding/Arabic"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Arabic/ISO-8859-_6"),
         ENC_ACTION(C_ISO_8859_6)},
-       {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
+       {N_("/_View/Character _encoding/Arabic/Windows-1256"),
         ENC_ACTION(C_CP1256)},
-       ENC_SEPARATOR,
 
        {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
         ENC_ACTION(C_ISO_8859_9)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
+       {N_("/_View/Character _encoding/Cyrillic"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Cyrillic/ISO-8859-_5"),
         ENC_ACTION(C_ISO_8859_5)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
+       {N_("/_View/Character _encoding/Cyrillic/KOI8-_R"),
         ENC_ACTION(C_KOI8_R)},
-       {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
+       {N_("/_View/Character _encoding/Cyrillic/KOI8-U"),
         ENC_ACTION(C_KOI8_U)},
-       {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
+       {N_("/_View/Character _encoding/Cyrillic/Windows-1251"),
         ENC_ACTION(C_CP1251)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
+       {N_("/_View/Character _encoding/Japanese"),     NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Japanese/ISO-2022-_JP"),
         ENC_ACTION(C_ISO_2022_JP)},
-       {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
+       {N_("/_View/Character _encoding/Japanese/ISO-2022-JP-2"),
         ENC_ACTION(C_ISO_2022_JP_2)},
-       {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
+       {N_("/_View/Character _encoding/Japanese/_EUC-JP"),
         ENC_ACTION(C_EUC_JP)},
-       {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
+       {N_("/_View/Character _encoding/Japanese/_Shift__JIS"),
         ENC_ACTION(C_SHIFT_JIS)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
+       {N_("/_View/Character _encoding/Chinese"),      NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Chinese/Simplified (_GB2312)"),
         ENC_ACTION(C_GB2312)},
-       {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
+       {N_("/_View/Character _encoding/Chinese/Simplified (GBK)"),
         ENC_ACTION(C_GBK)},
-       {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
+       {N_("/_View/Character _encoding/Chinese/Traditional (_Big5)"),
         ENC_ACTION(C_BIG5)},
-       {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
+       {N_("/_View/Character _encoding/Chinese/Traditional (EUC-_TW)"),
         ENC_ACTION(C_EUC_TW)},
-       {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
+       {N_("/_View/Character _encoding/Chinese/ISO-2022-_CN"),
         ENC_ACTION(C_ISO_2022_CN)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
+       {N_("/_View/Character _encoding/Korean"),       NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Korean/EUC-_KR"),
         ENC_ACTION(C_EUC_KR)},
-       {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
+       {N_("/_View/Character _encoding/Korean/ISO-2022-KR"),
         ENC_ACTION(C_ISO_2022_KR)},
-       ENC_SEPARATOR,
 
-       {N_("/_View/Character _encoding/Thai (TIS-620)"),
+       {N_("/_View/Character _encoding/Thai"),         NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Character _encoding/Thai/TIS-620"),
         ENC_ACTION(C_TIS_620)},
-       {N_("/_View/Character _encoding/Thai (Windows-874)"),
+       {N_("/_View/Character _encoding/Thai/Windows-874"),
         ENC_ACTION(C_WINDOWS_874)},
 
 #undef ENC_SEPARATOR
@@ -806,6 +837,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
        {N_("/_Message/_Mark/Ignore thread"),   NULL, ignore_thread_cb, 0, NULL},
        {N_("/_Message/_Mark/Unignore thread"), NULL, unignore_thread_cb, 0, NULL},
+       {N_("/_Message/_Mark/Watch thread"),    NULL, watch_thread_cb, 0, NULL},
+       {N_("/_Message/_Mark/Unwatch thread"),  NULL, unwatch_thread_cb, 0, NULL},
        {N_("/_Message/_Mark/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Mark/Mark as _spam"),   NULL, mark_as_spam_cb, 1, NULL},
        {N_("/_Message/_Mark/Mark as _ham"),    NULL, mark_as_spam_cb, 0, NULL},
@@ -831,6 +864,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, filter_cb, 0, NULL},
        {N_("/_Tools/Filter _selected messages"),
                                                NULL, filter_cb, 1, NULL},
+       {N_("/_Tools/Run folder processing rules"),
+                                               NULL, process_cb, 0, NULL},
        {N_("/_Tools/_Create filter rule"),     NULL, NULL, 0, "<Branch>"},
        {N_("/_Tools/_Create filter rule/_Automatically"),
                                                NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
@@ -864,7 +899,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, delete_duplicated_all_cb,   0, NULL},
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/E_xecute"),                "X", execute_summary_cb, 0, NULL},
-#ifdef USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/SSL cer_tificates..."),    
                                                NULL, ssl_manager_open_cb, 0, NULL},
@@ -898,7 +933,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/Plu_gins..."),     NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_Manual"),                  NULL, manual_open_cb, MANUAL_MANUAL_LOCAL, NULL},
+       {N_("/_Help/_Manual"),                  NULL, manual_open_cb, MANUAL_MANUAL_CLAWS, NULL},
        {N_("/_Help/_Online User-contributed FAQ"),     
                                                NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
        {N_("/_Help/Icon _Legend"),             NULL, legend_open_cb, 0, NULL},
@@ -1018,7 +1053,11 @@ static void mainwindow_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                        g_direct_hash,
                                        g_direct_equal,
                                        NULL, NULL);
-
+       GHashTable *menu_allsel_table = g_hash_table_new_full(
+                                       g_direct_hash,
+                                       g_direct_equal,
+                                       NULL, NULL);
+       gint sel_len;
        mainwin = (MainWindow *)data;
        g_return_if_fail(mainwin != NULL);
 
@@ -1042,34 +1081,53 @@ static void mainwindow_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item,
                                (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
                                
                        g_hash_table_insert(menu_table, GINT_TO_POINTER(id), GTK_CHECK_MENU_ITEM(cur->data));
+                       g_hash_table_insert(menu_allsel_table, GINT_TO_POINTER(id), GINT_TO_POINTER(0));
                }
        }
 
        /* iterate all messages and set the state of the appropriate
         * items */
+       sel_len = 0;
        for (; sel != NULL; sel = sel->next) {
                MsgInfo *msginfo;
                GSList *tags = NULL;
                gint id;
                GtkCheckMenuItem *item;
                msginfo = (MsgInfo *)sel->data;
+               sel_len++;
                if (msginfo) {
                        tags =  msginfo->tags;
                        if (!tags)
                                continue;
 
                        for (; tags; tags = tags->next) {
+                               gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
                                id = GPOINTER_TO_INT(tags->data);
                                item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
-                               if (item && !item->active)
+                               if (item && !item->active) {
                                        gtk_check_menu_item_set_active
                                                (item, TRUE);
+                               }
+                               num_checked++;
+                               g_hash_table_replace(menu_allsel_table, tags->data, GINT_TO_POINTER(num_checked));
                        }
                }
        }
 
+       for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+                       gint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cur->data),
+                               "tag_id"));
+                       gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, GINT_TO_POINTER(id)));
+                       if (num_checked < sel_len && num_checked > 0)
+                               gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), TRUE);
+                       else
+                               gtk_check_menu_item_set_inconsistent(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+               }
+       }
        g_slist_free(sel);
        g_hash_table_destroy(menu_table);
+       g_hash_table_destroy(menu_allsel_table);
        /* reset "dont_toggle" state */
        g_object_set_data(G_OBJECT(menu), "dont_toggle",
                          GINT_TO_POINTER(0));
@@ -1155,11 +1213,11 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
        mainwin->colorlabel_menu = menu;
 }
 
-static void mainwindow_tags_menu_item_new_tag_activate_cb(GtkWidget *widget,
+static void mainwindow_tags_menu_item_apply_tags_activate_cb(GtkWidget *widget,
                                                     gpointer data)
 {
        MainWindow *mainwin;
-       gint id;
+
        mainwin = g_object_get_data(G_OBJECT(widget), "mainwin");
        g_return_if_fail(mainwin != NULL);
 
@@ -1168,11 +1226,24 @@ static void mainwindow_tags_menu_item_new_tag_activate_cb(GtkWidget *widget,
                                "dont_toggle"))
                return;
        
-       id = prefs_tags_create_new(mainwin);
-       if (id != -1) {
-               summary_set_tag(mainwin->summaryview, id, NULL);
-               main_window_reflect_tags_changes(mainwindow_get_mainwindow());
-       }
+       tag_apply_open(summary_get_selection(mainwin->summaryview));    
+}
+
+static gint mainwin_tag_cmp_list(gconstpointer a, gconstpointer b)
+{
+       gint id_a = GPOINTER_TO_INT(a);
+       gint id_b = GPOINTER_TO_INT(b);
+       const gchar *tag_a = tags_get_tag(id_a);
+       const gchar *tag_b = tags_get_tag(id_b);
+       
+               
+       if (tag_a == NULL)
+               return tag_b == NULL ? 0:1;
+       
+       if (tag_b == NULL)
+               return tag_a == NULL ? 0:1;
+       return g_utf8_collate(tag_a, tag_b);
 }
 
 static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
@@ -1181,9 +1252,11 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
        GtkWidget *menu;
        GtkWidget *item;
        GSList *cur = tags_get_list();
-       GSList *orig = cur;
+       GSList *orig = NULL;
        gboolean existing_tags = FALSE;
 
+       cur = orig = g_slist_sort(cur, mainwin_tag_cmp_list);
+
        label_menuitem = gtk_item_factory_get_item(mainwin->menu_factory,
                                                   "/Message/Tags");
        g_signal_connect(G_OBJECT(label_menuitem), "activate",
@@ -1217,20 +1290,26 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
                gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
                gtk_widget_show(item);
        }
-       item = gtk_menu_item_new_with_label(_("New tag..."));
+
+       item = gtk_menu_item_new_with_label(_("Apply tags..."));
+       gtk_widget_add_accelerator(item, "activate", 
+                  mainwin->menu_factory->accel_group, 
+                  GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK,
+                  GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        g_signal_connect(G_OBJECT(item), "activate",
-                        G_CALLBACK(mainwindow_tags_menu_item_new_tag_activate_cb),
+                        G_CALLBACK(mainwindow_tags_menu_item_apply_tags_activate_cb),
                         NULL);
        g_object_set_data(G_OBJECT(item), "mainwin",
                          mainwin);
        gtk_widget_show(item);
+
        g_slist_free(orig);
        gtk_widget_show(menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
        mainwin->tags_menu = menu;
 }
-
+#ifndef MAEMO
 static gboolean warning_icon_pressed(GtkWidget *widget, GdkEventButton *evt,
                                    MainWindow *mainwindow)
 {
@@ -1264,7 +1343,7 @@ static gboolean warning_enter_notify(GtkWidget *widget,
        gdk_window_set_cursor(mainwindow->warning_btn->window, hand_cursor);
        return FALSE;
 }
-
+#endif
 void mainwindow_show_error(void)
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();
@@ -1276,6 +1355,65 @@ void mainwindow_clear_error(MainWindow *mainwin)
        gtk_widget_hide(mainwin->warning_btn);
 }
 
+#define BREAK_ON_MODIFIER_KEY() \
+       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+
+static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
+                                   gpointer data)
+{
+       MainWindow *mainwin = (MainWindow*) data;
+       
+       if (!mainwin || !event) 
+               return FALSE;
+
+       if (quicksearch_has_focus(mainwin->summaryview->quicksearch))
+       {
+               lastkey = event->keyval;
+               return FALSE;
+       }
+
+       switch (event->keyval) {
+       case GDK_Q:             /* Quit */
+               BREAK_ON_MODIFIER_KEY();
+
+               app_exit_cb(mainwin, 0, NULL);
+               return FALSE;
+       case GDK_space:
+               if (mainwin->folderview && mainwin->summaryview
+                   && ((!mainwin->summaryview->displayed
+                       && !mainwin->summaryview->selected) 
+                       || (mainwin->summaryview->folder_item
+                           && mainwin->summaryview->folder_item->total_msgs == 0))) {
+                       g_signal_stop_emission_by_name(G_OBJECT(widget), 
+                                       "key_press_event");
+                       folderview_select_next_unread(mainwin->folderview, TRUE);
+               }
+               break;
+#ifdef MAEMO
+       case GDK_F6:
+               if (maemo_mainwindow_is_fullscreen(widget)) {
+                       gtk_window_unfullscreen(GTK_WINDOW(widget));
+                } else {
+                       gtk_window_fullscreen(GTK_WINDOW(widget));
+                }
+               break;
+       case GDK_Escape:
+               if (mainwin->summaryview && 
+                   mainwin->summaryview->ext_messageview && 
+                   mainwin->summaryview->ext_messageview->window && 
+                   widget == mainwin->summaryview->ext_messageview->window) {
+                       messageview_destroy(mainwin->summaryview->ext_messageview);
+               }
+               break;
+#endif
+       default:
+               break;
+       }
+       return FALSE;
+}
+
+#undef BREAK_ON_MODIFIER_KEY
+
 MainWindow *main_window_create()
 {
        MainWindow *mainwin;
@@ -1284,6 +1422,7 @@ MainWindow *main_window_create()
        GtkWidget *menubar;
        GtkWidget *handlebox;
        GtkWidget *vbox_body;
+#ifndef MAEMO
        GtkWidget *hbox_stat;
        GtkWidget *statusbar;
        GtkWidget *progressbar;
@@ -1292,12 +1431,12 @@ MainWindow *main_window_create()
        GtkWidget *ac_label;
        GtkWidget *online_pixmap;
        GtkWidget *offline_pixmap;
-       GtkWidget *online_switch;
-       GtkWidget *offline_switch;
        GtkTooltips *tips;
        GtkWidget *warning_icon;
        GtkWidget *warning_btn;
-
+#endif
+       GtkWidget *online_switch;
+       GtkWidget *offline_switch;
        FolderView *folderview;
        SummaryView *summaryview;
        MessageView *messageview;
@@ -1316,10 +1455,12 @@ MainWindow *main_window_create()
        mainwin = g_new0(MainWindow, 1);
 
        /* main window */
-       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow");
+       window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
        gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-
+#ifdef MAEMO
+       prefs_common.layout_mode = SMALL_LAYOUT;
+#endif
        if (!geometry.min_height) {
                geometry.min_width = 320;
                geometry.min_height = 200;
@@ -1361,8 +1502,6 @@ MainWindow *main_window_create()
 /*     gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
        main_create_mailing_list_menu (mainwin, NULL); */
 
-       menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
-
        if (prefs_common.toolbar_detachable) {
                handlebox = gtk_handle_box_new();
                gtk_widget_show(handlebox);
@@ -1399,6 +1538,7 @@ MainWindow *main_window_create()
        gtk_container_set_border_width(GTK_CONTAINER(vbox_body), BORDER_WIDTH);
        gtk_box_pack_start(GTK_BOX(vbox), vbox_body, TRUE, TRUE, 0);
 
+#ifndef MAEMO
        hbox_stat = gtk_hbox_new(FALSE, 2);
        gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
 
@@ -1432,11 +1572,10 @@ MainWindow *main_window_create()
        statusbar = statusbar_create();
        gtk_box_pack_start(GTK_BOX(hbox_stat), statusbar, TRUE, TRUE, 0);
 
-#ifndef MAEMO
        progressbar = gtk_progress_bar_new();
        gtk_widget_set_size_request(progressbar, 120, 1);
        gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
-#endif
+
        online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
        offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
        online_switch = gtk_button_new ();
@@ -1474,7 +1613,12 @@ MainWindow *main_window_create()
 
        gtk_widget_hide(offline_switch);
        gtk_widget_hide(warning_btn);
-
+#else
+       online_switch = gtk_button_new ();
+       offline_switch = gtk_button_new ();
+       g_signal_connect (G_OBJECT(online_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
+       g_signal_connect (G_OBJECT(offline_switch), "clicked", G_CALLBACK(online_switch_clicked), mainwin);
+#endif
        /* create views */
        mainwin->folderview  = folderview  = folderview_create();
        mainwin->summaryview = summaryview = summary_create();
@@ -1516,25 +1660,23 @@ MainWindow *main_window_create()
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->statusbar   = statusbar;
        mainwin->vbox           = vbox;
        mainwin->menubar        = menubar;
        mainwin->menu_factory   = ifactory;
        mainwin->handlebox      = handlebox;
        mainwin->vbox_body      = vbox_body;
-       mainwin->hbox_stat      = hbox_stat;
-       mainwin->statusbar      = statusbar;
+       mainwin->online_switch  = online_switch;
+       mainwin->offline_switch    = offline_switch;
 #ifndef MAEMO
+       messageview->statusbar  = statusbar;
+       mainwin->statusbar      = statusbar;
+       mainwin->hbox_stat      = hbox_stat;
        mainwin->progressbar    = progressbar;
-#endif
        mainwin->statuslabel    = statuslabel;
-       mainwin->online_switch  = online_switch;
        mainwin->online_pixmap  = online_pixmap;
        mainwin->offline_pixmap = offline_pixmap;
        mainwin->ac_button      = ac_button;
        mainwin->ac_label       = ac_label;
-       mainwin->offline_switch    = offline_switch;
-       
        /* set context IDs for status bar */
        mainwin->mainwin_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Main Window");
@@ -1544,9 +1686,20 @@ MainWindow *main_window_create()
                (GTK_STATUSBAR(statusbar), "Summary View");
        mainwin->messageview_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Message View");
-
        messageview->statusbar_cid = mainwin->messageview_cid;
 
+#else
+       messageview->statusbar  = NULL;
+       mainwin->statusbar      = NULL;
+       mainwin->hbox_stat      = NULL;
+       /* mainwin->progressbar is set in toolbar.c */
+       mainwin->statuslabel    = NULL;
+       mainwin->online_pixmap  = NULL;
+       mainwin->offline_pixmap = NULL;
+       mainwin->ac_button      = NULL;
+       mainwin->ac_label       = NULL;
+#endif
+       
        /* allocate colors for summary view and folder view */
        summaryview->color_marked.red = summaryview->color_marked.green = 0;
        summaryview->color_marked.blue = (guint16)65535;
@@ -1615,12 +1768,17 @@ MainWindow *main_window_create()
        }
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
+#ifndef MAEMO
        gtk_widget_hide(mainwin->hbox_stat);
        menuitem = gtk_item_factory_get_item
                (ifactory, "/View/Show or hide/Status bar");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
-       
+#endif 
+       menuitem = gtk_item_factory_get_item
+               (ifactory, "/View/Show or hide/Column headers");
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                      prefs_common.show_col_headers);
        /* set account selection menu */
        ac_menu = gtk_item_factory_get_widget
                (ifactory, "/Configuration/Change current account");
@@ -1671,7 +1829,7 @@ MainWindow *main_window_create()
        folderview_init(folderview);
        summary_init(summaryview);
        messageview_init(messageview);
-#ifdef USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        sslcertwindow_register_hook();
 #endif
        mainwin->lock_count = 0;
@@ -1696,13 +1854,6 @@ MainWindow *main_window_create()
        return mainwin;
 }
 
-void main_window_destroy(MainWindow *mainwin)
-{
-       /* TODO : destroy other component */
-       messageview_destroy(mainwin->messageview);
-       mainwin->messageview = NULL;    
-}
-
 void main_window_update_actions_menu(MainWindow *mainwin)
 {
        GtkItemFactory *ifactory;
@@ -1739,7 +1890,7 @@ void main_window_cursor_normal(MainWindow *mainwin)
 /* lock / unlock the user-interface */
 void main_window_lock(MainWindow *mainwin)
 {
-       if (mainwin->lock_count == 0)
+       if (mainwin->lock_count == 0 && mainwin->ac_button)
                gtk_widget_set_sensitive(mainwin->ac_button, FALSE);
 
        mainwin->lock_count++;
@@ -1756,7 +1907,7 @@ void main_window_unlock(MainWindow *mainwin)
        main_window_set_menu_sensitive(mainwin);
        toolbar_main_set_sensitive(mainwin);
 
-       if (mainwin->lock_count == 0)
+       if (mainwin->lock_count == 0 && mainwin->ac_button)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
 }
 
@@ -1783,8 +1934,9 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
        gboolean pixmap_theme_changed = GPOINTER_TO_INT(data);
        GList *cur;
        MainWindow *mainwin;
+#ifndef MAEMO
        GtkWidget *pixmap;
-
+#endif
        for (cur = mainwin_list; cur != NULL; cur = cur->next) {
                mainwin = (MainWindow *)cur->data;
 
@@ -1799,7 +1951,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                        compose_reflect_prefs_pixmap_theme();
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
-
+#ifndef MAEMO
                        pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_ONLINE);
                        gtk_container_remove(GTK_CONTAINER(mainwin->online_switch), 
                                             mainwin->online_pixmap);
@@ -1812,6 +1964,7 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                        gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
                        gtk_widget_show(pixmap);
                        mainwin->offline_pixmap = pixmap;
+#endif
                }
                
                headerview_set_font(mainwin->messageview->headerview);
@@ -1820,7 +1973,16 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
                textview_reflect_prefs(mainwin->messageview->mimeview->textview);
                folderview_reflect_prefs();
                summary_reflect_prefs();
+#ifndef MAEMO
                summary_redisplay_msg(mainwin->summaryview);
+#endif
+               if (prefs_common.layout_mode == SMALL_LAYOUT) {
+                       if (mainwin->in_folder) {
+                               mainwindow_enter_folder(mainwin);
+                       } else {
+                               mainwindow_exit_folder(mainwin);
+                       }
+               }
        }
        prefs_tag = 0;
        return FALSE;
@@ -2028,24 +2190,6 @@ static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
                                 ac_prefs);
        }
        gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_mail_btn), menu);
-       menu = gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_news_btn));
-       if (menu)
-               gtk_widget_destroy(menu);
-       menu = gtk_menu_new();
-
-       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
-               ac_prefs = (PrefsAccount *)cur_ac->data;
-
-               menuitem = gtk_menu_item_new_with_label
-                       (ac_prefs->account_name
-                        ? ac_prefs->account_name : _("Untitled"));
-               gtk_widget_show(menuitem);
-               gtk_menu_append(GTK_MENU(menu), menuitem);
-               g_signal_connect(G_OBJECT(menuitem), "activate",
-                                G_CALLBACK(account_compose_menu_cb),
-                                ac_prefs);
-       }
-       gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_news_btn), menu);
 #endif
 }
 
@@ -2094,11 +2238,12 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        g_free(buf);
 
        gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
-       gtk_widget_queue_resize(mainwin->ac_button);
+       if (mainwin->ac_button)
+               gtk_widget_queue_resize(mainwin->ac_button);
 
        g_free(ac_name);
 }
-
+#ifndef MAEMO
 static void main_window_separation_change(MainWindow *mainwin, LayoutType layout_mode)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
@@ -2130,7 +2275,7 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
        gtk_widget_unref(summary_wid);
        gtk_widget_unref(message_wid);
 }
-
+#endif
 void mainwindow_reset_paned(GtkPaned *paned)
 {
                gint min, max, mid;
@@ -2320,16 +2465,6 @@ void main_window_progress_off(MainWindow *mainwin)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
 }
 
-void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
-{
-       gchar buf[32];
-
-       g_snprintf(buf, sizeof(buf), "%d / %d", cur, total);
-       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), buf);
-       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar),
-                               (total == 0) ? 0 : (gfloat)cur / (gfloat)total);
-}
-
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 {
        if (confirm && procmsg_have_trashed_mails_fast()) {
@@ -2348,7 +2483,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
                gtk_widget_grab_focus(mainwin->folderview->ctree);
 }
 
-void main_window_add_mailbox(MainWindow *mainwin)
+static void main_window_add_mailbox(MainWindow *mainwin)
 {
        gchar *path;
        Folder *folder;
@@ -2392,7 +2527,7 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        
        selection = summary_get_selection_type(mainwin->summaryview);
 
-       if (mainwin->lock_count == 0)
+       if (mainwin->lock_count == 0 && !claws_is_starting())
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
@@ -2446,6 +2581,9 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
        if (any_folder_want_synchronise())
                state |= M_WANT_SYNC;
 
+       if (item && item->prefs->processing && selection != SUMMARY_NONE)
+               state |= M_HAVE_PROCESSING;
+
        for ( ; account_list != NULL; account_list = account_list->next) {
                if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
                        state |= M_HAVE_NEWS_ACCOUNT;
@@ -2528,6 +2666,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Receive/Cancel receiving"
                                                 , M_INC_ACTIVE},
                {"/Message/Send queued messages"  , M_HAVE_ACCOUNT|M_HAVE_QUEUED_MAILS},
+               {"/Message/Compose an email message", M_HAVE_ACCOUNT},
                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Reply to"              , M_HAVE_ACCOUNT|M_TARGET_EXIST},
@@ -2557,6 +2696,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                                                       , M_TARGET_EXIST},
                {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC},
                {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC},
+               {"/Tools/Run folder processing rules"  , M_HAVE_PROCESSING},
                {"/Tools/Create filter rule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/Tools/Create processing rule"       , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/Tools/List URLs..."                 , M_TARGET_EXIST},
@@ -2769,14 +2909,14 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
                for (url_pt = list_header; url_pt && *url_pt;) {
                        get_url_part (&url_pt, url_decoded, BUFFSIZE);
                        item = NULL;
-                       if (!g_strncasecmp(url_decoded, "mailto:", 7)) {
+                       if (!g_ascii_strncasecmp(url_decoded, "mailto:", 7)) {
                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",
                                                 G_CALLBACK(mailing_list_compose),
                                                 NULL);
                        }
-                       else if (!g_strncasecmp (url_decoded, "http:", 5) ||
-                                !g_strncasecmp (url_decoded, "https:",6)) {
+                       else if (!g_ascii_strncasecmp(url_decoded, "http:", 5) ||
+                                !g_ascii_strncasecmp(url_decoded, "https:",6)) {
 
                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",
@@ -2952,9 +3092,10 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                                    prefs_common.msgview_height);
        }
 
+#ifndef MAEMO
        mainwin->messageview->statusbar = mainwin->statusbar;
        mainwin->messageview->statusbar_cid = mainwin->messageview_cid;
-
+#endif
        /* clean top-most container */
        if (mainwin->hpaned) {
                if (mainwin->hpaned->parent == mainwin->vpaned)
@@ -3098,7 +3239,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
        if (!noticeview_is_visible(mainwin->messageview->mimeview->siginfoview)) 
                gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->mimeview->siginfoview));
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mainwin->messageview->mimeview->mime_toggle)))
+       if (mainwin->messageview->mimeview->ctree_mode)
                gtk_widget_hide(mainwin->messageview->mimeview->icon_mainbox);
        else 
                gtk_widget_hide(mainwin->messageview->mimeview->ctree_mainbox);
@@ -3117,6 +3258,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
 }
 
+#ifndef MAEMO
        switch (prefs_common.layout_mode) {
        case NORMAL_LAYOUT:
                SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
@@ -3134,6 +3276,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
                break;
        }
+#endif
 #undef SET_CHECK_MENU_ACTIVE
 
        if (folderwin) {
@@ -3186,7 +3329,7 @@ static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
 {
        gtk_widget_set_size_request(child, -1, -1);
 }
-
+#ifndef MAEMO
 static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    gpointer data)
 {
@@ -3204,7 +3347,7 @@ static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event
 
        return TRUE;
 }
-
+#endif
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
@@ -3307,6 +3450,19 @@ static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_print(mainwin->summaryview);
 }
 
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
+static void page_setup_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       MainWindow *mainwindow;
+       GtkWindow *win;
+
+       mainwindow = mainwindow_get_mainwindow();
+       win = (mainwindow ? GTK_WINDOW(mainwindow->window) : NULL);
+
+       printing_page_setup(win);
+}
+#endif
+
 static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (prefs_common.confirm_on_exit) {
@@ -3364,7 +3520,24 @@ static void main_window_reply_cb(MainWindow *mainwin, guint action,
        g_slist_free(msginfo_list);
 }
 
+static void toggle_col_headers_cb(MainWindow *mainwin, guint action,
+                               GtkWidget *widget)
+{
+       FolderView *folderview = mainwin->folderview;
+       SummaryView *summaryview = mainwin->summaryview;
 
+       if (GTK_CHECK_MENU_ITEM(widget)->active) {
+               gtk_clist_column_titles_show(GTK_CLIST(folderview->ctree));
+               gtk_clist_column_titles_show(GTK_CLIST(summaryview->ctree));
+               prefs_common.show_col_headers = TRUE;
+       } else {
+               gtk_clist_column_titles_hide(GTK_CLIST(folderview->ctree));
+               gtk_clist_column_titles_hide(GTK_CLIST(summaryview->ctree));
+               prefs_common.show_col_headers = FALSE;
+       }
+}
+
+#ifndef MAEMO
 static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
@@ -3410,6 +3583,7 @@ static void set_layout_cb(MainWindow *mainwin, guint action,
        summary_relayout(mainwin->summaryview); 
        summary_update_unread(mainwin->summaryview, NULL);
 }
+#endif
 
 void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,
                                        gboolean ask_sync)
@@ -3472,8 +3646,10 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
        g_return_if_fail(menuitem != NULL);
        
        if (btn == GTK_BUTTON(mainwin->online_switch)) {
+#ifndef MAEMO
                gtk_widget_hide (mainwin->online_switch);
                gtk_widget_show (mainwin->offline_switch);
+#endif
                menuitem->active = TRUE;
                inc_autocheck_timer_remove();
                        
@@ -3488,8 +3664,10 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                /*go online */
                if (!prefs_common.work_offline)
                        return;
+#ifndef MAEMO
                gtk_widget_hide (mainwin->offline_switch);
                gtk_widget_show (mainwin->online_switch);
+#endif
                menuitem->active = FALSE;
                prefs_common.work_offline = FALSE;
                inc_autocheck_timer_set();
@@ -3642,6 +3820,18 @@ static void unignore_thread_cb(MainWindow *mainwin, guint action,
        summary_unignore_thread(mainwin->summaryview);
 }
 
+static void watch_thread_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_watch_thread(mainwin->summaryview);
+}
+
+static void unwatch_thread_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_unwatch_thread(mainwin->summaryview);
+}
+
 static void lock_msgs_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
@@ -3846,6 +4036,16 @@ static void filter_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_filter(mainwin->summaryview, (gboolean)action);
 }
 
+static void process_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+       FolderItem *item = mainwin->summaryview->folder_item;   
+       g_return_if_fail(item != NULL);
+
+       item->processing_pending = TRUE;
+       folder_item_apply_processing(item);     
+       item->processing_pending = FALSE;
+}
+
 static void execute_summary_cb(MainWindow *mainwin, guint action,
                               GtkWidget *widget)
 {
@@ -4038,9 +4238,10 @@ static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
 static void prefs_tags_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
-       prefs_tags_open(mainwin);
+       GSList * list = summary_get_selected_msg_list(mainwin->summaryview);
+       tag_apply_open(list);
 }
-#ifdef USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void ssl_manager_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
@@ -4092,16 +4293,14 @@ static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
 
        inc_account_mail(mainwin, account);
 }
-
+#ifndef MAEMO
 static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
-       MainWindow *mainwin = (MainWindow *)mainwin_list->data;
        PrefsAccount *account = (PrefsAccount *)data;
-       FolderItem *item = mainwin->summaryview->folder_item;   
 
-       compose_new_with_folderitem(account, item, NULL);
+       compose_new_with_folderitem(account, NULL, NULL);
 }
-
+#endif
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
        prefs_gtk_open();
@@ -4188,57 +4387,6 @@ gboolean mainwindow_is_obscured(void)
        return is_obscured;
 }
 
-#define BREAK_ON_MODIFIER_KEY() \
-       if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-
-gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
-                                   gpointer data)
-{
-       MainWindow *mainwin = (MainWindow*) data;
-       
-       if (!mainwin || !event) 
-               return FALSE;
-
-       if (quicksearch_has_focus(mainwin->summaryview->quicksearch))
-       {
-               lastkey = event->keyval;
-               return FALSE;
-       }
-
-       switch (event->keyval) {
-       case GDK_Q:             /* Quit */
-               BREAK_ON_MODIFIER_KEY();
-
-               app_exit_cb(mainwin, 0, NULL);
-               return FALSE;
-       case GDK_space:
-               if (mainwin->folderview && mainwin->summaryview
-                   && ((!mainwin->summaryview->displayed
-                       && !mainwin->summaryview->selected) 
-                       || (mainwin->summaryview->folder_item
-                           && mainwin->summaryview->folder_item->total_msgs == 0))) {
-                       g_signal_stop_emission_by_name(G_OBJECT(widget), 
-                                       "key_press_event");
-                       folderview_select_next_unread(mainwin->folderview, TRUE);
-               }
-               break;
-#ifdef MAEMO
-       case GDK_F6:
-               if (maemo_mainwindow_is_fullscreen(widget)) {
-                       gtk_window_unfullscreen(GTK_WINDOW(widget));
-                } else {
-                       gtk_window_fullscreen(GTK_WINDOW(widget));
-                }
-               break;
-#endif
-       default:
-               break;
-       }
-       return FALSE;
-}
-
-#undef BREAK_ON_MODIFIER_KEY
-
 /*
  * Harvest addresses for selected folder.
  */
@@ -4315,7 +4463,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                return;
                
        if (!mainwin) {
-               printf("not initialized\n");
+               g_print("not initialized\n");
                return;
        }
 
@@ -4327,7 +4475,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                *p = '\0';
 
        if ((item = folder_find_item_from_identifier(tmp))) {
-               printf("selecting folder '%s'\n", tmp);
+               g_print("selecting folder '%s'\n", tmp);
                folderview_select(mainwin->folderview, item);
                if (popup)
                        main_window_popup(mainwin);
@@ -4339,13 +4487,13 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
        if (msg) {
                *msg++ = '\0';
                if ((item = folder_find_item_from_identifier(tmp))) {
-                       printf("selecting folder '%s'\n", tmp);
+                       g_print("selecting folder '%s'\n", tmp);
                        folderview_select(mainwin->folderview, item);
                } else {
-                       printf("'%s' not found\n", tmp);
+                       g_print("'%s' not found\n", tmp);
                }
                if (item && msg && atoi(msg)) {
-                       printf("selecting message %d\n", atoi(msg));
+                       g_print("selecting message %d\n", atoi(msg));
                        summary_select_by_msgnum(mainwin->summaryview, atoi(msg));
                        summary_display_msg_selected(mainwin->summaryview, FALSE);
                        if (popup)
@@ -4358,7 +4506,7 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                        msg[strlen(msg)-1] = '\0';
                        msginfo = folder_item_get_msginfo_by_msgid(item, msg);
                        if (msginfo) {
-                               printf("selecting message %s\n", msg);
+                               g_print("selecting message %s\n", msg);
                                summary_select_by_msgnum(mainwin->summaryview, msginfo->msgnum);
                                summary_display_msg_selected(mainwin->summaryview, FALSE);
                                if (popup)
@@ -4367,13 +4515,13 @@ void mainwindow_jump_to(const gchar *target, gboolean popup)
                                procmsg_msginfo_free(msginfo);
                                return;
                        } else {
-                               printf("'%s' not found\n", msg);
+                               g_print("'%s' not found\n", msg);
                        }
                } else {
-                       printf("'%s' not found\n", msg);
+                       g_print("'%s' not found\n", msg);
                }
        } else {
-               printf("'%s' not found\n", tmp);
+               g_print("'%s' not found\n", tmp);
        }
        
        g_free(tmp);