From: Tristan Chabredier <wwp@claws-mail.org>
Date: Wed, 23 May 2007 09:06:46 +0000 (+0000)
Subject: 2007-05-23 [wwp]	2.9.2cvs12
X-Git-Tag: rel_2_10_0~69
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=62ea1351e5455acbedb2a115d90e3643df5f1d89;ds=sidebyside

2007-05-23 [wwp]	2.9.2cvs12

	* src/quote_fmt_parse.y
		Fix 2.9.2cvs11, probably a paste accident ;).
---

diff --git a/ChangeLog b/ChangeLog
index 33109988d..be9f09a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-23 [wwp]	2.9.2cvs12
+
+	* src/quote_fmt_parse.y
+		Fix 2.9.2cvs11, probably a paste accident ;).
+
 2007-05-23 [wwp]	2.9.2cvs11
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index becec6845..43259333e 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2587,3 +2587,4 @@
 ( cvs diff -u -r 1.213.2.144 -r 1.213.2.145 src/folder.c;  cvs diff -u -r 1.87.2.40 -r 1.87.2.41 src/folder.h;  cvs diff -u -r 1.115.2.152 -r 1.115.2.153 src/main.c;  cvs diff -u -r 1.7.2.10 -r 1.7.2.11 src/main.h;  cvs diff -u -r 1.94.2.133 -r 1.94.2.134 src/messageview.c;  cvs diff -u -r 1.204.2.134 -r 1.204.2.135 src/prefs_common.c;  cvs diff -u -r 1.103.2.82 -r 1.103.2.83 src/prefs_common.h;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.302 -r 1.395.2.303 src/summaryview.c;  ) > 2.9.2cvs9.patchset
 ( cvs diff -u -r 1.382.2.377 -r 1.382.2.378 src/compose.c;  cvs diff -u -r 1.12.2.41 -r 1.12.2.42 src/prefs_template.c;  cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/quote_fmt.c;  cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/quote_fmt.h;  cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.28 -r 1.22.2.29 src/quote_fmt_parse.y;  cvs diff -u -r 1.9.2.50 -r 1.9.2.51 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/gtkaspell.h;  ) > 2.9.2cvs10.patchset
 ( cvs diff -u -r 1.382.2.378 -r 1.382.2.379 src/compose.c;  cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/prefs_template.c;  cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/quote_fmt.h;  cvs diff -u -r 1.22.2.29 -r 1.22.2.30 src/quote_fmt_parse.y;  ) > 2.9.2cvs11.patchset
+( cvs diff -u -r 1.22.2.30 -r 1.22.2.31 src/quote_fmt_parse.y;  ) > 2.9.2cvs12.patchset
diff --git a/configure.ac b/configure.ac
index c16709855..57196b9bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 3919a5e3d..6d0556af3 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -166,8 +166,8 @@ void quote_fmt_reset_vartable(void)
 #ifdef USE_ASPELL
 void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
 		    const gchar *my_body, gboolean my_dry_run,
-			PrefsAccount *account,
-			GtkAspell *gtkaspell);
+			PrefsAccount *compose_account,
+			GtkAspell *compose_gtkaspell)
 #else
 void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str,
 		    const gchar *my_body, gboolean my_dry_run,