2006-03-17 [wwp] 2.0.0cvs148
authorTristan Chabredier <wwp@claws-mail.org>
Fri, 17 Mar 2006 10:24:33 +0000 (10:24 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Fri, 17 Mar 2006 10:24:33 +0000 (10:24 +0000)
* src/compose.c
rollback few lines from my previous commit (those lines come from
a pending patch, accidentally commited, even if neutral as they are
commented out).

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 07359c1..045ee3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-17 [wwp]       2.0.0cvs148
+
+       * src/compose.c
+               rollback few lines from my previous commit (those lines come from
+               a pending patch, accidentally commited, even if neutral as they are
+               commented out).
+
 2006-03-17 [wwp]       2.0.0cvs147
 
        * src/compose.c
index 56032da..8255ee7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.115.2.77 -r 1.115.2.78 src/main.c;  cvs diff -u -r 1.96.2.101 -r 1.96.2.102 src/textview.c;  ) > 2.0.0cvs145.patchset
 ( cvs diff -u -r 1.150.2.58 -r 1.150.2.59 src/procmsg.c;  cvs diff -u -r 1.382.2.251 -r 1.382.2.252 src/compose.c;  ) > 2.0.0cvs146.patchset
 ( cvs diff -u -r 1.382.2.252 -r 1.382.2.253 src/compose.c;  ) > 2.0.0cvs147.patchset
+( cvs diff -u -r 1.382.2.253 -r 1.382.2.254 src/compose.c;  ) > 2.0.0cvs148.patchset
index be7e8a7..9a5958d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=147
+EXTRA_VERSION=148
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 13baf4b..fb5731f 100644 (file)
@@ -960,8 +960,6 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
        g_return_if_fail(compose != NULL);
        g_return_if_fail(account != NULL);
 
-/*     if (!item->prefs->do_not_sign_or_encrypt)*/
-       {
        if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
                return;
 
@@ -974,7 +972,6 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
                        privacy = (gchar *)(privacy_avail->data);
                }
        }
-       }
        if (privacy != NULL) {
                compose->privacy_system = g_strdup(privacy);
                compose_update_privacy_system_menu_item(compose, FALSE);