Internal API change: split read/unread marking features from functions used
[claws.git] / src / toolbar.c
index 0f797808512fd313f6d29c84057157b18b6c694a..b48b804f2608c0074d73137decda561881264184 100644 (file)
@@ -60,7 +60,7 @@
 #include "imap.h"
 #include "account.h"
 #include "send_message.h"
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        #include "addressbook.h"
 #else
        #include "addressbook-dbus.h"
@@ -139,6 +139,30 @@ static void toolbar_ignore_thread_cb               (GtkWidget      *widget,
 static void toolbar_watch_thread_cb            (GtkWidget      *widget,
                                                 gpointer        data);
 
+static void toolbar_mark_cb            (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_unmark_cb          (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_lock_cb            (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_ulock_cb           (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_all_read_cb                (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_all_unread_cb              (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_read_cb            (GtkWidget      *widget,
+                                                gpointer        data);
+
+static void toolbar_unread_cb          (GtkWidget      *widget,
+                                                gpointer        data);
+
 static void toolbar_print_cb                   (GtkWidget      *widget,
                                                 gpointer        data);
 
@@ -205,15 +229,25 @@ struct {
        { "A_EXECUTE",          N_("Execute")                              },
        { "A_GOTO_PREV",        N_("Go to Previous Unread Message")        },
        { "A_GOTO_NEXT",        N_("Go to Next Unread Message")            },
+
        { "A_IGNORE_THREAD",    N_("Ignore thread")                        },
        { "A_WATCH_THREAD",     N_("Watch thread")                         },
+       { "A_MARK",                     N_("Mark Message")                         },
+       { "A_UNMARK",                   N_("Unmark Message")                         },
+       { "A_LOCK",                     N_("Lock Message")                         },
+       { "A_UNLOCK",                   N_("Unlock Message")                         },
+       { "A_ALL_READ",                 N_("Mark all Messages as read")            },
+       { "A_ALL_UNREAD",               N_("Mark all Messages as unread")          },
+       { "A_READ",                     N_("Mark Message as read")                 },
+       { "A_UNREAD",                   N_("Mark Message as unread")               },
+
        { "A_PRINT",            N_("Print")                                },
        { "A_LEARN_SPAM",       N_("Learn Spam or Ham")                    },
        { "A_GO_FOLDERS",       N_("Open folder/Go to folder list")        },
        { "A_PREFERENCES",      N_("Preferences")                          },
 
        { "A_SEND",             N_("Send Message")                         },
-       { "A_SENDL",            N_("Put into queue folder and send later") },
+       { "A_SEND_LATER",       N_("Put into queue folder and send later") },
        { "A_DRAFT",            N_("Save to draft folder")                 },
        { "A_INSERT",           N_("Insert file")                          },   
        { "A_ATTACH",           N_("Attach file")                          },
@@ -313,11 +347,14 @@ GList *toolbar_get_action_items(ToolbarType source)
        gint i = 0;
        
        if (source == TOOLBAR_MAIN) {
-               gint main_items[] = { A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
-                                       A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, 
-                                       A_REPLY_ALL,     A_REPLY_ML,      A_OPEN_MAIL,     A_FORWARD, 
-                                       A_TRASH,         A_DELETE_REAL,   A_EXECUTE,       A_GOTO_PREV, 
-                                       A_GOTO_NEXT,     A_IGNORE_THREAD, A_WATCH_THREAD,  A_PRINT,
+               gint main_items[] = {
+                                       A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
+                                       A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+                                       A_REPLY_ALL,     A_REPLY_ML,      A_OPEN_MAIL,     A_FORWARD,
+                                       A_TRASH,         A_DELETE_REAL,   A_EXECUTE,       A_GOTO_PREV,
+                                       A_GOTO_NEXT,     A_IGNORE_THREAD, A_WATCH_THREAD,  A_MARK,
+                                       A_UNMARK,        A_LOCK,          A_UNLOCK,        A_ALL_READ,
+                                       A_ALL_UNREAD,    A_READ,          A_UNREAD,          A_PRINT,
                                        A_ADDRBOOK,      A_LEARN_SPAM,    A_GO_FOLDERS, 
                                        A_CANCEL_INC,    A_CANCEL_SEND,   A_CANCEL_ALL,    A_PREFERENCES };
 
@@ -326,23 +363,25 @@ GList *toolbar_get_action_items(ToolbarType source)
                }       
        }
        else if (source == TOOLBAR_COMPOSE) {
-               gint comp_items[] =   { A_SEND,          A_SENDL,        A_DRAFT,
+               gint comp_items[] =   {
+                                       A_SEND,          A_SEND_LATER,   A_DRAFT,
                                        A_INSERT,        A_ATTACH,       A_SIG,
-                                       A_REP_SIG,       A_EXTEDITOR,    A_LINEWRAP_CURRENT,     
+                                       A_REP_SIG,       A_EXTEDITOR,    A_LINEWRAP_CURRENT,
                                        A_LINEWRAP_ALL,  A_ADDRBOOK,
 #ifdef USE_ENCHANT
-                                       A_CHECK_SPELLING, 
+                                       A_CHECK_SPELLING,
 #endif
-                                       A_CLOSE };      
+                                       A_CLOSE };
 
                for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++) 
                        items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr));
        }
        else if (source == TOOLBAR_MSGVIEW) {
-               gint msgv_items[] =   { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
-                                       A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,
-                                       A_TRASH, A_DELETE_REAL,       A_GOTO_PREV,        A_GOTO_NEXT,
-                                       A_ADDRBOOK,      A_LEARN_SPAM, A_CLOSE };       
+               gint msgv_items[] =   {
+                                       A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
+                                       A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,
+                                       A_TRASH,         A_DELETE_REAL,   A_GOTO_PREV,      A_GOTO_NEXT,
+                                       A_ADDRBOOK,      A_LEARN_SPAM,    A_CLOSE };
 
                for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++) 
                        items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
@@ -418,11 +457,19 @@ const gchar *toolbar_get_short_text(int action) {
        case A_GOTO_NEXT:       return _("Next");
        case A_IGNORE_THREAD:   return _("Ignore thread");
        case A_WATCH_THREAD:    return _("Watch thread");
+       case A_MARK:            return _("Mark");
+       case A_UNMARK:          return _("Unmark");
+       case A_LOCK:            return _("Lock");
+       case A_UNLOCK:          return _("Unlock");
+       case A_ALL_READ:        return _("All read");
+       case A_ALL_UNREAD:      return _("All unread");
+       case A_READ:            return _("Read");
+       case A_UNREAD:          return _("Unread");
        case A_PRINT:           return _("Print");
        case A_CLOSE:           return _("Close");
        case A_PREFERENCES:     return _("Preferences");
        case A_SEND:            return _("Send");
-       case A_SENDL:           return _("Send later");
+       case A_SEND_LATER:      return _("Send later");
        case A_DRAFT:           return _("Draft");
        case A_INSERT:          return _("Insert");
        case A_ATTACH:          return _("Attach");
@@ -462,13 +509,21 @@ gint toolbar_get_icon(int action) {
        case A_LEARN_SPAM:      return STOCK_PIXMAP_SPAM_BTN;
        case A_GOTO_PREV:       return STOCK_PIXMAP_UP_ARROW;
        case A_GOTO_NEXT:       return STOCK_PIXMAP_DOWN_ARROW;
-       case A_IGNORE_THREAD:   return STOCK_PIXMAP_IGNORETHREAD;
-       case A_WATCH_THREAD:    return STOCK_PIXMAP_WATCHTHREAD;
+       case A_IGNORE_THREAD:   return STOCK_PIXMAP_MARK_IGNORETHREAD;
+       case A_WATCH_THREAD:    return STOCK_PIXMAP_MARK_WATCHTHREAD;
+       case A_MARK:            return STOCK_PIXMAP_MARK_MARK;
+       case A_UNMARK:          return STOCK_PIXMAP_MARK_UNMARK;
+       case A_LOCK:            return STOCK_PIXMAP_MARK_LOCKED;
+       case A_UNLOCK:          return STOCK_PIXMAP_MARK_UNLOCKED;
+       case A_ALL_READ:        return STOCK_PIXMAP_MARK_ALLREAD;
+       case A_ALL_UNREAD:      return STOCK_PIXMAP_MARK_ALLUNREAD;
+       case A_READ:            return STOCK_PIXMAP_MARK_READ;
+       case A_UNREAD:          return STOCK_PIXMAP_MARK_UNREAD;
        case A_PRINT:           return STOCK_PIXMAP_PRINTER;
        case A_CLOSE:           return STOCK_PIXMAP_CLOSE;
        case A_PREFERENCES:     return STOCK_PIXMAP_PREFERENCES;
        case A_SEND:            return STOCK_PIXMAP_MAIL_SEND;
-       case A_SENDL:           return STOCK_PIXMAP_MAIL_SEND_QUEUE;
+       case A_SEND_LATER:      return STOCK_PIXMAP_MAIL_SEND_QUEUE;
        case A_DRAFT:           return STOCK_PIXMAP_MAIL;
        case A_INSERT:          return STOCK_PIXMAP_INSERT_FILE;
        case A_ATTACH:          return STOCK_PIXMAP_MAIL_ATTACH;
@@ -559,7 +614,7 @@ static void toolbar_set_default_compose(void)
                { A_SEPARATOR}, 
 #endif
                { A_SEND},
-               { A_SENDL},
+               { A_SEND_LATER},
                { A_DRAFT},
                { A_SEPARATOR}, 
 #ifndef GENERIC_UMPC
@@ -704,7 +759,7 @@ void toolbar_save_config_file(ToolbarType source)
        
                g_free( fileSpec );
                if (prefs_file_close (pfile) < 0 ) 
-                       g_warning("failed to write toolbar configuration to file\n");
+                       g_warning("failed to write toolbar configuration to file");
                return;
                
 fail:
@@ -712,7 +767,7 @@ fail:
                g_free( fileSpec );
                prefs_file_close_revert (pfile);
        } else
-               g_warning("failed to open toolbar configuration file for writing\n");
+               g_warning("failed to open toolbar configuration file for writing");
 }
 
 void toolbar_read_config_file(ToolbarType source)
@@ -770,7 +825,7 @@ void toolbar_read_config_file(ToolbarType source)
                else if (source == TOOLBAR_MSGVIEW) 
                        toolbar_set_default(TOOLBAR_MSGVIEW);
                else {          
-                       g_warning("refusing to write unknown Toolbar Configuration number %d\n", source);
+                       g_warning("refusing to write unknown Toolbar Configuration number %d", source);
                        return;
                }
 
@@ -874,35 +929,18 @@ gboolean toolbar_check_action_btns(ToolbarType type)
        return modified;
 }
 
-#if !(GTK_CHECK_VERSION(2,12,0))
-#define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
-       gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(widget), GTK_TOOLTIPS(toolbar_tips),    \
-                       tip, NULL);                                                             \
-}
-#else
 #define CLAWS_SET_TOOL_ITEM_TIP(widget,tip) { \
        gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(widget), tip);                             \
 }
