2006-06-21 [paul] 2.3.1cvs10

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index db38949db016e7604e31a504e4d15fa94daf02fc..afa4c6ee49f5ae0598bdcfd22e91d4123a3c23a6 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -131,7 +131,6 @@ static struct Receive {
 } receive;
 
 static struct Send {
-       GtkWidget *date_chkbtn;
        GtkWidget *msgid_chkbtn;
        GtkWidget *customhdr_chkbtn;
        GtkWidget *smtp_auth_chkbtn;
@@ -353,10 +352,6 @@ static PrefParam param[] = {
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        /* Send */
-       {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
-        &p_send.date_chkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
        {"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
         &p_send.msgid_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -1658,7 +1653,6 @@ static void prefs_account_send_create(void)
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *frame;
-       GtkWidget *date_chkbtn;
        GtkWidget *msgid_chkbtn;
        GtkWidget *hbox;
        GtkWidget *customhdr_chkbtn;
@@ -1691,7 +1685,6 @@ static void prefs_account_send_create(void)
        gtk_container_add (GTK_CONTAINER (frame), vbox2);
        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
 
-       PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date"));
        PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
 
        hbox = gtk_hbox_new (FALSE, 12);
@@ -1836,7 +1829,6 @@ static void prefs_account_send_create(void)
 
 
        
-       p_send.date_chkbtn      = date_chkbtn;
        p_send.msgid_chkbtn     = msgid_chkbtn;
        p_send.customhdr_chkbtn = customhdr_chkbtn;
 
@@ -2046,15 +2038,15 @@ static void prefs_account_privacy_create(void)
        gtk_widget_show (default_privacy_system);
        gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, FALSE, TRUE, 0);
 
+       PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
+                          _("Always sign messages"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
-                          _("Encrypt message by default"));
+                          _("Always encrypt messages"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
-                          _("Encrypt message by default when replying to an "
+                          _("Always encrypt messages when replying to an "
                             "encrypted message"));
-       PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
-                          _("Sign message by default"));
        PACK_CHECK_BUTTON (vbox2, encrypt_to_self_chkbtn,
-                          _("Encrypt sent messages to myself too"));
+                          _("Encrypt sent messages with your own key in addition to recipient's"));
        PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
                           _("Save sent encrypted messages as clear text"));