* src/compose.c

	fix breakage because of uninitialized account pointer.
	please verify.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c07f225a994142f75c73f2746553a543285c1b17..b24ce66b36877e019a42cf335092de3e7b6be9b5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-02-14 [alfons]    0.8.10claws12
+
+       * src/compose.c
+               fix breakage because of uninitialized account pointer.
+               please verify.
+
 2003-02-14 [paul]      0.8.10claws11
 
        * src/compose.c

diff --git a/configure.ac b/configure.ac
index d2699f1d2175ef105639c9d9c229b2a6c06835b7..ec69b4d0a754776a73fecffe8a60f65777a4aa6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws11
+EXTRA_VERSION=claws12
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 4c1ed593b555192fcfddd436d8a3e31d4072c5ce..ae5a5ab9dd90bf0621599a5d1f0c5c00978699d3 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1830,7 +1830,6 @@ static void compose_exec_sig(Compose *compose, gchar *sigfile)
 
 static void compose_insert_sig(Compose *compose)
 {
-       PrefsAccount *account;
        gchar *sigfile;
 
        if (compose->account && compose->account->sig_path)
@@ -1845,9 +1844,9 @@ static void compose_insert_sig(Compose *compose)
        }
 
        gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, "\n\n", 2);
-       if (account->sig_sep) {
+       if (compose->account->sig_sep) {
                gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL,
-                               account->sig_sep, -1);
+                                compose->account->sig_sep, -1);
                gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL,
                                "\n", 1);
        }
@@ -5178,7 +5177,6 @@ void compose_reflect_prefs_pixmap_theme(void)
 static void compose_template_apply(Compose *compose, Template *tmpl,
                                   gboolean replace)
 {
-       PrefsAccount *account;
        gchar *qmark;
        gchar *parsed_str;
 
@@ -5219,7 +5217,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
                        parsed_str = NULL;
        }
 
-       if (replace && parsed_str && account->auto_sig)
+       if (replace && parsed_str && compose->account->auto_sig)
                compose_insert_sig(compose);
 
        if (replace && parsed_str) {