-#endif 
 
-#if !(GTK_CHECK_VERSION(2,12,0))
-#define CLAWS_SET_ARROW_TIP(widget,tip) { \
-       gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(widget), GTK_TOOLTIPS(toolbar_tips),        \
-                       tip, NULL);                                                             \
-}
-#else
 #define CLAWS_SET_ARROW_TIP(widget,tip) { \
        gtk_menu_tool_button_set_arrow_tooltip_text(GTK_MENU_TOOL_BUTTON(widget), tip);                         \
 }
-#endif 
 
 static void activate_compose_button (Toolbar           *toolbar,
                                     ToolbarStyle      style,
                                     ComposeButtonType type)
 {
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *toolbar_tips = toolbar->tooltips;
-#endif
        if ((!toolbar->compose_mail_btn))
                return;
 
@@ -939,9 +977,6 @@ static void activate_learn_button (Toolbar           *toolbar,
                                     ToolbarStyle      style,
                                     LearnButtonType type)
 {
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *toolbar_tips = toolbar->tooltips;
-#endif
        if ((!toolbar->learn_spam_btn))
                return;
 
@@ -1331,7 +1366,7 @@ static void toolbar_addrbook_cb(GtkWidget *widget, gpointer data)
        default:
                return;
        }
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
        addressbook_open(compose);
 #else
        GError* error = NULL;
@@ -1491,6 +1526,182 @@ static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void toolbar_mark_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_mark(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_unmark_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_unmark(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_lock_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_msgs_lock(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_unlock_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_msgs_unlock(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_all_read_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_mark_all_read(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_all_unread_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_mark_all_unread(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_read_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_mark_as_read(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
+static void toolbar_unread_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+
+       cm_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow *) toolbar_item->parent;
+               summary_mark_as_unread(mainwin->summaryview);
+               break;
+       case TOOLBAR_MSGVIEW:
+               /* TODO: see toolbar_next_unread_cb() if you need
+                * this in the message view */
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+               break;
+       }
+}
+
 static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
@@ -1543,7 +1754,7 @@ static void toolbar_send_cb(GtkWidget *widget, gpointer data)
 
 static void toolbar_send_later_cb(GtkWidget *widget, gpointer data)
 {
-       compose_toolbar_cb(A_SENDL, data);
+       compose_toolbar_cb(A_SEND_LATER, data);
 }
 
 static void toolbar_draft_cb(GtkWidget *widget, gpointer data)
@@ -1715,7 +1926,7 @@ static void toolbar_go_folders_cb(GtkWidget *widget, gpointer data)
                mainwin = (MainWindow*)toolbar_item->parent;
                break;
        default:
-               g_warning("wrong toolbar type\n");
+               g_warning("wrong toolbar type");
                return;
        }
 
@@ -1725,7 +1936,7 @@ static void toolbar_go_folders_cb(GtkWidget *widget, gpointer data)
                        folderview_select(mainwin->folderview, item);
                }
        } else {
-               gtk_widget_grab_focus(mainwin->folderview->ctree);
+               folderview_grab_focus(mainwin->folderview);
                mainwindow_exit_folder(mainwin);
        }
 }
@@ -1756,12 +1967,20 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                { A_GOTO_NEXT,          toolbar_next_unread_cb          },
                { A_IGNORE_THREAD,      toolbar_ignore_thread_cb        },
                { A_WATCH_THREAD,       toolbar_watch_thread_cb         },
-               { A_PRINT,              toolbar_print_cb                },
+               { A_MARK,                       toolbar_mark_cb                 },
+               { A_UNMARK,                     toolbar_unmark_cb               },
+               { A_LOCK,                       toolbar_lock_cb                 },
+               { A_UNLOCK,                     toolbar_unlock_cb               },
+               { A_ALL_READ,           toolbar_all_read_cb             },
+               { A_ALL_UNREAD,         toolbar_all_unread_cb   },
+               { A_READ,                       toolbar_read_cb },
+               { A_UNREAD,                     toolbar_unread_cb       },
+               { A_PRINT,                      toolbar_print_cb                },
                { A_LEARN_SPAM,         toolbar_learn_cb                },
                { A_GO_FOLDERS,         toolbar_go_folders_cb           },
 
                { A_SEND,               toolbar_send_cb                 },
-               { A_SENDL,              toolbar_send_later_cb           },
+               { A_SEND_LATER, toolbar_send_later_cb           },
                { A_DRAFT,              toolbar_draft_cb                },
                { A_OPEN_MAIL,          toolbar_open_mail_cb            },
                { A_CLOSE,              toolbar_close_cb                },
@@ -1907,11 +2126,6 @@ Toolbar *toolbar_create(ToolbarType       type,
        GSList *toolbar_list;
        Toolbar *toolbar_data;
        GtkWidget *menu;
-#ifndef GENERIC_UMPC
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *toolbar_tips = gtk_tooltips_new();
-#endif
-#endif 
        toolbar_read_config_file(type);
        toolbar_list = toolbar_get_list(type);
 
@@ -1919,11 +2133,8 @@ Toolbar *toolbar_create(ToolbarType       type,
 
        toolbar = gtk_toolbar_new();
 
-#if (GTK_CHECK_VERSION(2,16,0))
        gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
-#else
-       gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
-#endif
+
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
        gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
        
@@ -1945,7 +2156,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                toolbar_data->item_list = 
                        g_slist_append(toolbar_data->item_list, 
                                       toolbar_item);
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+               icon_wid = stock_pixmap_widget(stock_pixmap_get_icon(toolbar_item->file));
                        
                switch (toolbar_item->index) {
 
@@ -1988,7 +2199,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        toolbar_data->compose_mail_icon = icon_wid; 
                        g_object_ref(toolbar_data->compose_mail_icon);
 
-                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+                       icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
                        toolbar_data->compose_news_icon = icon_news; 
                        g_object_ref(toolbar_data->compose_news_icon);
 #else
@@ -1997,7 +2208,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        toolbar_data->compose_mail_btn = item; 
                        toolbar_data->compose_mail_icon = icon_wid; 
 
-                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+                       icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
                        toolbar_data->compose_news_icon = icon_news; 
 #endif
                        break;
@@ -2009,7 +2220,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        toolbar_data->learn_spam_icon = icon_wid; 
                        g_object_ref(toolbar_data->learn_spam_icon);
 
-                       icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
+                       icon_ham = stock_pixmap_widget(STOCK_PIXMAP_HAM_BTN);
                        toolbar_data->learn_ham_icon = icon_ham; 
                        g_object_ref(toolbar_data->learn_ham_icon);
 
@@ -2130,7 +2341,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Message"));
                        toolbar_data->send_btn = item;
                        break;
-               case A_SENDL:
+               case A_SEND_LATER:
                        TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Put into queue folder and send later"));
                        toolbar_data->sendl_btn = item;
                        break;
@@ -2211,11 +2422,7 @@ Toolbar *toolbar_create(ToolbarType       type,
 
        }
        toolbar_data->toolbar = toolbar;
-#ifndef GENERIC_UMPC
-#if !(GTK_CHECK_VERSION(2,12,0))
-       toolbar_data->tooltips = toolbar_tips;
-#endif
-#endif
+
        gtk_widget_show_all(toolbar);
 
        if (type == TOOLBAR_MAIN) {
@@ -2324,61 +2531,9 @@ void toolbar_update(ToolbarType type, gpointer data)
        }
 }
 
-#if !GTK_CHECK_VERSION(2,14,0)
-/* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */
 #define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {           \
-       gboolean in_btn1 = FALSE, in_btn2 = FALSE;              \
-       if (GTK_IS_BUTTON(widget))                              \
-               in_btn1 = GTK_BUTTON(widget)->in_button;        \
-       else if (GTK_IS_MENU_TOOL_BUTTON(widget)) {             \
-               GtkWidget *child = gtk_bin_get_child(           \
-                       GTK_BIN(widget));                       \
-               GList *gchild = gtk_container_get_children(     \
-                       GTK_CONTAINER(child));                  \
-               GtkWidget *btn = (GtkWidget *)gchild->data;     \
-               GtkWidget *arr = (GtkWidget *)                  \
-                       (gchild->next?gchild->next->data:NULL); \
-               g_list_free(gchild);                            \
-               if (GTK_IS_BUTTON(btn))                         \
-                       in_btn1 = GTK_BUTTON(btn)->in_button;   \
-               if (GTK_IS_BUTTON(arr))                         \
-                       in_btn2 = GTK_BUTTON(arr)->in_button;   \
-       }                                                       \
-       else if (GTK_IS_TOOL_ITEM(widget)) {                    \
-               GtkWidget *child = gtk_bin_get_child(           \
-                       GTK_BIN(widget));                       \
-               if (GTK_IS_BUTTON(child))                       \
-                       in_btn1 = GTK_BUTTON(child)->in_button; \
-       }                                                       \
        gtk_widget_set_sensitive(widget, sensitive);            \
-       if (GTK_IS_BUTTON(widget))                              \
-               GTK_BUTTON(widget)->in_button = in_btn1;        \
-       else if (GTK_IS_MENU_TOOL_BUTTON(widget)) {             \
-               GtkWidget *child = gtk_bin_get_child(           \
-                       GTK_BIN(widget));                       \
-               GList *gchild = gtk_container_get_children(     \
-                       GTK_CONTAINER(child));                  \
-               GtkWidget *btn = (GtkWidget *)gchild->data;     \
-               GtkWidget *arr = (GtkWidget *)                  \
-                       (gchild->next?gchild->next->data:NULL); \
-               g_list_free(gchild);                            \
-               if (GTK_IS_BUTTON(btn))                         \
-                       GTK_BUTTON(btn)->in_button = in_btn1;   \
-               if (GTK_IS_BUTTON(arr))                         \
-                       GTK_BUTTON(arr)->in_button = in_btn2;   \
-       }                                                       \
-       else if (GTK_IS_TOOL_ITEM(widget)) {                    \
-               GtkWidget *child = gtk_bin_get_child(           \
-                       GTK_BIN(widget));                       \
-               if (GTK_IS_BUTTON(child))                       \
-                       GTK_BUTTON(child)->in_button = in_btn1; \
-       }                                                       \
 }
-#else
-#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) {           \
-       gtk_widget_set_sensitive(widget, sensitive);            \
-}
-#endif
 
 void toolbar_main_set_sensitive(gpointer data)
 {
@@ -2625,9 +2780,6 @@ static void toolbar_init(Toolbar * toolbar)
 #ifdef USE_ENCHANT
        toolbar->spellcheck_btn    = NULL;
 #endif
-#if !GTK_CHECK_VERSION(2,12,0)
-       toolbar->tooltips          = NULL;
-#endif
 
        toolbar_destroy(toolbar);
 }
@@ -2751,7 +2903,7 @@ void compose_mail_cb(gpointer data, guint action, GtkWidget *widget)
        
        if (item) {
                ac = account_find_from_item(item);
-               if (ac && ac->protocol != A_NNTP) {
+               if (ac && ac->protocol != A_NNTP && ac->protocol != A_IMAP4) {
                        compose_new_with_folderitem(ac, item, NULL);            /* CLAWS */
                        return;
                }