2005-09-14 [paul] 1.9.14cvs26

[claws.git] / src / prefs_display_header.c

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 7dbcef2b6c549301fa7e024df1ba7aeb3ab329a9..f1eb2976bf9b8feaa35c23777757bcbc70949a85 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -361,7 +361,7 @@ static void prefs_display_header_create(void)
                            G_CALLBACK
                            (prefs_display_header_register_cb),
                            GINT_TO_POINTER(TRUE));
-       del_btn = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
+       del_btn = gtk_button_new_from_stock (GTK_STOCK_DELETE);
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
        g_signal_connect (G_OBJECT       (del_btn), "clicked",
@@ -398,7 +398,7 @@ void prefs_display_header_read_config(void)
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                             DISPLAY_HEADER_RC, NULL);
-       if ((fp = fopen(rcpath, "rb")) == NULL) {
+       if ((fp = g_fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                prefs_common.disphdr_list = NULL;
@@ -614,13 +614,13 @@ static void prefs_display_header_up(void)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
-       GtkListStore *store;
+       GtkListStore *store = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
-                (GtkTreeModel **) &store,      
+                (GtkTreeModel **)(GtkListStore *) store,       
                 &isel))
                return;
 
@@ -647,14 +647,14 @@ static void prefs_display_header_up(void)
 
 static void prefs_display_header_down(void)
 {
-       GtkListStore *store;
+       GtkListStore *store = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(dispheader.headers_list_view)),
-                (GtkTreeModel **) &store,
+                (GtkTreeModel **)(GtkListStore *) store,
                 &sel))
                return;