2006-11-12 [colin] 2.6.0cvs35

	* src/compose.c
		Fix bug 1060, 'compilation error with
		Irix's cc'

diff --git a/ChangeLog b/ChangeLog
index 7c86509bd3210d04bd620960b1af11f160f326b5..e4ed2b3526a229e26282b6b906619c51ac0cd3f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-12 [colin]     2.6.0cvs35
+
+       * src/compose.c
+               Fix bug 1060, 'compilation error with 
+               Irix's cc'
+
 2006-11-12 [paul]      2.6.0cvs34
 
        * doc/man/claws-mail.1

diff --git a/PATCHSETS b/PATCHSETS
index 3d2818f5d7c973bc05af983e1a8a2f968e988ae4..b915c18d9c5c2ec482fd55865c1d35a1e283261a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2059,3 +2059,4 @@
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs32.patchset
 ( cvs diff -u -r 1.207.2.132 -r 1.207.2.133 src/folderview.c;  ) > 2.6.0cvs33.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 doc/man/claws-mail.1;  cvs diff -u -r 1.10.2.26 -r 1.10.2.27 src/prefs_gtk.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/clamav/README;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/plugins/spamassassin/README;  cvs diff -u -r 1.14.2.42 -r 1.14.2.43 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.30.2.11 -r 1.30.2.12 tools/README;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/freshmeat_search.pl;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/google_search.pl;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/multiwebsearch.pl;  ) > 2.6.0cvs34.patchset
+( cvs diff -u -r 1.382.2.327 -r 1.382.2.328 src/compose.c;  ) > 2.6.0cvs35.patchset

diff --git a/configure.ac b/configure.ac
index 2b3762f37fc3e3acba7f04627384629a8414e7ce..1c8f947e3e386cc9383e08c119b2f2daae8e53b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 22e98e8ec3f875ae30cd1aec66d472b6cb3c675a..a1bbf41bc232ab79f392c002d56717d34ff3af45 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -450,7 +450,7 @@ static void compose_set_priority_cb (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
 static void compose_reply_change_mode  (gpointer        data,
-                                        guint           action,
+                                        ComposeMode    action,
                                         GtkWidget      *widget);
 
 static void compose_attach_drag_received_cb (GtkWidget         *widget,