* sync with main changes of 2002-10-04

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 2d296dec45f636919f4f5227e9818063f5be680a..7a210ba675512c9b42cabad97b95d002790b2473 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -121,6 +121,7 @@ static struct Compose {
        GtkWidget *checkbtn_forward_account_autosel;
        GtkWidget *checkbtn_reedit_account_autosel;
        GtkWidget *checkbtn_quote;
+       GtkWidget *checkbtn_default_reply_list;
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
@@ -433,6 +434,10 @@ static PrefParam param[] = {
         &compose.checkbtn_reedit_account_autosel,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
+       {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
+        &compose.checkbtn_default_reply_list,
+        prefs_set_data_from_toggle, prefs_set_toggle},
+
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
         NULL, NULL, NULL},
 
@@ -1732,6 +1737,8 @@ static void prefs_compose_create(void)
        GtkWidget *checkbtn_autowrap;
        GtkWidget *checkbtn_wrapatsend;
 
+       GtkWidget *checkbtn_default_reply_list;
+
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_redirect_keep_from;
        GtkWidget *checkbtn_smart_wrapping;
@@ -1790,6 +1797,9 @@ static void prefs_compose_create(void)
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_default_reply_list,
+                          _("Reply button invokes mailing list reply"));
+
        PACK_CHECK_BUTTON (vbox2, checkbtn_autoextedit,
                           _("Automatically launch the external editor"));
 
@@ -1916,7 +1926,7 @@ static void prefs_compose_create(void)
                checkbtn_smart_wrapping;
        compose.checkbtn_block_cursor   =
                checkbtn_block_cursor;
-
+       compose.checkbtn_default_reply_list = checkbtn_default_reply_list;
 }
 
 static void prefs_quote_create(void)
@@ -2286,7 +2296,7 @@ static void prefs_display_create(void)
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
        button_dispitem = gtk_button_new_with_label
-               (_(" Set display item of summary... "));
+               (_(" Set displayed items of summary... "));
        gtk_widget_show (button_dispitem);
        gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (button_dispitem), "clicked",
@@ -3803,7 +3813,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
                "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
-               "(menu-path \"<Main>/View/Show all header\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
@@ -3856,7 +3866,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"G\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
                "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
-               "(menu-path \"<Main>/View/Show all header\" \"<shift>H\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<shift>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<shift>S\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
@@ -3908,7 +3918,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"C\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"<control><alt>N\")\n"
                "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
-               "(menu-path \"<Main>/View/Show all header\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<control><alt>U\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<control>I\")\n"
@@ -3961,7 +3971,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"<alt>G\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"<shift><control>N\")\n"
                "(menu-path \"<Main>/View/View source\" \"<control>U\")\n"
-               "(menu-path \"<Main>/View/Show all header\" \"<control>H\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"<control>H\")\n"
                "(menu-path \"<Main>/View/Update\" \"<alt>U\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"<alt>I\")\n"
@@ -4014,7 +4024,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                "(menu-path \"<Main>/View/Go to/Other folder...\" \"\")\n"
                "(menu-path \"<Main>/View/Open in new window\" \"\")\n"
                "(menu-path \"<Main>/View/View source\" \"\")\n"
-               "(menu-path \"<Main>/View/Show all header\" \"\")\n"
+               "(menu-path \"<Main>/View/Show all headers\" \"\")\n"
                "(menu-path \"<Main>/View/Update\" \"\")\n"
 
                "(menu-path \"<Main>/Message/Get new mail\" \"\")\n"
@@ -4082,30 +4092,20 @@ static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam)
 
 static void prefs_common_charset_set_optmenu(PrefParam *pparam)
 {
-       GList *cur;
        GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-       gchar *charset;
-       gint n = 0;
+       gint index;
 
        g_return_if_fail(optmenu != NULL);
        g_return_if_fail(*((gchar **)pparam->data) != NULL);
 
-       menu = gtk_option_menu_get_menu(optmenu);
-       for (cur = GTK_MENU_SHELL(menu)->children;
-            cur != NULL; cur = cur->next) {
-               menuitem = GTK_WIDGET(cur->data);
-               charset = gtk_object_get_user_data(GTK_OBJECT(menuitem));
-               if (!strcmp(charset, *((gchar **)pparam->data))) {
-                       gtk_option_menu_set_history(optmenu, n);
-                       return;
-               }
-               n++;
+       index = menu_find_option_menu_index(optmenu, *((gchar **)pparam->data),
+                                           (GCompareFunc)strcmp);
+       if (index >= 0)
+               gtk_option_menu_set_history(optmenu, index);
+       else {
+               gtk_option_menu_set_history(optmenu, 0);
+               prefs_common_charset_set_data_from_optmenu(pparam);
        }
-
-       gtk_option_menu_set_history(optmenu, 0);
-       prefs_common_charset_set_data_from_optmenu(pparam);
 }
 
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam)