2008-11-30 [paul] 3.6.1cvs55

[claws.git] / src / prefs_toolbar.c

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index c38b738d5f98c21c2700b81ed4d0dd3a348d97e1..06fc7509c4a3bf4c4affb79a6adf3bfcf5a41ceb 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -97,6 +96,7 @@ static const gint ToolbarIcons[] =
        STOCK_PIXMAP_MAIL_REPLY,
        STOCK_PIXMAP_MAIL_REPLY_TO_ALL,
        STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR,
+       STOCK_PIXMAP_MAIL_REPLY_TO_LIST,
        STOCK_PIXMAP_MAIL_SEND,
        STOCK_PIXMAP_MAIL_SEND_QUEUE,
        STOCK_PIXMAP_MAIL_SIGN,
@@ -138,6 +138,9 @@ static const gint ToolbarIcons[] =
        STOCK_PIXMAP_MIME_MESSAGE,
        STOCK_PIXMAP_SPAM_BTN,
        STOCK_PIXMAP_HAM_BTN,
+       STOCK_PIXMAP_TRASH,
+       STOCK_PIXMAP_DELETE,
+       STOCK_PIXMAP_CANCEL,
        STOCK_PIXMAP_EMPTY,              /* last entry */
 };
 
@@ -769,7 +772,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        GtkWidget *reg_hbox;
        GtkWidget *arrow;
        GtkWidget *btn_hbox;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
        GtkWidget *hbox;
 #endif
        GtkWidget *reg_btn;
@@ -916,7 +919,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                          prefs_toolbar);
 
        default_btn = gtk_button_new_with_label(_(" Use default "));
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
 #else
        hbox = gtk_hbox_new(FALSE, 0);
@@ -992,7 +995,7 @@ void prefs_toolbar_init(void)
        ToolbarPage *page;
        static gchar *mainpath[3], *messagepath[3], *composepath[3];
 
-       mainpath[0] = _("Customize Toolbars");
+       mainpath[0] = _("Toolbars");
        mainpath[1] = _("Main Window");
        mainpath[2] = NULL;
 
@@ -1006,7 +1009,7 @@ void prefs_toolbar_init(void)
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_mainwindow = page;
 
-       messagepath[0] = _("Customize Toolbars");
+       messagepath[0] = _("Toolbars");
        messagepath[1] = _("Message Window");
        messagepath[2] = NULL;
 
@@ -1020,7 +1023,7 @@ void prefs_toolbar_init(void)
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_messageview = page;
 
-       composepath[0] = _("Customize Toolbars");
+       composepath[0] = _("Toolbars");
        composepath[1] = _("Compose Window");
        composepath[2] = NULL;
 
@@ -1097,7 +1100,7 @@ static GtkWidget *create_set_list_view(ToolbarPage *prefs_toolbar)
        gtk_tree_view_column_set_title(column, _("Icon"));
        renderer = gtk_cell_renderer_pixbuf_new();
        gtk_tree_view_column_pack_start(column, renderer, FALSE);
-       
+       gtk_tree_view_set_reorderable(list_view, TRUE);
        /* tell pixbuf renderer it is only visible if 
         * the icon is not represented by text */
        gtk_tree_view_column_set_cell_data_func(column, renderer,