2006-04-09 [colin] 2.1.0cvs21

[claws.git] / src / prefs_customheader.c

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 74c8d9f69934115800f37af82a6b68f518e4e598..768602ba69aad009324a5fdc908ec965a5934f27 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -166,8 +166,8 @@ static void prefs_custom_header_create(void)
        gtk_widget_show (vbox);
        gtk_container_add (GTK_CONTAINER (window), vbox);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL,
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK,
                                      NULL, NULL);
        gtk_widget_show (confirm_area);
        gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -326,8 +326,8 @@ void prefs_custom_header_read_config(PrefsAccount *ac)
        /* remove all previous headers list */
        while (ac->customhdr_list != NULL) {
                ch = (CustomHeader *)ac->customhdr_list->data;
-               custom_header_free(ch);
                ac->customhdr_list = g_slist_remove(ac->customhdr_list, ch);
+               custom_header_free(ch);
        }
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
@@ -421,8 +421,8 @@ void prefs_custom_header_write_config(PrefsAccount *ac)
 
        while (all_hdrs != NULL) {
                ch = (CustomHeader *)all_hdrs->data;
-               custom_header_free(ch);
                all_hdrs = g_slist_remove(all_hdrs, ch);
+               custom_header_free(ch);
        }
 
        if (prefs_file_close(pfile) < 0) {
@@ -544,7 +544,7 @@ static void prefs_custom_header_delete_cb(void)
 
        if (alertpanel(_("Delete header"),
                       _("Do you really want to delete this header?"),
-                      GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
                return;
 
        gtk_tree_model_get(model, &sel,