2007-01-10 [colin] 2.7.0cvs6

[claws.git] / src / prefs_folder_item.c

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 7f1f18524049257daf1c3c7e2d92aab718dad270..9f95d158ac3a8c4b2976aefd765fa78493ab8aa4 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -565,6 +565,8 @@ void prefs_folder_item_general_save_func(PrefsPage *page_)
 
        g_node_traverse(page->item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
                        -1, general_save_recurse_func, page);
+       
+       main_window_set_menu_sensitive(mainwindow_get_mainwindow());
 
 }
 
@@ -692,7 +694,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default To */
-               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To: "));
+               checkbtn_default_to = gtk_check_button_new_with_label(_("Default To:"));
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_to), 
@@ -713,7 +715,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
 
                /* Default address to reply to */
-               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To for replies: "));
+               checkbtn_default_reply_to = gtk_check_button_new_with_label(_("Default To: for replies"));
                gtk_table_attach(GTK_TABLE(table), checkbtn_default_reply_to, 0, 1, 
                                 rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_default_reply_to), 
@@ -734,7 +736,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                rowcount++;
        }
        /* Default account */
-       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account: "));
+       checkbtn_enable_default_account = gtk_check_button_new_with_label(_("Default account"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_account, 0, 1, 
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account), 
@@ -785,7 +787,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
 #if USE_ASPELL
        /* Default dictionary */
-       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary: "));
+       checkbtn_enable_default_dictionary = gtk_check_button_new_with_label(_("Default dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_dictionary, 0, 1,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
@@ -818,7 +820,7 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        rowcount++;
 
        /* Default dictionary */
-       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary: "));
+       checkbtn_enable_default_alt_dictionary = gtk_check_button_new_with_label(_("Default alternate dictionary"));
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_default_alt_dictionary, 0, 1,
                         rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
@@ -1002,8 +1004,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
 #endif
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
                return TRUE;
-
-       if ((node == page->item->node) &&
+       else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
 #if USE_ASPELL
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))