Bumped version to 1.0.0GMIME_1_0_0

2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>

	* configure.in: Bumped version to 1.0.0

	* README: Updated.

15 files changed, 103 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index 143e93ef..c9197f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* configure.in: Bumped version to 1.0.0
+
+	* README: Updated.
+
+2002-06-12  Jeffrey Stedfast  <fejj@ximian.com>
+
 	* gen-table.c: Updated.
 
 	* gmime-utils.c (quoted_decode): Oops. ESPECIALs are allowed
diff --git a/README b/README
index 4523d813..8a523d4a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                            GMime, version 0.8.0
+                            GMime, version 1.0.0
                    by Jeffrey Stedfast <fejj@helixcode.com>
 
 
diff --git a/configure.in b/configure.in
index 615796a2..f485ccfa 100644
--- a/configure.in
+++ b/configure.in
@@ -10,8 +10,8 @@ AM_CONFIG_HEADER(config.h)
 # glib_cflags:  cflags to store in gmime-config
 # glib_libs:    libs to store in gmime-config
 
-GMIME_MAJOR_VERSION=0
-GMIME_MINOR_VERSION=9
+GMIME_MAJOR_VERSION=1
+GMIME_MINOR_VERSION=0
 GMIME_MICRO_VERSION=0
 GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
 GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
@@ -123,6 +123,8 @@ dnl Check for libiconv
 AM_ICONV()
 
 CFLAGS="$CFLAGS -I$srcdir"
+LDFLAGS_save="$LDFLAGS"
+LDFLAGS="$LDFLAGS $LIBICONV"
 
 AC_MSG_CHECKING(preferred charset formats for system iconv)
 AC_TRY_RUN([
@@ -142,6 +144,8 @@ AC_TRY_RUN([
 	])
 ])
 
