* src/prefs_account.c

	Better wording

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e606bc2aabf76968c006ff10beb51304861c65bc..cd97097fafc2a183ac16c208e149b07218af02cb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-02-20 [colin]     0.8.10claws33
+       
+       * src/prefs_account.c
+               Better wording
+
+2003-02-20 [colin]     0.8.10claws32
+
+       * src/compose.c
+               Remove useless '&& !to_sender' 
+

 2003-02-20 [darko]
 
        * AUTHORS
 2003-02-20 [darko]
 
        * AUTHORS

diff --git a/configure.ac b/configure.ac
index 427df1995426d878d22a62311a1dd21e83a2b21c..b0e90fab1b1d2da857d1bf2a624f7a60b319731b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws31
+EXTRA_VERSION=claws33

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 528117ea86b535d76b77dc63584d9f0d8d9146ee..0396262bfe50750fd8e7f3decdbb60dd281d0b26 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1664,9 +1664,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        !strncmp(compose->followup_to, "poster", 6)))
                        compose_entry_append
                                (compose, 
                        !strncmp(compose->followup_to, "poster", 6)))
                        compose_entry_append
                                (compose, 

-                                ((compose->replyto && !to_sender)
-                                ? compose->replyto :
-                                msginfo->from ? msginfo->from : ""),
+                                (compose->replyto ? compose->replyto :
+                                       msginfo->from ? msginfo->from : ""),

                                 COMPOSE_TO);
                                 
                else if (followup_and_reply_to || to_all) {
                                 COMPOSE_TO);
                                 
                else if (followup_and_reply_to || to_all) {

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 69d2e823caa211c882ddd8e72d46511e9d7ec3d6..de2dd56cb7808d80047e2f5b9f88db4334b1b846 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1838,7 +1838,7 @@ static void prefs_account_ssl_create(void)
 
        CREATE_RADIO_BUTTONS(vbox5,
                             smtp_nossl_radiobtn,
 
        CREATE_RADIO_BUTTONS(vbox5,
                             smtp_nossl_radiobtn,

-                            _("Don't use SSL (or STARTTLS only if necessary)"),
+                            _("Don't use SSL (but, if necessary, use STARTTLS)"),

                             SSL_NONE,
                             smtp_ssltunnel_radiobtn,
                             _("Use SSL for SMTP connection"),
                             SSL_NONE,
                             smtp_ssltunnel_radiobtn,
                             _("Use SSL for SMTP connection"),