2009-06-06 [iwkse] 3.7.1cvs71

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

diff --git a/ChangeLog b/ChangeLog
index 99777200f2b357d10a4d60aefbfa1b8978743e1f..196dcf9a80c42f213b2ee42743d4de5a904fadf4 100644 (file)
--- 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
 2009-06-06 [iwkse]     3.7.1cvs70
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 5757a8371ebb29cef862ba1a81fefa7cd9bc019f..e3f8fd87c3b5823f5705d192cdbee1187e4413a5 100644 (file)
--- 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.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
index cd99f701d62581a5542cabc92abaddf3819c8a65..a05c4a34222003ae5a4f06a7d0d31ca799ffddfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=70
+EXTRA_VERSION=71

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 0a445fd2502f32cfb8df1406474ebd17b6f403ea..654f675612b5c47e1fa1b5243ebe1d9a54869bd3 100644 (file)
--- 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_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);
 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;
 }
 
        return qmark;
 }
 

-void compose_template_apply(Compose *compose, Template *tmpl,
+static void compose_template_apply(Compose *compose, Template *tmpl,

                                   gboolean replace)
 {
        GtkTextView *text;
                                   gboolean replace)
 {
        GtkTextView *text;