talons

commit 49228a4c47c56b37d15da5ba5736c7529339a551
parent 2c569bc4121eb41f4df3c805d4a78a27f1e7bfdc
Author: Paul Mangan <paul@claws-mail.org>
Date:   Wed, 22 Dec 2010 19:56:55 +0000

2010-12-22 [paul]	3.7.8cvs22

	* src/compose.h
		fix missing file in 3.7.8cvs20

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

4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-22 [paul]	3.7.8cvs22
+
+	* src/compose.h
+		fix missing file in 3.7.8cvs20
+
 2010-12-22 [colin]	3.7.8cvs21
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4095,3 +4095,4 @@
 ( cvs diff -u -r 1.96.2.226 -r 1.96.2.227 src/textview.c;  ) > 3.7.8cvs19.patchset
 ( cvs diff -u -r 1.382.2.563 -r 1.382.2.564 src/compose.c;  ) > 3.7.8cvs20.patchset
 ( cvs diff -u -r 1.207.2.217 -r 1.207.2.218 src/folderview.c;  cvs diff -u -r 1.20.2.26 -r 1.20.2.27 src/folderview.h;  ) > 3.7.8cvs21.patchset
+( cvs diff -u -r 1.50.2.60 -r 1.50.2.61 src/compose.h;  ) > 3.7.8cvs22.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.h b/src/compose.h
@@ -261,6 +261,7 @@ struct _AttachInfo
 	EncodingType encoding;
 	gchar *name;
 	goffset size;
+	gchar *charset;
 };
 
 typedef enum