2010-12-22 [paul] 3.7.8cvs22

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

diff --git a/ChangeLog b/ChangeLog
index 2aa28be..a91c538 100644 (file)
--- 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
index af75cab..56f7587 100644 (file)
--- 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
index 0ca7132..6298a84 100644 (file)
--- 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
index a3abd71..3b481cd 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -261,6 +261,7 @@ struct _AttachInfo
        EncodingType encoding;
        gchar *name;
        goffset size;
+       gchar *charset;
 };
 
 typedef enum