talons

commit 34afeba22462e071453e206857484841275a73a5
parent 44aa899f97edf93e067ed54fa676a2759156bb6f
Author: Salvatore De Paolis <iwkse@claws-mail.org>
Date:   Sat,  6 Jun 2009 08:56:21 +0000

2009-06-06 [iwkse]	3.7.1cvs71

	* src/compose.c
		Ops..revert a mix with another patch

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
5
++++-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-06 [iwkse]	3.7.1cvs71
+
+	* src/compose.c
+		Ops..revert a mix with another patch
+
 2009-06-06 [iwkse]	3.7.1cvs70
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3810,3 +3810,4 @@
 ( cvs diff -u -r 1.382.2.513 -r 1.382.2.514 src/compose.c;  ) > 3.7.1cvs68.patchset
 ( cvs diff -u -r 1.382.2.514 -r 1.382.2.515 src/compose.c;  ) > 3.7.1cvs69.patchset
 ( cvs diff -u -r 1.382.2.515 -r 1.382.2.516 src/compose.c;  ) > 3.7.1cvs70.patchset
+( cvs diff -u -r 1.382.2.516 -r 1.382.2.517 src/compose.c;  ) > 3.7.1cvs71.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -294,6 +294,9 @@ static void compose_attach_info_free		(AttachInfo	*ainfo);
 static void compose_attach_remove_selected	(GtkAction	*action,
 						 gpointer	 data);
 
+static void compose_template_apply		(Compose	*compose,
+						 Template	*tmpl,
+						 gboolean	 replace);
 static void compose_attach_property		(GtkAction	*action,
 						 gpointer	 data);
 static void compose_attach_property_create	(gboolean	*cancelled);
@@ -7885,7 +7888,7 @@ static const gchar *compose_quote_char_from_context(Compose *compose)
 	return qmark;
 }
 
-void compose_template_apply(Compose *compose, Template *tmpl,
+static void compose_template_apply(Compose *compose, Template *tmpl,
 				   gboolean replace)
 {
 	GtkTextView *text;