fix bug where changing account would insert sig even if auto_sig was FALSE

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d654ebdf31a442d19d53bd94505fa26577e7515f..569d49ed72e36197ca5e58ee3007c9a747c986d4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-05-29 [paul]      0.9.0claws6
+
+       * src/compose.c
+               fix bug where changing account would insert
+               sig even if auto_sig was FALSE
+               
+       * ChangeLog
+         ChangeLog.jp
+         INSTALL
+               sync with 0.9.1 release
+

 2003-05-28 [christoph] 0.9.0claws5
 
        * src/imap.c
 2003-05-28 [christoph] 0.9.0claws5
 
        * src/imap.c

diff --git a/configure.ac b/configure.ac
index a307c8896b9978b2045c03392f0ab99fe229111e..d2bf237b04654c02a450d5fdce6cc699f53fd34a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6

 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 f4cf38606fffcffc7fb9c42cb8a4ccf5f6dfbf87..cd21cf034ecc257240a70a4a990d6efe42e8400e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1927,7 +1927,7 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
 
        g_free(compose->sig_str);
        compose->sig_str = compose_get_signature_str(compose);
 
        g_free(compose->sig_str);
        compose->sig_str = compose_get_signature_str(compose);

-       if (!compose->sig_str)
+       if (!compose->sig_str || !compose->account->auto_sig)

                compose->sig_str = g_strdup("");
 
        gtk_stext_insert(text, NULL, NULL, NULL, compose->sig_str, -1);
                compose->sig_str = g_strdup("");
 
        gtk_stext_insert(text, NULL, NULL, NULL, compose->sig_str, -1);