2005-09-14 [paul] 1.9.14cvs26

[claws.git] / src / prefs_toolbar.c

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 76292450b3ddc6104af513d60f0686c85e5f7909..e8028ff0a0cf9e45b21070f944e64046f642af30 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -574,13 +574,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
        GtkTreePath *prev, *sel;
        GtkTreeIter isel;
-       GtkListStore *store;
+       GtkListStore *store = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       
                 &isel))
                return;
 
@@ -606,13 +606,13 @@ static void prefs_toolbar_up(GtkButton *button, ToolbarPage *prefs_toolbar)
 
 static void prefs_toolbar_down(GtkButton *button, ToolbarPage *prefs_toolbar)
 {
-       GtkListStore *store;
+       GtkListStore *store = NULL;
        GtkTreeIter next, sel;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(prefs_toolbar->list_view_set)),
-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,
                 &sel))
                return;
 
@@ -791,7 +791,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                         G_CALLBACK(prefs_toolbar_substitute),
                         prefs_toolbar);
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_toolbar_delete), 
@@ -879,6 +879,7 @@ void prefs_toolbar_init(void)
        page->page.destroy_widget = prefs_toolbar_destroy_widget;
        page->page.save_page = prefs_toolbar_save;
        page->source = TOOLBAR_MAIN;
+       page->page.weight = 50.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_mainwindow = page;
 
@@ -892,6 +893,7 @@ void prefs_toolbar_init(void)
        page->page.destroy_widget = prefs_toolbar_destroy_widget;
        page->page.save_page = prefs_toolbar_save;
        page->source = TOOLBAR_MSGVIEW;
+       page->page.weight = 45.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_messageview = page;
 
@@ -905,6 +907,7 @@ void prefs_toolbar_init(void)
        page->page.destroy_widget = prefs_toolbar_destroy_widget;
        page->page.save_page = prefs_toolbar_save;
        page->source = TOOLBAR_COMPOSE;
+       page->page.weight = 40.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_toolbar_composewindow = page;
 }
@@ -1099,7 +1102,6 @@ static gboolean icon_list_selected(GtkTreeSelection *selector,
                                   ToolbarPage *prefs_toolbar)
 {
        GtkTreeIter iter;
-       GtkTreeView *list_ico = gtk_tree_selection_get_tree_view(selector);
        gchar *text;
        
        if (currently_selected ||!gtk_tree_model_get_iter(model, &iter, path))
@@ -1135,7 +1137,6 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
 {
        GtkTreeIter iter;
        GtkTreeView *list_ico = GTK_TREE_VIEW(prefs_toolbar->list_view_icons);
-       GtkTreeView *list_set = GTK_TREE_VIEW(prefs_toolbar->list_view_set);
        gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
        gchar *file, *icon_text, *descr;
        GList *cur;