+LDFLAGS="$LDFLAGS_save"
+
 dnl * Time zone stuff
 AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
 	AC_TRY_COMPILE([
diff --git a/doc/html/gmime-gmime-disposition.html b/doc/html/gmime-gmime-disposition.html
index 0b86b837..e475ab7b 100644
--- a/doc/html/gmime-gmime-disposition.html
+++ b/doc/html/gmime-gmime-disposition.html
@@ -287,7 +287,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_DISPOSITION_ATTACHMENT</PRE
+>#define GMIME_DISPOSITION_ATTACHMENT "attachment"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -315,7 +315,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_DISPOSITION_INLINE</PRE
+>#define GMIME_DISPOSITION_INLINE     "inline"</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/gmime-gmime-filter-html.html b/doc/html/gmime-gmime-filter-html.html
index 32981b56..7a9f2467 100644
--- a/doc/html/gmime-gmime-filter-html.html
+++ b/doc/html/gmime-gmime-filter-html.html
@@ -232,7 +232,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_PRE</PRE
+>#define GMIME_FILTER_HTML_PRE               (1 &lt;&lt; 0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -260,7 +260,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_CONVERT_NL</PRE
+>#define GMIME_FILTER_HTML_CONVERT_NL        (1 &lt;&lt; 1)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -288,7 +288,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_CONVERT_SPACES</PRE
+>#define GMIME_FILTER_HTML_CONVERT_SPACES    (1 &lt;&lt; 2)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -317,7 +317,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_CONVERT_URLS</PRE
+>#define GMIME_FILTER_HTML_CONVERT_URLS      (1 &lt;&lt; 3)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -345,7 +345,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_MARK_CITATION</PRE
+>#define GMIME_FILTER_HTML_MARK_CITATION     (1 &lt;&lt; 4)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -373,7 +373,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_CONVERT_ADDRESSES</PRE
+>#define GMIME_FILTER_HTML_CONVERT_ADDRESSES (1 &lt;&lt; 5)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -401,7 +401,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_ESCAPE_8BIT</PRE
+>#define GMIME_FILTER_HTML_ESCAPE_8BIT       (1 &lt;&lt; 6)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -429,7 +429,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_FILTER_HTML_CITE</PRE
+>#define GMIME_FILTER_HTML_CITE              (1 &lt;&lt; 7)</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/gmime-gmime-filter-yenc.html b/doc/html/gmime-gmime-filter-yenc.html
index c10f6a47..9097730e 100644
--- a/doc/html/gmime-gmime-filter-yenc.html
+++ b/doc/html/gmime-gmime-filter-yenc.html
@@ -342,7 +342,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YENCODE_CRC_INIT</PRE
+>#define GMIME_YENCODE_CRC_INIT       (~0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -368,7 +368,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YENCODE_CRC_FINAL(crc)</PRE
+>#define GMIME_YENCODE_CRC_FINAL(crc) (~crc)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1109,7 +1109,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YENCODE_STATE_INIT</PRE
+>#define GMIME_YENCODE_STATE_INIT     (0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1135,7 +1135,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_INIT</PRE
+>#define GMIME_YDECODE_STATE_INIT     (0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1161,7 +1161,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_EOLN</PRE
+>#define GMIME_YDECODE_STATE_EOLN     (1 &lt;&lt; 8)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1187,7 +1187,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_ESCAPE</PRE
+>#define GMIME_YDECODE_STATE_ESCAPE   (1 &lt;&lt; 9)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1213,7 +1213,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_BEGIN</PRE
+>#define GMIME_YDECODE_STATE_BEGIN    (1 &lt;&lt; 12)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1239,7 +1239,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_PART</PRE
+>#define GMIME_YDECODE_STATE_PART     (1 &lt;&lt; 13)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1265,7 +1265,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_DECODE</PRE
+>#define GMIME_YDECODE_STATE_DECODE   (1 &lt;&lt; 14)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1291,7 +1291,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_YDECODE_STATE_END</PRE
+>#define GMIME_YDECODE_STATE_END      (1 &lt;&lt; 15)</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/gmime-gmime-message.html b/doc/html/gmime-gmime-message.html
index 56b8bfd5..8bacbc46 100644
--- a/doc/html/gmime-gmime-message.html
+++ b/doc/html/gmime-gmime-message.html
@@ -431,7 +431,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_RECIPIENT_TYPE_TO</PRE
+>#define	GMIME_RECIPIENT_TYPE_TO  "To"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -459,7 +459,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_RECIPIENT_TYPE_CC</PRE
+>#define	GMIME_RECIPIENT_TYPE_CC  "Cc"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -487,7 +487,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_RECIPIENT_TYPE_BCC</PRE
+>#define	GMIME_RECIPIENT_TYPE_BCC "Bcc"</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/gmime-gmime-utils.html b/doc/html/gmime-gmime-utils.html
index 8445b8a1..52c3af67 100644
--- a/doc/html/gmime-gmime-utils.html
+++ b/doc/html/gmime-gmime-utils.html
@@ -427,7 +427,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     BASE64_ENCODE_LEN(x)</PRE
+>#define BASE64_ENCODE_LEN(x) ((size_t) ((x) * 5 / 3) + 4)  /* conservative would be ((x * 4 / 3) + 4) */</PRE
 ></TD
 ></TR
 ></TABLE
@@ -490,7 +490,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     QP_ENCODE_LEN(x)</PRE
+>#define QP_ENCODE_LEN(x)     ((size_t) ((x) * 7 / 2) + 4)  /* conservative would be ((x * 3) + 4) */</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2108,7 +2108,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_UUDECODE_STATE_INIT</PRE
+>#define GMIME_UUDECODE_STATE_INIT   (0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2134,7 +2134,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_UUDECODE_STATE_BEGIN</PRE
+>#define GMIME_UUDECODE_STATE_BEGIN  (1 &lt;&lt; 16)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2160,7 +2160,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_UUDECODE_STATE_END</PRE
+>#define GMIME_UUDECODE_STATE_END    (1 &lt;&lt; 17)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2186,7 +2186,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_UUDECODE_STATE_MASK</PRE
+>#define GMIME_UUDECODE_STATE_MASK   (GMIME_UUDECODE_STATE_BEGIN | GMIME_UUDECODE_STATE_END)</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/gmime-gmime.html b/doc/html/gmime-gmime.html
index 9c367b83..5fe958c1 100644
--- a/doc/html/gmime-gmime.html
+++ b/doc/html/gmime-gmime.html
@@ -298,7 +298,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     GMIME_INIT_FLAG_UTF8</PRE
+>#define GMIME_INIT_FLAG_UTF8  (1 &lt;&lt; 0)</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/sgml/gmime-disposition.sgml b/doc/sgml/gmime-disposition.sgml
index b004774a..199b6c01 100644
--- a/doc/sgml/gmime-disposition.sgml
+++ b/doc/sgml/gmime-disposition.sgml
@@ -60,7 +60,8 @@ char*       <link linkend="g-mime-disposition-header">g_mime_disposition_header<
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-DISPOSITION-ATTACHMENT-CAPS">GMIME_DISPOSITION_ATTACHMENT</title>
-<programlisting>#define     GMIME_DISPOSITION_ATTACHMENT</programlisting>
+<programlisting>#define GMIME_DISPOSITION_ATTACHMENT "attachment"
+</programlisting>
 <para>
 Standard attachment disposition.</para>
 <para>
@@ -68,7 +69,8 @@ Standard attachment disposition.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-DISPOSITION-INLINE-CAPS">GMIME_DISPOSITION_INLINE</title>
-<programlisting>#define     GMIME_DISPOSITION_INLINE</programlisting>
+<programlisting>#define GMIME_DISPOSITION_INLINE     "inline"
+</programlisting>
 <para>
 Standard inline disposition.</para>
 <para>
diff --git a/doc/sgml/gmime-filter-html.sgml b/doc/sgml/gmime-filter-html.sgml
index 595e0713..58c129b0 100644
--- a/doc/sgml/gmime-filter-html.sgml
+++ b/doc/sgml/gmime-filter-html.sgml
@@ -42,7 +42,8 @@
 <title>Details</title>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-PRE-CAPS">GMIME_FILTER_HTML_PRE</title>
-<programlisting>#define     GMIME_FILTER_HTML_PRE</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_PRE               (1 &lt;&lt; 0)
+</programlisting>
 <para>
 Wrap stream in &lt;pre&gt; tags.</para>
 <para>
@@ -50,7 +51,8 @@ Wrap stream in &lt;pre&gt; tags.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-CONVERT-NL-CAPS">GMIME_FILTER_HTML_CONVERT_NL</title>
-<programlisting>#define     GMIME_FILTER_HTML_CONVERT_NL</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_CONVERT_NL        (1 &lt;&lt; 1)
+</programlisting>
 <para>
 Convert new-lines ('\n') into &lt;br&gt; tags.</para>
 <para>
@@ -58,7 +60,8 @@ Convert new-lines ('\n') into &lt;br&gt; tags.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-CONVERT-SPACES-CAPS">GMIME_FILTER_HTML_CONVERT_SPACES</title>
-<programlisting>#define     GMIME_FILTER_HTML_CONVERT_SPACES</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_CONVERT_SPACES    (1 &lt;&lt; 2)
+</programlisting>
 <para>
 Preserve whitespace by converting spaces into their appropriate
 html entities.</para>
@@ -67,7 +70,8 @@ html entities.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-CONVERT-URLS-CAPS">GMIME_FILTER_HTML_CONVERT_URLS</title>
-<programlisting>#define     GMIME_FILTER_HTML_CONVERT_URLS</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_CONVERT_URLS      (1 &lt;&lt; 3)
+</programlisting>
 <para>
 Wrap detected URLs in &lt;a href=...&gt; tags.</para>
 <para>
@@ -75,7 +79,8 @@ Wrap detected URLs in &lt;a href=...&gt; tags.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-MARK-CITATION-CAPS">GMIME_FILTER_HTML_MARK_CITATION</title>
-<programlisting>#define     GMIME_FILTER_HTML_MARK_CITATION</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_MARK_CITATION     (1 &lt;&lt; 4)
+</programlisting>
 <para>
 Change the colour of citation text.</para>
 <para>
@@ -83,7 +88,8 @@ Change the colour of citation text.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-CONVERT-ADDRESSES-CAPS">GMIME_FILTER_HTML_CONVERT_ADDRESSES</title>
-<programlisting>#define     GMIME_FILTER_HTML_CONVERT_ADDRESSES</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_CONVERT_ADDRESSES (1 &lt;&lt; 5)
+</programlisting>
 <para>
 Wrap email addresses in "mailto:" href tags.</para>
 <para>
@@ -91,7 +97,8 @@ Wrap email addresses in "mailto:" href tags.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-ESCAPE-8BIT-CAPS">GMIME_FILTER_HTML_ESCAPE_8BIT</title>
-<programlisting>#define     GMIME_FILTER_HTML_ESCAPE_8BIT</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_ESCAPE_8BIT       (1 &lt;&lt; 6)
+</programlisting>
 <para>
 Converts 8bit characters to '?'.</para>
 <para>
@@ -99,7 +106,8 @@ Converts 8bit characters to '?'.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-FILTER-HTML-CITE-CAPS">GMIME_FILTER_HTML_CITE</title>
-<programlisting>#define     GMIME_FILTER_HTML_CITE</programlisting>
+<programlisting>#define GMIME_FILTER_HTML_CITE              (1 &lt;&lt; 7)
+</programlisting>
 <para>
 Cites text by prepending "&gt; " to each cited line.</para>
 <para>
diff --git a/doc/sgml/gmime-filter-yenc.sgml b/doc/sgml/gmime-filter-yenc.sgml
index d2c0d1f1..ef6ed5c4 100644
--- a/doc/sgml/gmime-filter-yenc.sgml
+++ b/doc/sgml/gmime-filter-yenc.sgml
@@ -68,13 +68,15 @@ void        <link linkend="g-mime-filter-yenc-set-crc">g_mime_filter_yenc_set_cr
 <title>Details</title>
 <refsect2>
 <title><anchor id="GMIME-YENCODE-CRC-INIT-CAPS">GMIME_YENCODE_CRC_INIT</title>
-<programlisting>#define     GMIME_YENCODE_CRC_INIT</programlisting>
+<programlisting>#define GMIME_YENCODE_CRC_INIT       (~0)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YENCODE-CRC-FINAL-CAPS">GMIME_YENCODE_CRC_FINAL()</title>
-<programlisting>#define     GMIME_YENCODE_CRC_FINAL(crc)</programlisting>
+<programlisting>#define GMIME_YENCODE_CRC_FINAL(crc) (~crc)
+</programlisting>
 <para>
 
 </para><informaltable pgwide="1" frame="none" role="params">
@@ -241,49 +243,57 @@ all the parts.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YENCODE-STATE-INIT-CAPS">GMIME_YENCODE_STATE_INIT</title>
-<programlisting>#define     GMIME_YENCODE_STATE_INIT</programlisting>
+<programlisting>#define GMIME_YENCODE_STATE_INIT     (0)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-INIT-CAPS">GMIME_YDECODE_STATE_INIT</title>
-<programlisting>#define     GMIME_YDECODE_STATE_INIT</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_INIT     (0)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-EOLN-CAPS">GMIME_YDECODE_STATE_EOLN</title>
-<programlisting>#define     GMIME_YDECODE_STATE_EOLN</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_EOLN     (1 &lt;&lt; 8)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-ESCAPE-CAPS">GMIME_YDECODE_STATE_ESCAPE</title>
-<programlisting>#define     GMIME_YDECODE_STATE_ESCAPE</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_ESCAPE   (1 &lt;&lt; 9)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-BEGIN-CAPS">GMIME_YDECODE_STATE_BEGIN</title>
-<programlisting>#define     GMIME_YDECODE_STATE_BEGIN</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_BEGIN    (1 &lt;&lt; 12)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-PART-CAPS">GMIME_YDECODE_STATE_PART</title>
-<programlisting>#define     GMIME_YDECODE_STATE_PART</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_PART     (1 &lt;&lt; 13)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-DECODE-CAPS">GMIME_YDECODE_STATE_DECODE</title>
-<programlisting>#define     GMIME_YDECODE_STATE_DECODE</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_DECODE   (1 &lt;&lt; 14)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-YDECODE-STATE-END-CAPS">GMIME_YDECODE_STATE_END</title>
-<programlisting>#define     GMIME_YDECODE_STATE_END</programlisting>
+<programlisting>#define GMIME_YDECODE_STATE_END      (1 &lt;&lt; 15)
+</programlisting>
 <para>
 
 </para></refsect2>
diff --git a/doc/sgml/gmime-message.sgml b/doc/sgml/gmime-message.sgml
index e9ad7cd8..7443a286 100644
--- a/doc/sgml/gmime-message.sgml
+++ b/doc/sgml/gmime-message.sgml
@@ -89,7 +89,8 @@ void        <link linkend="g-mime-message-foreach-part">g_mime_message_foreach_p
 <title>Details</title>
 <refsect2>
 <title><anchor id="GMIME-RECIPIENT-TYPE-TO-CAPS">GMIME_RECIPIENT_TYPE_TO</title>
-<programlisting>#define     GMIME_RECIPIENT_TYPE_TO</programlisting>
+<programlisting>#define	GMIME_RECIPIENT_TYPE_TO  "To"
+</programlisting>
 <para>
 Recipients in the To: header.</para>
 <para>
@@ -97,7 +98,8 @@ Recipients in the To: header.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-RECIPIENT-TYPE-CC-CAPS">GMIME_RECIPIENT_TYPE_CC</title>
-<programlisting>#define     GMIME_RECIPIENT_TYPE_CC</programlisting>
+<programlisting>#define	GMIME_RECIPIENT_TYPE_CC  "Cc"
+</programlisting>
 <para>
 Recipients in the Cc: header.</para>
 <para>
@@ -105,7 +107,8 @@ Recipients in the Cc: header.</para>
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-RECIPIENT-TYPE-BCC-CAPS">GMIME_RECIPIENT_TYPE_BCC</title>
-<programlisting>#define     GMIME_RECIPIENT_TYPE_BCC</programlisting>
+<programlisting>#define	GMIME_RECIPIENT_TYPE_BCC "Bcc"
+</programlisting>
 <para>
 Recipients in the Bcc: header.</para>
 <para>
diff --git a/doc/sgml/gmime-utils.sgml b/doc/sgml/gmime-utils.sgml
index 26b029da..53f46470 100644
--- a/doc/sgml/gmime-utils.sgml
+++ b/doc/sgml/gmime-utils.sgml
@@ -105,7 +105,8 @@ char*       <link linkend="g-mime-utils-8bit-header-encode-phrase">g_mime_utils_
 <title>Details</title>
 <refsect2>
 <title><anchor id="BASE64-ENCODE-LEN-CAPS">BASE64_ENCODE_LEN()</title>
-<programlisting>#define     BASE64_ENCODE_LEN(x)</programlisting>
+<programlisting>#define BASE64_ENCODE_LEN(x) ((size_t) ((x) * 5 / 3) + 4)  /* conservative would be ((x * 4 / 3) + 4) */
+</programlisting>
 <para>
 
 </para><informaltable pgwide="1" frame="none" role="params">
@@ -121,7 +122,8 @@ char*       <link linkend="g-mime-utils-8bit-header-encode-phrase">g_mime_utils_
 </tbody></tgroup></informaltable></refsect2>
 <refsect2>
 <title><anchor id="QP-ENCODE-LEN-CAPS">QP_ENCODE_LEN()</title>
-<programlisting>#define     QP_ENCODE_LEN(x)</programlisting>
+<programlisting>#define QP_ENCODE_LEN(x)     ((size_t) ((x) * 7 / 2) + 4)  /* conservative would be ((x * 3) + 4) */
+</programlisting>
 <para>
 
 </para><informaltable pgwide="1" frame="none" role="params">
@@ -479,25 +481,29 @@ flush off the last little bit.</para>
 </tbody></tgroup></informaltable></refsect2>
 <refsect2>
 <title><anchor id="GMIME-UUDECODE-STATE-INIT-CAPS">GMIME_UUDECODE_STATE_INIT</title>
-<programlisting>#define     GMIME_UUDECODE_STATE_INIT</programlisting>
+<programlisting>#define GMIME_UUDECODE_STATE_INIT   (0)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-UUDECODE-STATE-BEGIN-CAPS">GMIME_UUDECODE_STATE_BEGIN</title>
-<programlisting>#define     GMIME_UUDECODE_STATE_BEGIN</programlisting>
+<programlisting>#define GMIME_UUDECODE_STATE_BEGIN  (1 &lt;&lt; 16)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-UUDECODE-STATE-END-CAPS">GMIME_UUDECODE_STATE_END</title>
-<programlisting>#define     GMIME_UUDECODE_STATE_END</programlisting>
+<programlisting>#define GMIME_UUDECODE_STATE_END    (1 &lt;&lt; 17)
+</programlisting>
 <para>
 
 </para></refsect2>
 <refsect2>
 <title><anchor id="GMIME-UUDECODE-STATE-MASK-CAPS">GMIME_UUDECODE_STATE_MASK</title>
-<programlisting>#define     GMIME_UUDECODE_STATE_MASK</programlisting>
+<programlisting>#define GMIME_UUDECODE_STATE_MASK   (GMIME_UUDECODE_STATE_BEGIN | GMIME_UUDECODE_STATE_END)
+</programlisting>
 <para>
 
 </para></refsect2>
diff --git a/doc/sgml/gmime.sgml b/doc/sgml/gmime.sgml
index bb15706d..95cfa091 100644
--- a/doc/sgml/gmime.sgml
+++ b/doc/sgml/gmime.sgml
@@ -57,7 +57,8 @@ void        <link linkend="g-mime-init">g_mime_init</link>                     (
 </tbody></tgroup></informaltable></refsect2>
 <refsect2>
 <title><anchor id="GMIME-INIT-FLAG-UTF8-CAPS">GMIME_INIT_FLAG_UTF8</title>
-<programlisting>#define     GMIME_INIT_FLAG_UTF8</programlisting>
+<programlisting>#define GMIME_INIT_FLAG_UTF8  (1 &lt;&lt; 0)
+</programlisting>
 <para>
 Initialization flag to enable UTF-8 interfaces throughout GMime.</para>
 <para>