r22509 - in /packages/unstable/gmime2.4: ./ build/vs2008/ docs/reference/ docs/reference/html/ docs/reference/tmpl/ docs/reference/xml/ gmime/ mono/ tests/

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Dec 6 12:32:44 UTC 2009


Author: meebey
Date: Sun Dec  6 12:32:43 2009
New Revision: 22509

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22509
Log:
Merge commit 'upstream/2.4.11'

Removed:
    packages/unstable/gmime2.4/zenprofiler.h
Modified:
    packages/unstable/gmime2.4/ChangeLog
    packages/unstable/gmime2.4/Makefile.am
    packages/unstable/gmime2.4/Makefile.in
    packages/unstable/gmime2.4/README
    packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
    packages/unstable/gmime2.4/configure
    packages/unstable/gmime2.4/configure.in
    packages/unstable/gmime2.4/depcomp
    packages/unstable/gmime2.4/docs/reference/building.sgml
    packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml
    packages/unstable/gmime2.4/docs/reference/gmime-sections.txt
    packages/unstable/gmime2.4/docs/reference/html/ch01.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-building.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-gpg-context.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
    packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
    packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp
    packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2
    packages/unstable/gmime2.4/docs/reference/html/index.html
    packages/unstable/gmime2.4/docs/reference/html/index.sgml
    packages/unstable/gmime2.4/docs/reference/question_index.sgml
    packages/unstable/gmime2.4/docs/reference/resources.sgml
    packages/unstable/gmime2.4/docs/reference/tmpl/gmime-header.sgml
    packages/unstable/gmime2.4/docs/reference/tmpl/gmime-unused.sgml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-gpg-context.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-header.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-file.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-fs.xml
    packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-mem.xml
    packages/unstable/gmime2.4/gmime.spec
    packages/unstable/gmime2.4/gmime/gmime-cipher-context.c
    packages/unstable/gmime2.4/gmime/gmime-encodings.c
    packages/unstable/gmime2.4/gmime/gmime-filter-charset.c
    packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
    packages/unstable/gmime2.4/gmime/gmime-header.c
    packages/unstable/gmime2.4/gmime/gmime-header.h
    packages/unstable/gmime2.4/gmime/gmime-message.c
    packages/unstable/gmime2.4/gmime/gmime-multipart.c
    packages/unstable/gmime2.4/gmime/gmime-object.c
    packages/unstable/gmime2.4/gmime/gmime-parser.c
    packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c
    packages/unstable/gmime2.4/gmime/gmime-stream-file.c
    packages/unstable/gmime2.4/gmime/gmime-stream-fs.c
    packages/unstable/gmime2.4/gmime/gmime-stream-mem.c
    packages/unstable/gmime2.4/gmime/gmime-utils.c
    packages/unstable/gmime2.4/install-sh
    packages/unstable/gmime2.4/missing
    packages/unstable/gmime2.4/mono/GMime.metadata
    packages/unstable/gmime2.4/mono/gmime-api.raw
    packages/unstable/gmime2.4/mono/gmime-sharp.dll.config.in
    packages/unstable/gmime2.4/tests/test-parser.c

Modified: packages/unstable/gmime2.4/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/ChangeLog?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/ChangeLog [utf-8] (original)
+++ packages/unstable/gmime2.4/ChangeLog [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,3 +1,152 @@
+2009-11-07  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.11
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2009-11-05  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-multipart.c (ptr_array_insert): Fixed to handle an
+	index larger than the current array length as well as fixing the
+	true insert case to shift items when index is les than the current
+	array length (as opposed to when it is equal-to). Thanks to
+	harven at gingers.rulez.pl for finding this bug.
+
+2009-10-10  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-utils.c: Fixed the military timezone offsets.
+
+2009-10-10  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.10
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+	* gmime/gmime-encodings.c (g_mime_encoding_uudecode_step): Fixed a
+	uudecoding bug when uulen % 3 is 2. Thanks to Peter Hartley. Fixes
+	bug #597794.
+
+2009-09-03  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.9
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+	* mono/gmime-sharp.dll.config.in: Fixed the target library
+	version, thanks to MATSUURA Takanori <t.matsuu at gmail.com>.
+
+2009-08-12  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.8
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+	* gmime/gmime-utils.c (charset_convert): If iconv() fails, treat
+	conditions where outleft == 0 the same as if we had gotten an
+	E2BIG error (e.g. we need to grow the output buffer) so that we
+	don't overrun it while appending a '?' placeholder character.
+
+2009-07-02  Stanislav Brabec  <sbrabec at suse.cz>
+
+	* configure.in: Simplified configuring of gmime in a
+	cross-compilation environment. Make it possible to work-around
+	AC_TRY_RUN limitations by copying of target system iconv-detect.h
+	and setting ac_cv_have_iconv_detect_h=yes.
+
+2009-06-12  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-parser.c (g_mime_parser_set_header_regex): Fix
+	non-GLib regex initialization to actually compile.
+
+2009-05-07  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-stream-fs.c (stream_read): Removed gross hack.
+	(stream_write): Same.
+	(g_mime_stream_fs_new): On Windows systems, set the translation
+	mode to BINARY.
+	(g_mime_stream_fs_new_with_bounds): Same.
+
+	* gmime/gmime-stream-file.c: Same as GMimeStreamFs
+
+2009-05-02  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-stream-buffer.c (stream_seek_cache_read): Fixed a
+	64bit cleanlines issue.
+	(stream_seek_cache_read): Cap the max cache size to G_MAXSIZE.
+
+2009-04-27  Jeffrey Stedfast  <fejj at novell.com>
+
+	* README: Bumped version
+
+	* configure.in: Bumped version to 2.4.7
+
+	* build/vs2008/gmime.vcproj: Bumped version.
+
+2009-04-25  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-object.c (g_mime_object_set_disposition): Unref the
+	disposition after setting it on the GMimeObject, don't ref it
+	again. Oops.
+
+	* gmime/gmime-message.c (unblock_changed_event): Oops, this needs
+	to /unblock/ the event handler.
+
+	* gmime/gmime-header.c (g_mime_header_list_set_raw): Added back
+	just in case someone was foolish enough to use this API.
+	(g_mime_header_list_has_raw): Same.
+
+2009-04-24  Jeffrey Stedfast  <fejj at novell.com>
+
+	* gmime/gmime-parser.c (struct _GMimeParserPrivate): Added
+	message_headers_begin/end and changed the meaning of
+	headers_begin/end to be for the current MIME part rather than for
+	the current message itself.
+	(g_mime_parser_init): Init the boolean state variables before
+	calling parser_init() so that parser_init() can use them.
+	(parser_init): Only create a rawbuf if our stream isn't seekable
+	or isn't persistent. Initialize our new message_headers_begin/end.
+	(g_mime_parser_set_persist_stream): If our persist mode has
+	changed, malloc or free our rawbuf.
+	(raw_header_append): Don't append any data if rawbuf is NULL (this
+	means we're keeping track of offsets instead).
+	(parser_step_headers): Always update headers_begin/end since we
+	now always want to keep track of all header begin/end offsets.
+	(parser_step): Update our message_headers_begin/end state.
+	(parser_scan_message_part): Set the mime-part's raw header stream
+	on the message too.
+	(parser_construct_message): Same.
+	(parser_construct_leaf_part): Substream the input stream to get
+	our raw header stream to set on the mime-part's header-list.
+	(parser_construct_multipart): Same.
+
+	* gmime/gmime-header.c (struct _GMimeHeaderList): Instead of
+	having a string buffer holding the raw header block content,
+	instead keep a stream. This not only makes it easy for us to keep
+	track of what the header offsets on disk are should the developer
+	want to know, but it also means we don't necessarily have to use
+	duplicate the header block to memory.
+	(g_mime_header_list_set_stream): New function that replaces the
+	old g_mime_header_list_set_raw() and looks much cleaner.
+	(g_mime_header_list_get_stream): New function to access said
+	stream.
+
+	* gmime/gmime-message.c: Fixed uses of
+	g_mime_header_list_set/has_raw().
+	(g_mime_message_set_mime_part): Set the message's raw header
+	stream to NULL.
+
+	* gmime/gmime-multipart.c: Same.
+
+	* tests/test-parser.c (test_parser): Updated.
+
 2009-04-09  Jeffrey Stedfast  <fejj at novell.com>
 
 	* README: Bumped version
@@ -17,7 +166,7 @@
 	simple arithmetic to update our stream->position on Windows since it
 	may do line-ending translation behind our backs. Call ftell() to get
 	our real position after reading or writing.
-	
+
 	* gmime/gmime-stream-fs.c (stream_read, stream_write): Same idea.
 
 	* gmime/gmime-utils.c (mktime_utc): Fixed the Windows code-path.

Modified: packages/unstable/gmime2.4/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/Makefile.am?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/Makefile.am [utf-8] (original)
+++ packages/unstable/gmime2.4/Makefile.am [utf-8] Sun Dec  6 12:32:43 2009
@@ -27,7 +27,6 @@
 	gmime.spec.in 			\
 	iconv-detect.c			\
 	zentimer.h 			\
-	zenprofiler.h			\
 	gtk-doc.make
 
 BUILD_EXTRA_DIST = 			\

Modified: packages/unstable/gmime2.4/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/Makefile.in?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/Makefile.in [utf-8] (original)
+++ packages/unstable/gmime2.4/Makefile.in [utf-8] Sun Dec  6 12:32:43 2009
@@ -242,7 +242,6 @@
 	gmime.spec.in 			\
 	iconv-detect.c			\
 	zentimer.h 			\
-	zenprofiler.h			\
 	gtk-doc.make
 
 BUILD_EXTRA_DIST = \

Modified: packages/unstable/gmime2.4/README
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/README?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/README [utf-8] (original)
+++ packages/unstable/gmime2.4/README [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,11 +1,11 @@
-                            GMime, version 2.4.6
+                            GMime, version 2.4.11
                    by Jeffrey Stedfast <fejj at gnome.org>
 
 
 WHAT IS GMIME
 -------------
 
-GMime is a set of utilities for parsing and creating messages using
+GMime is a C/C++ library for parsing and creating messages using
 the Multipurpose Internet Mail Extension (MIME) as defined by the
 following RFCs:
 
@@ -35,11 +35,13 @@
          Sets, Languages, and Continuations (Obsoletes rfc2184)
  * 2822: Internet Message Format (Obsoletes rfc822)
  * 3156: MIME Security with OpenPGP (Updates rfc2015)
+ * 5322: Internet Message Format (Obsoletes rfc2822)
 
 Other RFCs of interest:
 
  * 1872: The MIME Multipart/Related Content-type
  * 1927: Suggested Additional MIME Types for Associating Documents
+ * 2111: Content-ID and Message-ID Uniform Resource Locators
  * 2311: S/MIME Version 2 Message Specification
  * 2312: S/MIME Version 2 Certificate Handling
  * 2387: The Multipart/Related Content-Type.
@@ -99,9 +101,8 @@
 
 Sources to GMime may be obtained from:
   http://download.gnome.org/pub/GNOME/sources/gmime/
+or
   ftp://ftp.gnome.org/pub/GNOME/sources/gmime/
-or
-  http://spruce.sourceforge.net/gmime/sources/
 
 Information regarding GMime may be obtained from the Spruce home page:
   http://spruce.sourceforge.net/gmime/
@@ -118,7 +119,8 @@
 For proper compilation and functionality of GMime, the following packages
 are REQUIRED:
 
-  - Glib version 2.x
+  - Glib version >= 2.12.0
+
     Glib provides a number of portability-enhancing functions and types.
     Glib is included in most GMime-supported operating system
     distributions.  Glib sources may be obtained from:
@@ -138,9 +140,6 @@
   docs/tutorial/        Contains SGML and HTML versions of the GMime
                         tutorial
 
-  rfc/                  Contains text versions of the RFCs for the
-                        specifications GMime supports
-
   AUTHORS               List of primary authors (source code developers)
 
   COPYING               The GNU General Public License, version 2
@@ -158,7 +157,7 @@
 
 
 You can find online developer documentation at
-http://spruce.sourceforge.net/gmime/doc
+http://library.gnome.org/devel/gmime/stable/
 
 
 MAILING-LIST

Modified: packages/unstable/gmime2.4/build/vs2008/gmime.vcproj
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/build/vs2008/gmime.vcproj?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] (original)
+++ packages/unstable/gmime2.4/build/vs2008/gmime.vcproj [utf-8] Sun Dec  6 12:32:43 2009
@@ -41,7 +41,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;5&quot;"
+				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;11&quot;"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;..\..\&quot;; &quot;..\..\util&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\&quot;GMime\&quot;"
@@ -106,7 +106,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;5&quot;"
+				AdditionalOptions="/D &quot;GMIME_MAJOR_VERSION&quot;=&quot;2&quot; /D &quot;GMIME_MINOR_VERSION&quot;=&quot;4&quot; /D &quot;GMIME_MICRO_VERSION&quot;=&quot;11&quot;"
 				AdditionalIncludeDirectories="&quot;..\..\&quot;; &quot;..\..\util&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMIME_EXPORTS;HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_LOG_DOMAIN=\&quot;GMime\&quot;"
 				RuntimeLibrary="2"

Modified: packages/unstable/gmime2.4/configure
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure [utf-8] (original)
+++ packages/unstable/gmime2.4/configure [utf-8] Sun Dec  6 12:32:43 2009
@@ -2104,7 +2104,7 @@
 
 GMIME_MAJOR_VERSION=2
 GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=6
+GMIME_MICRO_VERSION=11
 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
 
@@ -17888,14 +17888,18 @@
 
 { $as_echo "$as_me:$LINENO: checking preferred charset formats for system iconv" >&5
 $as_echo_n "checking preferred charset formats for system iconv... " >&6; }
-if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+if test "${ac_cv_have_iconv_detect_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+	if test "$cross_compiling" = yes; then
+
+		{ $as_echo "$as_me:$LINENO: result: cannot run test program while cross compiling" >&5
+$as_echo "cannot run test program while cross compiling" >&6; }
+		{ { $as_echo "$as_me:$LINENO: error: Copy target system's iconv-detect.h to . and configure with ac_cv_have_iconv_detect_h=yes" >&5
+$as_echo "$as_me: error: Copy target system's iconv-detect.h to . and configure with ac_cv_have_iconv_detect_h=yes" >&2;}
+   { (exit 1); exit 1; }; }
+
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17904,8 +17908,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-#define CONFIGURE_IN
-#include "iconv-detect.c"
+		#define CONFIGURE_IN
+		#include "iconv-detect.c"
 
 _ACEOF
 rm -f conftest$ac_exeext
@@ -17930,22 +17934,33 @@
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-
-	{ $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV_DETECT_H 1
-_ACEOF
-
-
+  ac_cv_have_iconv_detect_h=yes
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-
+ac_cv_have_iconv_detect_h=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_iconv_detect_h" >&5
+$as_echo "$ac_cv_have_iconv_detect_h" >&6; }
+if test "x$ac_cv_have_iconv_detect_h" = xyes; then
+	{ $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ICONV_DETECT_H 1
+_ACEOF
+
+else
 	{ $as_echo "$as_me:$LINENO: result: not found
 	*** The iconv-detect program was unable to determine the
 	*** preferred charset formats recognized by your system
@@ -17964,13 +17979,7 @@
 	***
 	*** Default charset formats will be used.
 	" >&6; }
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
+fi
 
 CFLAGS="$CFLAGS_save"
 LIBS="$LIBS_save"

Modified: packages/unstable/gmime2.4/configure.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/configure.in?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/configure.in [utf-8] (original)
+++ packages/unstable/gmime2.4/configure.in [utf-8] Sun Dec  6 12:32:43 2009
@@ -12,7 +12,7 @@
 
 GMIME_MAJOR_VERSION=2
 GMIME_MINOR_VERSION=4
-GMIME_MICRO_VERSION=6
+GMIME_MICRO_VERSION=11
 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
 
@@ -181,14 +181,21 @@
 LIBS_save="$LIBS"
 LIBS="$LIBS $LIBICONV"
 
-AC_MSG_CHECKING(preferred charset formats for system iconv)
-AC_TRY_RUN([
-#define CONFIGURE_IN
-#include "iconv-detect.c"
-],[
-	AC_MSG_RESULT(found)
+AC_CACHE_CHECK([preferred charset formats for system iconv], [ac_cv_have_iconv_detect_h], [
+	AC_RUN_IFELSE([AC_LANG_SOURCE([
+		#define CONFIGURE_IN
+		#include "iconv-detect.c"
+		])],
+	[ac_cv_have_iconv_detect_h=yes], [ac_cv_have_iconv_detect_h=no],
+	[
+		AC_MSG_RESULT([cannot run test program while cross compiling])
+		AC_MSG_ERROR([Copy target system's iconv-detect.h to . and configure with ac_cv_have_iconv_detect_h=yes])
+	])
+])
+if test "x$ac_cv_have_iconv_detect_h" = xyes; then
+	AC_MSG_RESULT([found])
 	AC_DEFINE(HAVE_ICONV_DETECT_H, 1, [Define to 1 to use auto-detected iconv-friendly charset names.])
-],[
+else
 	AC_MSG_RESULT([not found
 	*** The iconv-detect program was unable to determine the
 	*** preferred charset formats recognized by your system
@@ -198,7 +205,7 @@
 	*** 
 	*** Default charset formats will be used.
 	])
-])
+fi
 
 CFLAGS="$CFLAGS_save"
 LIBS="$LIBS_save"

Modified: packages/unstable/gmime2.4/depcomp
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/depcomp?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/depcomp [utf-8] (original)
+++ packages/unstable/gmime2.4/depcomp [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+scriptversion=2007-03-29.01
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -201,34 +215,39 @@
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +295,46 @@
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +347,13 @@
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is

Modified: packages/unstable/gmime2.4/docs/reference/building.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/building.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/building.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/building.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,4 +1,4 @@
-<refentry id="gmime-building" revision="27 Dec 2007">
+<refentry id="gmime-building" revision="11 Apr 2009">
   <refmeta>
     <refentrytitle>Compiling the GMime libraries</refentrytitle>
     <manvolnum>3</manvolnum>
@@ -222,7 +222,7 @@
 	arguments for the other GMime libraries are described in
 	the documentation distributed with those libraries.)
 
-	<cmdsynopsis><command>./configure</command><group><arg>--enable-profiling</arg><arg>--enable-warnings</arg><arg>--enable-mono</arg><arg>--enable-gtk-doc</arg><arg>--enable-rfc2047-workarounds</arg><arg>--enable-largfile</arg></group></cmdsynopsis>
+	<cmdsynopsis><command>./configure</command><group><arg>--enable-profiling</arg><arg>--enable-warnings</arg><arg>--enable-mono</arg><arg>--enable-gtk-doc</arg><arg>--enable-largfile</arg></group></cmdsynopsis>
     </para>
     <formalpara>
       <title>
@@ -242,8 +242,8 @@
         <systemitem>--enable-warnings</systemitem>
       </title>
       <para>
-        This option enables more verbose warnings to be used during
-        compilation of the libraries. Again, it is unlikely you will
+        This option enables parser warnings about invalid MIME to be
+        logged to stderr at runtime. Again, it is unlikely you will
         care to use this option.
       </para>
     </formalpara>
@@ -268,30 +268,13 @@
     </formalpara>
     <formalpara>
       <title>
-        <systemitem>--enable-rfc2047-workarounds</systemitem>
-      </title>
-      <para>
-        This option will enable work-arounds for common bugs in
-        other E-Mail software's rfc2047 encoders.
-      </para>
-    </formalpara>
-    <formalpara>
-      <title>
         <systemitem>--enable-largefile</systemitem>
       </title>
       <para>
-        This option will enable large file support (e.g. files
-        larger than 2GB) on 32bit systems.
-      </para>
-      <para>
-        Note that enabling this feature will change GMime's ABI.
-        It is strongly advised that you not enable this feature
-        unless you (re)build all software depending on GMime
-        with large file support as well.
-      </para>
-    </formalpara>
-  </refsect1>
-<!-- Local Variables: -->
-<!-- sgml-parent-document: ("gmime-docs.sgml" "chapter" "refentry")  -->
-<!-- End: -->
+        This option will enable large file support (e.g. files larger
+        than 2GB) on 32bit systems. This flag is enabled by default
+        starting with GMime 2.4.5.
+      </para>
+    </formalpara>
+  </refsect1>
 </refentry>

Modified: packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/gmime-docs.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -82,7 +82,7 @@
       </author>
     </authorgroup>
     <copyright>
-      <year>2000-2008</year>
+      <year>2000-2009</year>
       <holder>Jeffrey Stedfast</holder>
     </copyright>
 

Modified: packages/unstable/gmime2.4/docs/reference/gmime-sections.txt
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/gmime-sections.txt?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/gmime-sections.txt [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/gmime-sections.txt [utf-8] Sun Dec  6 12:32:43 2009
@@ -602,6 +602,8 @@
 g_mime_header_list_register_writer
 g_mime_header_list_write_to_stream
 g_mime_header_list_to_string
+g_mime_header_list_get_stream
+g_mime_header_list_set_stream
 g_mime_header_list_has_raw
 g_mime_header_list_set_raw
 </SECTION>

Modified: packages/unstable/gmime2.4/docs/reference/html/ch01.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/ch01.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/ch01.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -35,9 +35,11 @@
 </tr></table>
 <div class="chapter" lang="en">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id2579817"></a>Class hierarchy</h2></div></div></div>
+<a name="id2579656"></a>Class hierarchy</h2></div></div></div>
 <pre class="screen">
-    GMimeHeader
+    <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-header.html#GMimeHeader"
+>GMimeHeader</a>
     <a class="link" href="gmime-gmime-param.html#GMimeParam" title="GMimeParam">GMimeParam</a>
     GObject
         <a class="link" href="gmime-gmime-disposition.html#GMimeContentDisposition">GMimeContentDisposition</a>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-building.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-building.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-building.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-building.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -249,7 +249,7 @@
 	the documentation distributed with those libraries.)
 
 	</p>
-<div class="cmdsynopsis"><p><code class="command">./configure</code>  [[--enable-profiling] |  [--enable-warnings] |  [--enable-mono] |  [--enable-gtk-doc] |  [--enable-rfc2047-workarounds] |  [--enable-largfile]]</p></div>
+<div class="cmdsynopsis"><p><code class="command">./configure</code>  [[--enable-profiling] |  [--enable-warnings] |  [--enable-mono] |  [--enable-gtk-doc] |  [--enable-largfile]]</p></div>
 <p>
     </p>
 <p><b>
@@ -265,8 +265,8 @@
 <p><b>
         <code class="systemitem">--enable-warnings</code>
       . </b>
-        This option enables more verbose warnings to be used during
-        compilation of the libraries. Again, it is unlikely you will
+        This option enables parser warnings about invalid MIME to be
+        logged to stderr at runtime. Again, it is unlikely you will
         care to use this option.
       </p>
 <p><b>
@@ -283,21 +283,11 @@
         reading now).
       </p>
 <p><b>
-        <code class="systemitem">--enable-rfc2047-workarounds</code>
-      . </b>
-        This option will enable work-arounds for common bugs in
-        other E-Mail software's rfc2047 encoders.
-      </p>
-<p><b>
         <code class="systemitem">--enable-largefile</code>
       . </b>
-        This option will enable large file support (e.g. files
-        larger than 2GB) on 32bit systems.
-      
-        Note that enabling this feature will change GMime's ABI.
-        It is strongly advised that you not enable this feature
-        unless you (re)build all software depending on GMime
-        with large file support as well.
+        This option will enable large file support (e.g. files larger
+        than 2GB) on 32bit systems. This flag is enabled by default
+        starting with GMime 2.4.5.
       </p>
 </div>
 </div>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-0.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2554045"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
+<a name="id2553968"></a><h2>Incompatible changes from 1.0 to 2.0</h2>
 <p>
 See also the PORTING document in the toplevel GMime source directory.
 </p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-2.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -43,7 +43,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2553758"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
+<a name="id2553681"></a><h2>Incompatible changes from 2.0 to 2.2</h2>
 <p>See also the PORTING document in the toplevel GMime source directory.</p>
 <p>There are no incompatible changes between 2.0 and 2.2.</p>
 <p>GMime 2.2 is both API and ABI compatible with GMime 2.0 meaning
@@ -55,7 +55,7 @@
 be deprecated in some future version, probably 3.0).</p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2555031"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
+<a name="id2554954"></a><h2>Replacement interfaces from 2.0 to 2.2</h2>
 <div class="itemizedlist"><ul type="disc">
 <li><p>
 <code class="function">g_mime_utils_8bit_header_decode()</code> has been split

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-changes-2-4.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -43,7 +43,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2554693"></a><h2>Changes from 2.2 to 2.4</h2>
+<a name="id2554616"></a><h2>Changes from 2.2 to 2.4</h2>
 <p>GMime 2.4 has had a number of API changes since GMime
 2.2. To start, ALL public APIs that used to use off_t in GMime 2.2 now
 use gint64 so that the API and ABI do not change based on whether or

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-compiling.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2553460"></a><h2>Compiling GMime Applications on UNIX</h2>
+<a name="id2553383"></a><h2>Compiling GMime Applications on UNIX</h2>
 <p>
 To compile a GMime application, you need to tell the compiler where to 
 find the GMime header files and libraries. This is done with the

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-cipher-context.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -1243,21 +1243,21 @@
 <a name="g-mime-signer-get-name"></a><h3>g_mime_signer_get_name ()</h3>
 <pre class="programlisting">const char*         g_mime_signer_get_name              (<a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner">GMimeSigner</a> *signer);</pre>
 <p>
-Get the signer trust.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>signer</code></em> :</span></p></td>
-<td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner"><span class="type">GMimeSigner</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the signer trust.
+Get the signer's name.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>signer</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-cipher-context.html#GMimeSigner" title="GMimeSigner"><span class="type">GMimeSigner</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> the signer's name.
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-encodings.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -676,7 +676,9 @@
 <pre class="programlisting">#define GMIME_UUDECODE_STATE_INIT   (0)
 </pre>
 <p>
-Initial state for the <code class="function">g_mime_utils_uudecode_step()</code> function.</p>
+Initial state for the <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-utils.html#g-mime-utils-uudecode-step"
+><code class="function">g_mime_utils_uudecode_step()</code></a> function.</p>
 <p>
 
 </p>
@@ -687,7 +689,9 @@
 <pre class="programlisting">#define GMIME_UUDECODE_STATE_BEGIN  (1 &lt;&lt; 16)
 </pre>
 <p>
-State for the <code class="function">g_mime_utils_uudecode_step()</code> function, denoting that
+State for the <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-utils.html#g-mime-utils-uudecode-step"
+><code class="function">g_mime_utils_uudecode_step()</code></a> function, denoting that
 the 'begin' line has been found.</p>
 <p>
 
@@ -699,7 +703,9 @@
 <pre class="programlisting">#define GMIME_UUDECODE_STATE_END    (1 &lt;&lt; 17)
 </pre>
 <p>
-State for the <code class="function">g_mime_utils_uudecode_step()</code> function, denoting that
+State for the <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-utils.html#g-mime-utils-uudecode-step"
+><code class="function">g_mime_utils_uudecode_step()</code></a> function, denoting that
 the end of the UU encoded block has been found.</p>
 <p>
 

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-gpg-context.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-gpg-context.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-gpg-context.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-gpg-context.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -169,7 +169,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>always_trust</code></em> :</span></p></td>
-<td> always truct flag
+<td> always trust flag
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-header.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -101,6 +101,9 @@
 ssize_t             <a class="link" href="gmime-gmime-header.html#g-mime-header-list-write-to-stream" title="g_mime_header_list_write_to_stream ()">g_mime_header_list_write_to_stream</a>  (const <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers,
                                                          <a class="link" href="gmime-gmime-stream.html#GMimeStream">GMimeStream</a> *stream);
 char*               <a class="link" href="gmime-gmime-header.html#g-mime-header-list-to-string" title="g_mime_header_list_to_string ()">g_mime_header_list_to_string</a>        (const <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers);
+<a class="link" href="gmime-gmime-stream.html#GMimeStream">GMimeStream</a>*        <a class="link" href="gmime-gmime-header.html#g-mime-header-list-get-stream" title="g_mime_header_list_get_stream ()">g_mime_header_list_get_stream</a>       (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers);
+void                <a class="link" href="gmime-gmime-header.html#g-mime-header-list-set-stream" title="g_mime_header_list_set_stream ()">g_mime_header_list_set_stream</a>       (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers,
+                                                         <a class="link" href="gmime-gmime-stream.html#GMimeStream">GMimeStream</a> *stream);
 gboolean            <a class="link" href="gmime-gmime-header.html#g-mime-header-list-has-raw" title="g_mime_header_list_has_raw ()">g_mime_header_list_has_raw</a>          (const <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers);
 void                <a class="link" href="gmime-gmime-header.html#g-mime-header-list-set-raw" title="g_mime_header_list_set_raw ()">g_mime_header_list_set_raw</a>          (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers,
                                                          const char *raw);
@@ -109,7 +112,9 @@
 <div class="refsect1" lang="en">
 <a name="gmime-gmime-header.description"></a><h2>Description</h2>
 <p>
-A <span class="type">GMimeHeader</span> is a collection of rfc822 header fields and their
+A <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-header.html#GMimeHeader"
+><span class="type">GMimeHeader</span></a> is a collection of rfc822 header fields and their
 values.</p>
 <p>
 
@@ -140,8 +145,12 @@
 </td>
 </tr>
 <tr>
-<td><p><span class="term">GMimeHeader *<em class="structfield"><code>cursor</code></em>;</span></p></td>
-<td> a <span class="type">GMimeHeader</span>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-header.html#GMimeHeader"
+>GMimeHeader</a> *<em class="structfield"><code>cursor</code></em>;</span></p></td>
+<td> a <a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-header.html#GMimeHeader"
+><span class="type">GMimeHeader</span></a>
 </td>
 </tr>
 <tr>
@@ -170,7 +179,9 @@
                                                          const char *value);</pre>
 <p>
 Function signature for the callback to
-<code class="function">g_mime_header_register_writer()</code>.</p>
+<a
+href="/usr/share/gtk-doc/html/gmime/gmime-gmime-header.html#g-mime-header-register-writer"
+><code class="function">g_mime_header_register_writer()</code></a>.</p>
 <p>
 
 </p>
@@ -958,8 +969,69 @@
 </div>
 <hr>
 <div class="refsect2" lang="en">
+<a name="g-mime-header-list-get-stream"></a><h3>g_mime_header_list_get_stream ()</h3>
+<pre class="programlisting"><a class="link" href="gmime-gmime-stream.html#GMimeStream">GMimeStream</a>*        g_mime_header_list_get_stream       (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers);</pre>
+<p>
+Gets the raw stream representing <em class="parameter"><code>headers</code></em>.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>headers</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList"><span class="type">GMimeHeaderList</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-stream.html#GMimeStream"><span class="type">GMimeStream</span></a> if set or <code class="literal">NULL</code> otherwise.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since  2.4.7
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="g-mime-header-list-set-stream"></a><h3>g_mime_header_list_set_stream ()</h3>
+<pre class="programlisting">void                g_mime_header_list_set_stream       (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers,
+                                                         <a class="link" href="gmime-gmime-stream.html#GMimeStream">GMimeStream</a> *stream);</pre>
+<p>
+Set the raw header stream.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>headers</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList"><span class="type">GMimeHeaderList</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
+<td> a <a class="link" href="gmime-gmime-stream.html#GMimeStream"><span class="type">GMimeStream</span></a>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since  2.4.7
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
 <a name="g-mime-header-list-has-raw"></a><h3>g_mime_header_list_has_raw ()</h3>
 <pre class="programlisting">gboolean            g_mime_header_list_has_raw          (const <a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">g_mime_header_list_has_raw</code> has been deprecated since version 2.4.7 and should not be used in newly-written code. Use <a class="link" href="gmime-gmime-header.html#g-mime-header-list-get-stream" title="g_mime_header_list_get_stream ()"><code class="function">g_mime_header_list_get_stream()</code></a> and check
+against NULL instead.</p>
+</div>
 <p>
 Gets whether or not a raw header has been set on <em class="parameter"><code>headers</code></em>.</p>
 <p>
@@ -976,6 +1048,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td> <code class="literal">TRUE</code> if a raw header is set or <code class="literal">FALSE</code> otherwise.
+
 </td>
 </tr>
 </tbody>
@@ -986,6 +1059,10 @@
 <a name="g-mime-header-list-set-raw"></a><h3>g_mime_header_list_set_raw ()</h3>
 <pre class="programlisting">void                g_mime_header_list_set_raw          (<a class="link" href="gmime-gmime-header.html#GMimeHeaderList" title="GMimeHeaderList">GMimeHeaderList</a> *headers,
                                                          const char *raw);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">g_mime_header_list_set_raw</code> has been deprecated since version 2.4.7 and should not be used in newly-written code. Use <a class="link" href="gmime-gmime-header.html#g-mime-header-list-set-stream" title="g_mime_header_list_set_stream ()"><code class="function">g_mime_header_list_set_stream()</code></a> instead.</p>
+</div>
 <p>
 Set the raw header.</p>
 <p>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-file.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -115,7 +115,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fp</code></em> :</span></p></td>
-<td> file pointer
+<td> a FILE pointer
 </td>
 </tr>
 <tr>
@@ -147,7 +147,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fp</code></em> :</span></p></td>
-<td> file pointer
+<td> a FILE pointer
 </td>
 </tr>
 <tr>
@@ -182,7 +182,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
-<td> file stream
+<td> a <a class="link" href="gmime-gmime-stream-file.html#GMimeStreamFile"><span class="type">GMimeStreamFile</span></a>
 </td>
 </tr>
 <tr>
@@ -213,12 +213,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
-<td> file stream
+<td> a <a class="link" href="gmime-gmime-stream-file.html#GMimeStreamFile"><span class="type">GMimeStreamFile</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> owner
+<td> <code class="literal">TRUE</code> if this stream should own the FILE pointer or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-fs.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -136,7 +136,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fd</code></em> :</span></p></td>
-<td> file descriptor
+<td> a file descriptor
 </td>
 </tr>
 <tr>
@@ -171,7 +171,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
-<td> fs stream
+<td> a <a class="link" href="gmime-gmime-stream-fs.html#GMimeStreamFs"><span class="type">GMimeStreamFs</span></a>
 </td>
 </tr>
 <tr>
@@ -189,7 +189,7 @@
 <pre class="programlisting">void                g_mime_stream_fs_set_owner          (<a class="link" href="gmime-gmime-stream-fs.html#GMimeStreamFs">GMimeStreamFs</a> *stream,
                                                          gboolean owner);</pre>
 <p>
-Sets whether or not <em class="parameter"><code>stream</code></em> owns the backend FS pointer.
+Sets whether or not <em class="parameter"><code>stream</code></em> owns the backend file descriptor.
 </p>
 <p>
 Note: <em class="parameter"><code>owner</code></em> should be <code class="literal">TRUE</code> if the stream should <code class="function">close()</code> the
@@ -202,12 +202,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
-<td> fs stream
+<td> a <a class="link" href="gmime-gmime-stream-fs.html#GMimeStreamFs"><span class="type">GMimeStreamFs</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> owner
+<td> <code class="literal">TRUE</code> if this stream should own the file descriptor or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-gmime-stream-mem.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -209,7 +209,7 @@
 </p>
 <p>
 Note: The memory stream is not responsible for freeing the byte
-array.</p>
+array. Use <a class="link" href="gmime-gmime-stream-mem.html#g-mime-stream-mem-set-owner" title="g_mime_stream_mem_set_owner ()"><code class="function">g_mime_stream_mem_set_owner()</code></a> to change this behavior.</p>
 <p>
 
 </p>
@@ -279,7 +279,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>owner</code></em> :</span></p></td>
-<td> owner
+<td> <code class="literal">TRUE</code> if this stream should own the <span class="type">GByteArray</span> or <code class="literal">FALSE</code> otherwise
 </td>
 </tr>
 </tbody>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-question-index.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2555285"></a><h2>Questions and Answers</h2>
+<a name="id2555240"></a><h2>Questions and Answers</h2>
 <p>This is an "index" of the reference manual
     organized by common "How do I..." questions. If you
     aren't sure which documentation to read for the question you have,
@@ -55,10 +55,10 @@
 <col align="left" width="1%">
 <tbody>
 <tr class="qandadiv"><td align="left" valign="top" colspan="2"><h5 class="title">
-<a name="id2555299"></a>1. General</h5></td></tr>
+<a name="id2555255"></a>1. General</h5></td></tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="id2556008"></a><a name="id2556010"></a><p><b>1.1.</b></p>
+<a name="id2555260"></a><a name="id2555263"></a><p><b>1.1.</b></p>
 </td>
 <td align="left" valign="top"><p>Where can I get help with GMime, submit a bug report, or make a feature request?</p></td>
 </tr>
@@ -69,42 +69,38 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="id2556029"></a><a name="id2556031"></a><p><b>1.2.</b></p>
+<a name="id2555318"></a><a name="id2555321"></a><p><b>1.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I port from one GMime version to another?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
-<td align="left" valign="top">
-<p>See the <a class="link" href="gmime-changes-2-0.html" title="Changes from 1.0 to 2.0">list of
-            incompatible changes from 1.0 to 2.0</a>.</p>
-<p>If you have a question not covered in the manual,
-            feel free to ask me personally by emailing me at <a class="ulink" href="mailto:fejj at ximian.com" target="_top">fejj at ximian.com</a>.
-            </p>
-</td>
+<td align="left" valign="top"><p>See the <a class="link" href="gmime-changes-2-4.html" title="Changes from 2.2 to 2.4">list of
+            incompatible changes from 2.2 to 2.4</a>.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="id2556060"></a><a name="id2556063"></a><p><b>1.3.</b></p>
+<a name="id2555342"></a><a name="id2555344"></a><p><b>1.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How does memory management work in GMime? Should I free data returned from functions?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top">
-<p>See the documentation for <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html" target="_top">GObject</a>. For <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html" target="_top">GObject</a> note specifically <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#g-object-ref" target="_top">g_object_ref()</a> and <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#g-object-unref" target="_top">g_object_unref()</a>.
-            </p>
-<p>For strings returned from functions, they will be
+<p>Most accessor functions return a pointer to internal
+	    members. When these internal members are objects
+	    themselves (e.g. subclasses
+	    of <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html" target="_top">GObject</a>),
+	    there is no need to unref them unless otherwise stated in
+	    the documentation for that particular function.</p>
+<p>For accessor functions that return strings, they will be
             declared "const" if they should not be freed. Non-const
-            strings should be freed with <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/glib/glib-Memory-Allocation.html#g-free" target="_top">g_free()</a>. Arrays follow the same
-            rule.  (If you find an exception to the rules, please
-            report a bug to <a class="ulink" href="http://bugzilla.gnome.org" target="_top">http://bugzilla.gnome.org</a>.)
-            </p>
+            strings should be freed with <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/glib/glib-Memory-Allocation.html#g-free" target="_top">g_free()</a>.</p>
 </td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="id2556123"></a><a name="id2556125"></a><p><b>1.4.</b></p>
+<a name="id2555382"></a><a name="id2555384"></a><p><b>1.4.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I use GMime with threads?</p></td>
 </tr>
@@ -113,14 +109,20 @@
 <td align="left" valign="top">
 <p>First, read the <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/glib/glib-Threads.html" target="_top">GThread</a> documentation for
             portable threading primitives.</p>
-<p>Secondly, all functions in gmime-charset, gmime-iconv and gmime-utils should be
-            thread-safe. Objects subclassing <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html" target="_top">GObject</a> are not.
+<p>Secondly, all functions
+            in gmime-charset, gmime-iconv
+            and gmime-utils should
+            be thread-safe. Objects subclassing 
+            <a class="ulink" href="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html" target="_top">GObject</a>
+            are not. This means that you'll have to do your own mutex
+            locking if you want to access the same GObjects from
+            multiple threads.
             </p>
 </td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="id2556172"></a><a name="id2556174"></a><p><b>1.5.</b></p>
+<a name="id2556113"></a><a name="id2556115"></a><p><b>1.5.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I use GMime with C++?</p></td>
 </tr>
@@ -129,18 +131,6 @@
 <td align="left" valign="top"><p>The GMime header files use the subset of C that's
             also valid C++, so you can simply use the normal GMime API
             in a C++ program.</p></td>
-</tr>
-<tr class="question">
-<td align="left" valign="top">
-<a name="id2556189"></a><a name="id2556191"></a><p><b>1.6.</b></p>
-</td>
-<td align="left" valign="top"><p>How do I use GMime with other non-C languages?</p></td>
-</tr>
-<tr class="answer">
-<td align="left" valign="top"></td>
-<td align="left" valign="top"><p>As of June 18th, 2003 there is now a set of Perl
-            bindings for GMime called <a class="ulink" href="http://search.cpan.org/dist/MIME-Fast/" target="_top">MIME::Fast</a>. Thanks
-            to Piotr Klaban for his efforts.</p></td>
 </tr>
 </tbody>
 </table></div>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime-resources.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -45,7 +45,7 @@
 <td valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1" lang="en">
-<a name="id2554871"></a><h2>Filing a bug report or feature request</h2>
+<a name="id2554794"></a><h2>Filing a bug report or feature request</h2>
 <p>
 If you encounter a bug, misfeature, or missing feature in GMime, please
 file a bug report at 
@@ -61,26 +61,31 @@
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2554909"></a><h2>Submitting Patches</h2>
+<a name="id2554832"></a><h2>Submitting Patches</h2>
 <p>
 If you develop a bugfix or enhancement for GMime, please file that in
 Bugzilla as well. Bugzilla allows you to attach files; please attach a
 patch generated by the <span class="command"><strong>diff</strong></span> utility, using the 
-<code class="option">-u</code> option to make the patch more readable. All patches 
-must be offered under the terms of the GNU GPL license, so be sure you 
-are authorized to give us the patch under those terms.
+<code class="option">-u</code> option to make the patch more readable. All
+patches must be offered under the terms of
+the <a class="ulink" href="http://www.gnu.org/licenses/lgpl-2.1.txt" target="_top">LGPLv2.1</a>
+license, so be sure you are authorized to give us the patch under
+those terms.
 </p>
 <p>
 If you want to discuss your patch before or after developing it, mail
-<a class="ulink" href="mailto:fejj at ximian.com" target="_top">fejj at ximian.com</a>.  But be
-sure to file the Bugzilla report as well, this way it's less likely to
-slip through the cracks.
+<a class="ulink" href="mailto:gmime-devel-list at gnome.org" target="_top">gmime-devel-list at gnome.org</a>,
+but be sure to file
+the <a class="ulink" href="http://bugzilla.gnome.org" target="_top">Bugzilla</a> report as
+well, this way it's less likely to slip through the cracks.
 </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2554945"></a><h2>Mailing lists</h2>
-<p>
-There are currently no mailing lists dedicated to GMime.
+<a name="id2554878"></a><h2>Mailing lists</h2>
+<p>There is currently only one mailing-list devoted to GMime
+    itself which is for both the development of and development with
+    GMime. You can subscribe to this list
+    at <a class="ulink" href="http://mail.gnome.org/mailman/listinfo/gmime-devel-list" target="_top">http://mail.gnome.org/mailman/listinfo/gmime-devel-list</a>.
 </p>
 </div>
 </div>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp [utf-8] Sun Dec  6 12:32:43 2009
@@ -337,6 +337,8 @@
     <function name="g_mime_header_list_register_writer ()" link="gmime-gmime-header.html#g-mime-header-list-register-writer"/>
     <function name="g_mime_header_list_write_to_stream ()" link="gmime-gmime-header.html#g-mime-header-list-write-to-stream"/>
     <function name="g_mime_header_list_to_string ()" link="gmime-gmime-header.html#g-mime-header-list-to-string"/>
+    <function name="g_mime_header_list_get_stream ()" link="gmime-gmime-header.html#g-mime-header-list-get-stream"/>
+    <function name="g_mime_header_list_set_stream ()" link="gmime-gmime-header.html#g-mime-header-list-set-stream"/>
     <function name="g_mime_header_list_has_raw ()" link="gmime-gmime-header.html#g-mime-header-list-has-raw"/>
     <function name="g_mime_header_list_set_raw ()" link="gmime-gmime-header.html#g-mime-header-list-set-raw"/>
     <function name="GMimeContentType" link="gmime-gmime-content-type.html#GMimeContentType-struct"/>

Modified: packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2 [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/gmime.devhelp2 [utf-8] Sun Dec  6 12:32:43 2009
@@ -337,8 +337,10 @@
     <keyword type="function" name="g_mime_header_list_register_writer ()" link="gmime-gmime-header.html#g-mime-header-list-register-writer"/>
     <keyword type="function" name="g_mime_header_list_write_to_stream ()" link="gmime-gmime-header.html#g-mime-header-list-write-to-stream"/>
     <keyword type="function" name="g_mime_header_list_to_string ()" link="gmime-gmime-header.html#g-mime-header-list-to-string"/>
-    <keyword type="function" name="g_mime_header_list_has_raw ()" link="gmime-gmime-header.html#g-mime-header-list-has-raw"/>
-    <keyword type="function" name="g_mime_header_list_set_raw ()" link="gmime-gmime-header.html#g-mime-header-list-set-raw"/>
+    <keyword type="function" name="g_mime_header_list_get_stream ()" link="gmime-gmime-header.html#g-mime-header-list-get-stream" since="2.4.7"/>
+    <keyword type="function" name="g_mime_header_list_set_stream ()" link="gmime-gmime-header.html#g-mime-header-list-set-stream" since="2.4.7"/>
+    <keyword type="function" name="g_mime_header_list_has_raw ()" link="gmime-gmime-header.html#g-mime-header-list-has-raw" deprecated=""/>
+    <keyword type="function" name="g_mime_header_list_set_raw ()" link="gmime-gmime-header.html#g-mime-header-list-set-raw" deprecated="2.4.7: Use g_mime_header_list_set_stream() instead."/>
     <keyword type="struct" name="GMimeContentType" link="gmime-gmime-content-type.html#GMimeContentType-struct"/>
     <keyword type="function" name="g_mime_content_type_new ()" link="gmime-gmime-content-type.html#g-mime-content-type-new"/>
     <keyword type="function" name="g_mime_content_type_new_from_string ()" link="gmime-gmime-content-type.html#g-mime-content-type-new-from-string"/>

Modified: packages/unstable/gmime2.4/docs/reference/html/index.html
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/index.html?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/index.html [utf-8] Sun Dec  6 12:32:43 2009
@@ -37,7 +37,7 @@
             <code class="email">&lt;<a class="email" href="mailto:fejj at gnome.org">fejj at gnome.org</a>&gt;</code><br>
           </p></div></div>
 </div></div></div>
-<div><p class="copyright">Copyright © 2000-2008 Jeffrey Stedfast</p></div>
+<div><p class="copyright">Copyright © 2000-2009 Jeffrey Stedfast</p></div>
 <div><div class="legalnotice">
 <a name="id2543489"></a><p>
         This library is free software; you can redistribute it and/or

Modified: packages/unstable/gmime2.4/docs/reference/html/index.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/html/index.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/html/index.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/html/index.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -447,6 +447,8 @@
 <ANCHOR id="g-mime-header-list-register-writer" href="gmime/gmime-gmime-header.html#g-mime-header-list-register-writer">
 <ANCHOR id="g-mime-header-list-write-to-stream" href="gmime/gmime-gmime-header.html#g-mime-header-list-write-to-stream">
 <ANCHOR id="g-mime-header-list-to-string" href="gmime/gmime-gmime-header.html#g-mime-header-list-to-string">
+<ANCHOR id="g-mime-header-list-get-stream" href="gmime/gmime-gmime-header.html#g-mime-header-list-get-stream">
+<ANCHOR id="g-mime-header-list-set-stream" href="gmime/gmime-gmime-header.html#g-mime-header-list-set-stream">
 <ANCHOR id="g-mime-header-list-has-raw" href="gmime/gmime-gmime-header.html#g-mime-header-list-has-raw">
 <ANCHOR id="g-mime-header-list-set-raw" href="gmime/gmime-gmime-header.html#g-mime-header-list-set-raw">
 <ANCHOR id="gmime-gmime-header.see-also" href="gmime/gmime-gmime-header.html#gmime-gmime-header.see-also">

Modified: packages/unstable/gmime2.4/docs/reference/question_index.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/question_index.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/question_index.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/question_index.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -31,31 +31,23 @@
         <qandaentry>
           <question><para>How do I port from one GMime version to another?</para></question>
           <answer>
-            <para>See the <link linkend="gmime-changes-2-0">list of
-            incompatible changes from 1.0 to 2.0</link>.</para>
-            <para>If you have a question not covered in the manual,
-            feel free to ask me personally by emailing me at <ulink
-            url="mailto:fejj at ximian.com">fejj at ximian.com</ulink>.
-            </para>
+            <para>See the <link linkend="gmime-changes-2-4">list of
+            incompatible changes from 2.2 to 2.4</link>.</para>
           </answer>
         </qandaentry>
         <qandaentry>
           <question><para>How does memory management work in GMime? Should I free data returned from functions?</para></question>
           <answer>
-            <para>See the documentation for <ulink
-            url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html">GObject</ulink>. For <ulink
-            url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html">GObject</ulink> note specifically <ulink
-            url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#g-object-ref">g_object_ref()</ulink> and <ulink
-            url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref()</ulink>.
-            </para>
-            <para>For strings returned from functions, they will be
+	    <para>Most accessor functions return a pointer to internal
+	    members. When these internal members are objects
+	    themselves (e.g. subclasses
+	    of <ulink url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html">GObject</ulink>),
+	    there is no need to unref them unless otherwise stated in
+	    the documentation for that particular function.</para>
+            <para>For accessor functions that return strings, they will be
             declared "const" if they should not be freed. Non-const
             strings should be freed with <ulink
-            url="http://developer.gnome.org/doc/API/2.0/glib/glib-Memory-Allocation.html#g-free">g_free()</ulink>. Arrays follow the same
-            rule.  (If you find an exception to the rules, please
-            report a bug to <ulink
-            url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.)
-            </para>
+            url="http://developer.gnome.org/doc/API/2.0/glib/glib-Memory-Allocation.html#g-free">g_free()</ulink>.</para>
           </answer>
         </qandaentry>
         <qandaentry>
@@ -64,12 +56,14 @@
             <para>First, read the <ulink
             url="http://developer.gnome.org/doc/API/2.0/glib/glib-Threads.html">GThread</ulink> documentation for
             portable threading primitives.</para>
-            <para>Secondly, all functions in <link
-            linkend="gmime-charset">gmime-charset</link>, <link
-            linkend="gmime-iconv">gmime-iconv</link> and <link
-            linkend="gmime-utils">gmime-utils</link> should be
-            thread-safe. Objects subclassing <ulink
-            url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html">GObject</ulink> are not.
+            <para>Secondly, all functions
+            in <link linkend="gmime-charset">gmime-charset</link>, <link linkend="gmime-iconv">gmime-iconv</link>
+            and <link linkend="gmime-utils">gmime-utils</link> should
+            be thread-safe. Objects subclassing 
+            <ulink url="http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html">GObject</ulink>
+            are not. This means that you'll have to do your own mutex
+            locking if you want to access the same GObjects from
+            multiple threads.
             </para>
           </answer>
         </qandaentry>
@@ -81,15 +75,6 @@
             in a C++ program.</para>
           </answer>
         </qandaentry>
-        <qandaentry>
-          <question><para>How do I use GMime with other non-C languages?</para></question>
-          <answer>
-            <para>As of June 18th, 2003 there is now a set of Perl
-            bindings for GMime called <ulink
-            url="http://search.cpan.org/dist/MIME-Fast/">MIME::Fast</ulink>. Thanks
-            to Piotr Klaban for his efforts.</para>
-          </answer>
-        </qandaentry>
       </qandadiv>
     </qandaset>
   </refsect1>

Modified: packages/unstable/gmime2.4/docs/reference/resources.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/resources.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/resources.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/resources.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -32,21 +32,26 @@
 If you develop a bugfix or enhancement for GMime, please file that in
 Bugzilla as well. Bugzilla allows you to attach files; please attach a
 patch generated by the <command>diff</command> utility, using the 
-<option>-u</option> option to make the patch more readable. All patches 
-must be offered under the terms of the GNU GPL license, so be sure you 
-are authorized to give us the patch under those terms.
+<option>-u</option> option to make the patch more readable. All
+patches must be offered under the terms of
+the <ulink url="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPLv2.1</ulink>
+license, so be sure you are authorized to give us the patch under
+those terms.
 </para>
     <para>
 If you want to discuss your patch before or after developing it, mail
-<ulink url="mailto:fejj at ximian.com">fejj at ximian.com</ulink>.  But be
-sure to file the Bugzilla report as well, this way it's less likely to
-slip through the cracks.
+<ulink url="mailto:gmime-devel-list at gnome.org">gmime-devel-list at gnome.org</ulink>,
+but be sure to file
+the <ulink url="http://bugzilla.gnome.org">Bugzilla</ulink> report as
+well, this way it's less likely to slip through the cracks.
 </para>
   </refsect1>
   <refsect1>
     <title>Mailing lists</title>
-    <para>
-There are currently no mailing lists dedicated to GMime.
+    <para>There is currently only one mailing-list devoted to GMime
+    itself which is for both the development of and development with
+    GMime. You can subscribe to this list
+    at <ulink url="http://mail.gnome.org/mailman/listinfo/gmime-devel-list">http://mail.gnome.org/mailman/listinfo/gmime-devel-list</ulink>.
 </para>
   </refsect1>
 </refentry>

Modified: packages/unstable/gmime2.4/docs/reference/tmpl/gmime-header.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/tmpl/gmime-header.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/tmpl/gmime-header.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/tmpl/gmime-header.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -294,6 +294,24 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION g_mime_header_list_get_stream ##### -->
+<para>
+
+</para>
+
+ at headers: 
+ at Returns: 
+
+
+<!-- ##### FUNCTION g_mime_header_list_set_stream ##### -->
+<para>
+
+</para>
+
+ at headers: 
+ at stream: 
+
+
 <!-- ##### FUNCTION g_mime_header_list_has_raw ##### -->
 <para>
 

Modified: packages/unstable/gmime2.4/docs/reference/tmpl/gmime-unused.sgml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/tmpl/gmime-unused.sgml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/tmpl/gmime-unused.sgml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/tmpl/gmime-unused.sgml [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,1097 +1,0 @@
-<!-- ##### MACRO GMIME_INIT_FLAG_UTF8 ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO GMIME_RECIPIENT_TYPE_BCC ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO GMIME_RECIPIENT_TYPE_CC ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO GMIME_RECIPIENT_TYPE_TO ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### TYPEDEF GMimeCipherValidity ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GMimeDisposition ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at params: 
- at param_hash: 
-
-<!-- ##### ENUM GMimeFilterBasicType ##### -->
-<para>
-
-</para>
-
- at GMIME_FILTER_BASIC_BASE64_ENC: 
- at GMIME_FILTER_BASIC_BASE64_DEC: 
- at GMIME_FILTER_BASIC_QP_ENC: 
- at GMIME_FILTER_BASIC_QP_DEC: 
- at GMIME_FILTER_BASIC_UU_ENC: 
- at GMIME_FILTER_BASIC_UU_DEC: 
-
-<!-- ##### ENUM GMimeFilterCRLFDirection ##### -->
-<para>
-
-</para>
-
- at GMIME_FILTER_CRLF_ENCODE: 
- at GMIME_FILTER_CRLF_DECODE: 
-
-<!-- ##### ENUM GMimeFilterCRLFMode ##### -->
-<para>
-
-</para>
-
- at GMIME_FILTER_CRLF_MODE_CRLF_DOTS: 
- at GMIME_FILTER_CRLF_MODE_CRLF_ONLY: 
-
-<!-- ##### ENUM GMimeFilterYencDirection ##### -->
-<para>
-
-</para>
-
- at GMIME_FILTER_YENC_DIRECTION_ENCODE: 
- at GMIME_FILTER_YENC_DIRECTION_DECODE: 
-
-<!-- ##### STRUCT GMimeHeader ##### -->
-<para>
-
-</para>
-
- at next: 
- at prev: 
- at offset: 
- at name: 
- at value: 
-
-<!-- ##### ENUM GMimePartEncodingType ##### -->
-<para>
-
-</para>
-
- at GMIME_PART_ENCODING_DEFAULT: 
- at GMIME_PART_ENCODING_7BIT: 
- at GMIME_PART_ENCODING_8BIT: 
- at GMIME_PART_ENCODING_BINARY: 
- at GMIME_PART_ENCODING_BASE64: 
- at GMIME_PART_ENCODING_QUOTEDPRINTABLE: 
- at GMIME_PART_ENCODING_UUENCODE: 
- at GMIME_PART_NUM_ENCODINGS: 
-
-<!-- ##### USER_FUNCTION GMimePartFunc ##### -->
-<para>
-
-</para>
-
- at part: 
- at user_data: 
-
-<!-- ##### ENUM InternetAddressType ##### -->
-<para>
-
-</para>
-
- at INTERNET_ADDRESS_NONE: 
- at INTERNET_ADDRESS_MAILBOX: 
- at INTERNET_ADDRESS_GROUP: 
-
-<!-- ##### FUNCTION g_mime_cipher_decrypt ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at istream: 
- at ostream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_encrypt ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at sign: 
- at userid: 
- at recipients: 
- at istream: 
- at ostream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_export_keys ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at keys: 
- at ostream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_hash_id ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at hash: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_hash_name ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at hash: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_import_keys ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at istream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_sign ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at userid: 
- at hash: 
- at istream: 
- at ostream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_clear ##### -->
-<para>
-
-</para>
-
- at validity: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_free ##### -->
-<para>
-
-</para>
-
- at validity: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_get_description ##### -->
-<para>
-
-</para>
-
- at validity: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_get_valid ##### -->
-<para>
-
-</para>
-
- at validity: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_init ##### -->
-<para>
-
-</para>
-
- at validity: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_new ##### -->
-<para>
-
-</para>
-
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_set_description ##### -->
-<para>
-
-</para>
-
- at validity: 
- at description: 
-
-<!-- ##### FUNCTION g_mime_cipher_validity_set_valid ##### -->
-<para>
-
-</para>
-
- at validity: 
- at valid: 
-
-<!-- ##### FUNCTION g_mime_cipher_verify ##### -->
-<para>
-
-</para>
-
- at ctx: 
- at hash: 
- at istream: 
- at sigstream: 
- at err: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_content_disposition_destroy ##### -->
-<para>
-
-</para>
-
- at disposition: 
-
-<!-- ##### FUNCTION g_mime_content_type_destroy ##### -->
-<para>
-
-</para>
-
- at mime_type: 
-
-<!-- ##### FUNCTION g_mime_disposition_add_parameter ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at attribute: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_disposition_destroy ##### -->
-<para>
-
-</para>
-
- at disposition: 
-
-<!-- ##### FUNCTION g_mime_disposition_get ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_disposition_get_parameter ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at attribute: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_disposition_header ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at fold: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_disposition_new ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_disposition_set ##### -->
-<para>
-
-</para>
-
- at disposition: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_filter_basic_new_type ##### -->
-<para>
-
-</para>
-
- at type: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_add ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_header_destroy ##### -->
-<para>
-
-</para>
-
- at header: 
-
-<!-- ##### FUNCTION g_mime_header_foreach ##### -->
-<para>
-
-</para>
-
- at header: 
- at func: 
- at user_data: 
-
-<!-- ##### FUNCTION g_mime_header_get ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_has_raw ##### -->
-<para>
-
-</para>
-
- at header: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_iter_get_offset ##### -->
-<para>
-
-</para>
-
- at iter: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_new ##### -->
-<para>
-
-</para>
-
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_prepend ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_header_register_writer ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
- at writer: 
-
-<!-- ##### FUNCTION g_mime_header_remove ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
-
-<!-- ##### FUNCTION g_mime_header_set ##### -->
-<para>
-
-</para>
-
- at header: 
- at name: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_header_set_raw ##### -->
-<para>
-
-</para>
-
- at header: 
- at raw: 
-
-<!-- ##### FUNCTION g_mime_header_to_string ##### -->
-<para>
-
-</para>
-
- at header: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_header_write_to_stream ##### -->
-<para>
-
-</para>
-
- at header: 
- at stream: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_add_header ##### -->
-<para>
-
-</para>
-
- at message: 
- at header: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_message_add_recipients_from_string ##### -->
-<para>
-
-</para>
-
- at message: 
- at type: 
- at str: 
-
-<!-- ##### FUNCTION g_mime_message_foreach_part ##### -->
-<para>
-
-</para>
-
- at message: 
- at callback: 
- at data: 
-
-<!-- ##### FUNCTION g_mime_message_get_body ##### -->
-<para>
-
-</para>
-
- at message: 
- at want_plain: 
- at is_html: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_get_date_string ##### -->
-<para>
-
-</para>
-
- at message: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_get_header ##### -->
-<para>
-
-</para>
-
- at message: 
- at header: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_get_headers ##### -->
-<para>
-
-</para>
-
- at message: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_set_header ##### -->
-<para>
-
-</para>
-
- at message: 
- at header: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_message_to_string ##### -->
-<para>
-
-</para>
-
- at message: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_message_write_to_stream ##### -->
-<para>
-
-</para>
-
- at message: 
- at stream: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_multipart_add_part ##### -->
-<para>
-
-</para>
-
- at multipart: 
- at part: 
-
-<!-- ##### FUNCTION g_mime_multipart_add_part_at ##### -->
-<para>
-
-</para>
-
- at multipart: 
- at part: 
- at index: 
-
-<!-- ##### FUNCTION g_mime_multipart_get_number ##### -->
-<para>
-
-</para>
-
- at multipart: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_multipart_remove_part ##### -->
-<para>
-
-</para>
-
- at multipart: 
- at part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_multipart_remove_part_at ##### -->
-<para>
-
-</para>
-
- at multipart: 
- at index: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_object_add_header ##### -->
-<para>
-
-</para>
-
- at object: 
- at header: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_object_ref ##### -->
-<para>
-
-</para>
-
- at object: 
-
-<!-- ##### FUNCTION g_mime_object_unref ##### -->
-<para>
-
-</para>
-
- at object: 
-
-<!-- ##### FUNCTION g_mime_part_add_content_disposition_parameter ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at attribute: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_part_encoding_from_string ##### -->
-<para>
-
-</para>
-
- at encoding: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_encoding_to_string ##### -->
-<para>
-
-</para>
-
- at encoding: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at len: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content_disposition ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content_disposition_object ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content_disposition_parameter ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at attribute: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content_header ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at header: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_content_type ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_get_encoding ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_set_content ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at content: 
- at len: 
-
-<!-- ##### FUNCTION g_mime_part_set_content_byte_array ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at content: 
-
-<!-- ##### FUNCTION g_mime_part_set_content_disposition ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at disposition: 
-
-<!-- ##### FUNCTION g_mime_part_set_content_disposition_object ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at disposition: 
-
-<!-- ##### FUNCTION g_mime_part_set_content_header ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at header: 
- at value: 
-
-<!-- ##### FUNCTION g_mime_part_set_content_type ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at mime_type: 
-
-<!-- ##### FUNCTION g_mime_part_set_encoding ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at encoding: 
-
-<!-- ##### FUNCTION g_mime_part_set_pre_encoded_content ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at content: 
- at len: 
- at encoding: 
-
-<!-- ##### FUNCTION g_mime_part_to_string ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_part_write_to_stream ##### -->
-<para>
-
-</para>
-
- at mime_part: 
- at stream: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_references_next ##### -->
-<para>
-
-</para>
-
- at ref: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_stream_error ##### -->
-<para>
-
-</para>
-
- at stream: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_stream_filter_new_with_stream ##### -->
-<para>
-
-</para>
-
- at stream: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_stream_ref ##### -->
-<para>
-
-</para>
-
- at stream: 
-
-<!-- ##### FUNCTION g_mime_stream_unref ##### -->
-<para>
-
-</para>
-
- at stream: 
-
-<!-- ##### FUNCTION g_mime_utils_8bit_header_decode ##### -->
-<para>
-
-</para>
-
- at text: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_8bit_header_encode ##### -->
-<para>
-
-</para>
-
- at text: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_8bit_header_encode_phrase ##### -->
-<para>
-
-</para>
-
- at text: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_base64_decode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_base64_encode_close ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_base64_encode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_quoted_decode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_quoted_encode_close ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_quoted_encode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_uudecode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_uuencode_close ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at uubuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION g_mime_utils_uuencode_step ##### -->
-<para>
-
-</para>
-
- at inbuf: 
- at inlen: 
- at outbuf: 
- at uubuf: 
- at state: 
- at save: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_add_member ##### -->
-<para>
-
-</para>
-
- at ia: 
- at member: 
-
-<!-- ##### FUNCTION internet_address_get_addr ##### -->
-<para>
-
-</para>
-
- at ia: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_get_members ##### -->
-<para>
-
-</para>
-
- at ia: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_get_type ##### -->
-<para>
-
-</para>
-
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_list_concat ##### -->
-<para>
-
-</para>
-
- at list: 
- at concat: 
-
-<!-- ##### FUNCTION internet_address_list_destroy ##### -->
-<para>
-
-</para>
-
- at list: 
-
-<!-- ##### FUNCTION internet_address_list_next ##### -->
-<para>
-
-</para>
-
- at list: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_list_ref ##### -->
-<para>
-
-</para>
-
- at list: 
-
-<!-- ##### FUNCTION internet_address_list_unref ##### -->
-<para>
-
-</para>
-
- at list: 
-
-<!-- ##### FUNCTION internet_address_new ##### -->
-<para>
-
-</para>
-
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_new_group ##### -->
-<para>
-
-</para>
-
- at name: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_new_mailbox ##### -->
-<para>
-
-</para>
-
- at name: 
- at addr: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_new_name ##### -->
-<para>
-
-</para>
-
- at name: 
- at addr: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_parse_string ##### -->
-<para>
-
-</para>
-
- at str: 
- at Returns: 
-
-<!-- ##### FUNCTION internet_address_ref ##### -->
-<para>
-
-</para>
-
- at ia: 
-
-<!-- ##### FUNCTION internet_address_set_addr ##### -->
-<para>
-
-</para>
-
- at ia: 
- at addr: 
-
-<!-- ##### FUNCTION internet_address_set_group ##### -->
-<para>
-
-</para>
-
- at ia: 
- at group: 
-
-<!-- ##### FUNCTION internet_address_unref ##### -->
-<para>
-
-</para>
-
- at ia: 
-

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-cipher-context.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -903,14 +903,14 @@
 <title>g_mime_signer_get_name ()</title>
 <indexterm zone="g-mime-signer-get-name"><primary>g_mime_signer_get_name</primary></indexterm><programlisting>const <link linkend="char">char</link>*         g_mime_signer_get_name              (<link linkend="GMimeSigner">GMimeSigner</link> *signer);</programlisting>
 <para>
-Get the signer trust.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>signer</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="GMimeSigner"><type>GMimeSigner</type></link>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> the signer trust.
+Get the signer's name.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>signer</parameter>&nbsp;:</term>
+<listitem><simpara> a <link linkend="GMimeSigner"><type>GMimeSigner</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> the signer's name.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="g-mime-signer-set-name" role="function">

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-gpg-context.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-gpg-context.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-gpg-context.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-gpg-context.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -108,7 +108,7 @@
 <listitem><simpara> a <link linkend="GMimeGpgContext"><type>GMimeGpgContext</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>always_trust</parameter>&nbsp;:</term>
-<listitem><simpara> always truct flag
+<listitem><simpara> always trust flag
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-header.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-header.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-header.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-header.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -66,6 +66,9 @@
 <link linkend="ssize-t">ssize_t</link>             <link linkend="g-mime-header-list-write-to-stream">g_mime_header_list_write_to_stream</link>  (const <link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
                                                          <link linkend="GMimeStream">GMimeStream</link> *stream);
 <link linkend="char">char</link>*               <link linkend="g-mime-header-list-to-string">g_mime_header_list_to_string</link>        (const <link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);
+<link linkend="GMimeStream">GMimeStream</link>*        <link linkend="g-mime-header-list-get-stream">g_mime_header_list_get_stream</link>       (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);
+<link linkend="void">void</link>                <link linkend="g-mime-header-list-set-stream">g_mime_header_list_set_stream</link>       (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
+                                                         <link linkend="GMimeStream">GMimeStream</link> *stream);
 <link linkend="gboolean">gboolean</link>            <link linkend="g-mime-header-list-has-raw">g_mime_header_list_has_raw</link>          (const <link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);
 <link linkend="void">void</link>                <link linkend="g-mime-header-list-set-raw">g_mime_header_list_set_raw</link>          (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
                                                          const <link linkend="char">char</link> *raw);
@@ -613,9 +616,44 @@
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a string containing the header block.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="g-mime-header-list-has-raw" role="function">
+<refsect2 id="g-mime-header-list-get-stream" role="function" condition="since:2.4.7">
+<title>g_mime_header_list_get_stream ()</title>
+<indexterm zone="g-mime-header-list-get-stream" role="2.4.7"><primary>g_mime_header_list_get_stream</primary></indexterm><programlisting><link linkend="GMimeStream">GMimeStream</link>*        g_mime_header_list_get_stream       (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);</programlisting>
+<para>
+Gets the raw stream representing <parameter>headers</parameter>.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>headers</parameter>&nbsp;:</term>
+<listitem><simpara> a <link linkend="GMimeHeaderList"><type>GMimeHeaderList</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a <link linkend="GMimeStream"><type>GMimeStream</type></link> if set or <link linkend="NULL:CAPS"><literal>NULL</literal></link> otherwise.
+
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since  2.4.7
+</para></refsect2>
+<refsect2 id="g-mime-header-list-set-stream" role="function" condition="since:2.4.7">
+<title>g_mime_header_list_set_stream ()</title>
+<indexterm zone="g-mime-header-list-set-stream" role="2.4.7"><primary>g_mime_header_list_set_stream</primary></indexterm><programlisting><link linkend="void">void</link>                g_mime_header_list_set_stream       (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
+                                                         <link linkend="GMimeStream">GMimeStream</link> *stream);</programlisting>
+<para>
+Set the raw header stream.</para>
+<para>
+
+</para><variablelist role="params">
+<varlistentry><term><parameter>headers</parameter>&nbsp;:</term>
+<listitem><simpara> a <link linkend="GMimeHeaderList"><type>GMimeHeaderList</type></link>
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>stream</parameter>&nbsp;:</term>
+<listitem><simpara> a <link linkend="GMimeStream"><type>GMimeStream</type></link>
+</simpara></listitem></varlistentry>
+</variablelist><para role="since">Since  2.4.7
+</para></refsect2>
+<refsect2 id="g-mime-header-list-has-raw" role="function" condition="deprecated">
 <title>g_mime_header_list_has_raw ()</title>
-<indexterm zone="g-mime-header-list-has-raw"><primary>g_mime_header_list_has_raw</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            g_mime_header_list_has_raw          (const <link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);</programlisting>
+<indexterm zone="g-mime-header-list-has-raw" role="deprecated"><primary>g_mime_header_list_has_raw</primary></indexterm><programlisting><link linkend="gboolean">gboolean</link>            g_mime_header_list_has_raw          (const <link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers);</programlisting>
+<warning><para><literal>g_mime_header_list_has_raw</literal> has been deprecated since version 2.4.7 and should not be used in newly-written code. Use <link linkend="g-mime-header-list-get-stream"><function>g_mime_header_list_get_stream()</function></link> and check
+against NULL instead.</para></warning>
 <para>
 Gets whether or not a raw header has been set on <parameter>headers</parameter>.</para>
 <para>
@@ -625,12 +663,14 @@
 <listitem><simpara> a <link linkend="GMimeHeaderList"><type>GMimeHeaderList</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if a raw header is set or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link> otherwise.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="g-mime-header-list-set-raw" role="function">
+
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="g-mime-header-list-set-raw" role="function" condition="deprecated:2.4.7: Use g_mime_header_list_set_stream() instead.">
 <title>g_mime_header_list_set_raw ()</title>
-<indexterm zone="g-mime-header-list-set-raw"><primary>g_mime_header_list_set_raw</primary></indexterm><programlisting><link linkend="void">void</link>                g_mime_header_list_set_raw          (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
+<indexterm zone="g-mime-header-list-set-raw" role="deprecated"><primary>g_mime_header_list_set_raw</primary></indexterm><programlisting><link linkend="void">void</link>                g_mime_header_list_set_raw          (<link linkend="GMimeHeaderList">GMimeHeaderList</link> *headers,
                                                          const <link linkend="char">char</link> *raw);</programlisting>
+<warning><para><literal>g_mime_header_list_set_raw</literal> has been deprecated since version 2.4.7 and should not be used in newly-written code. Use <link linkend="g-mime-header-list-set-stream"><function>g_mime_header_list_set_stream()</function></link> instead.</para></warning>
 <para>
 Set the raw header.</para>
 <para>

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-file.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-file.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-file.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-file.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -80,7 +80,7 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>fp</parameter>&nbsp;:</term>
-<listitem><simpara> file pointer
+<listitem><simpara> a FILE pointer
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a stream using <parameter>fp</parameter>.
 </simpara></listitem></varlistentry>
@@ -101,7 +101,7 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>fp</parameter>&nbsp;:</term>
-<listitem><simpara> file pointer
+<listitem><simpara> a FILE pointer
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>start</parameter>&nbsp;:</term>
 <listitem><simpara> start boundary
@@ -121,7 +121,7 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>stream</parameter>&nbsp;:</term>
-<listitem><simpara> file stream
+<listitem><simpara> a <link linkend="GMimeStreamFile"><type>GMimeStreamFile</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if <parameter>stream</parameter> owns the backend FILE pointer or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link>
 otherwise.
@@ -141,10 +141,10 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>stream</parameter>&nbsp;:</term>
-<listitem><simpara> file stream
+<listitem><simpara> a <link linkend="GMimeStreamFile"><type>GMimeStreamFile</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>owner</parameter>&nbsp;:</term>
-<listitem><simpara> owner
+<listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if this stream should own the FILE pointer or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link> otherwise
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-fs.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-fs.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-fs.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-fs.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -90,7 +90,7 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>fd</parameter>&nbsp;:</term>
-<listitem><simpara> file descriptor
+<listitem><simpara> a file descriptor
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>start</parameter>&nbsp;:</term>
 <listitem><simpara> start boundary
@@ -110,7 +110,7 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>stream</parameter>&nbsp;:</term>
-<listitem><simpara> fs stream
+<listitem><simpara> a <link linkend="GMimeStreamFs"><type>GMimeStreamFs</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if <parameter>stream</parameter> owns the backend file descriptor or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link>
 otherwise.
@@ -121,7 +121,7 @@
 <indexterm zone="g-mime-stream-fs-set-owner"><primary>g_mime_stream_fs_set_owner</primary></indexterm><programlisting><link linkend="void">void</link>                g_mime_stream_fs_set_owner          (<link linkend="GMimeStreamFs">GMimeStreamFs</link> *stream,
                                                          <link linkend="gboolean">gboolean</link> owner);</programlisting>
 <para>
-Sets whether or not <parameter>stream</parameter> owns the backend FS pointer.
+Sets whether or not <parameter>stream</parameter> owns the backend file descriptor.
 </para>
 <para>
 Note: <parameter>owner</parameter> should be <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if the stream should <link linkend="close"><function>close()</function></link> the
@@ -130,10 +130,10 @@
 
 </para><variablelist role="params">
 <varlistentry><term><parameter>stream</parameter>&nbsp;:</term>
-<listitem><simpara> fs stream
+<listitem><simpara> a <link linkend="GMimeStreamFs"><type>GMimeStreamFs</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>owner</parameter>&nbsp;:</term>
-<listitem><simpara> owner
+<listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if this stream should own the file descriptor or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link> otherwise
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 

Modified: packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-mem.xml
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-mem.xml?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-mem.xml [utf-8] (original)
+++ packages/unstable/gmime2.4/docs/reference/xml/gmime-stream-mem.xml [utf-8] Sun Dec  6 12:32:43 2009
@@ -136,7 +136,7 @@
 </para>
 <para>
 Note: The memory stream is not responsible for freeing the byte
-array.</para>
+array. Use <link linkend="g-mime-stream-mem-set-owner"><function>g_mime_stream_mem_set_owner()</function></link> to change this behavior.</para>
 <para>
 
 </para><variablelist role="params">
@@ -179,7 +179,7 @@
 <listitem><simpara> a <link linkend="GMimeStreamMem"><type>GMimeStreamMem</type></link>
 </simpara></listitem></varlistentry>
 <varlistentry><term><parameter>owner</parameter>&nbsp;:</term>
-<listitem><simpara> owner
+<listitem><simpara> <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if this stream should own the <link linkend="GByteArray"><type>GByteArray</type></link> or <link linkend="FALSE:CAPS"><literal>FALSE</literal></link> otherwise
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 

Modified: packages/unstable/gmime2.4/gmime.spec
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime.spec?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime.spec [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime.spec [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      2.4.6
+%define ver      2.4.11
 %define prefix   /usr
 %define enable_mono 0
 %define enable_gtk_doc 0

Modified: packages/unstable/gmime2.4/gmime/gmime-cipher-context.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-cipher-context.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-cipher-context.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-cipher-context.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -658,9 +658,9 @@
  * g_mime_signer_get_name:
  * @signer: a #GMimeSigner
  *
- * Get the signer trust.
- *
- * Returns: the signer trust.
+ * Get the signer's name.
+ *
+ * Returns: the signer's name.
  **/
 const char *
 g_mime_signer_get_name (GMimeSigner *signer)

Modified: packages/unstable/gmime2.4/gmime/gmime-encodings.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-encodings.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-encodings.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-encodings.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -830,7 +830,7 @@
 						*outptr++ = gmime_uu_rank[b0] << 2 | gmime_uu_rank[b1] >> 4;
 						uulen--;
 					}
-					if (uulen >= 2) {
+					if (uulen >= 1) {
 						*outptr++ = gmime_uu_rank[b1] << 4 | gmime_uu_rank[b2] >> 2;
 						uulen--;
 					}

Modified: packages/unstable/gmime2.4/gmime/gmime-filter-charset.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-filter-charset.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-filter-charset.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-filter-charset.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -157,7 +157,8 @@
 				 * EILSEQ An invalid multibyte sequence has been  encountered
 				 *        in the input.
 				 *
-				 * What we do here is eat the invalid bytes in the sequence and continue
+				 * What we do here is eat the invalid bytes in the sequence
+				 * and continue.
 				 */
 				
 				inbuf++;
@@ -167,9 +168,9 @@
 				goto noop;
 			}
 		}
-	} while (((int) inleft) > 0);
-	
-	if (((int) inleft) > 0) {
+	} while (inleft > 0);
+	
+	if (inleft > 0) {
 		/* We've either got an E2BIG or EINVAL. Save the
                    remainder of the buffer as we'll process this next
                    time through */
@@ -230,7 +231,8 @@
 				 * EILSEQ An invalid multibyte sequence has been  encountered
 				 *        in the input.
 				 *
-				 * What we do here is eat the invalid bytes in the sequence and continue
+				 * What we do here is eat the invalid bytes in the sequence
+				 * and continue.
 				 */
 				
 				inbuf++;
@@ -245,10 +247,10 @@
 				 */
 				
 				break;
-			} else
+			} else {
 				goto noop;
-			
-		} while (((int) inleft) > 0);
+			}
+		} while (inleft > 0);
 	}
 	
 	/* flush the iconv conversion */

Modified: packages/unstable/gmime2.4/gmime/gmime-gpg-context.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-gpg-context.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-gpg-context.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -2083,7 +2083,7 @@
 /**
  * g_mime_gpg_context_set_always_trust:
  * @ctx: a #GMimeGpgContext
- * @always_trust: always truct flag
+ * @always_trust: always trust flag
  *
  * Sets the @always_trust flag on the gpg context which is used for
  * encryption.

Modified: packages/unstable/gmime2.4/gmime/gmime-header.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-header.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-header.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-header.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -65,11 +65,11 @@
 };
 
 struct _GMimeHeaderList {
+	GMimeStream *stream;
 	GHashTable *writers;
 	GHashTable *hash;
 	guint32 version;
 	List list;
-	char *raw;
 };
 
 
@@ -429,7 +429,7 @@
 	g_free (iter->cursor->value);
 	iter->cursor->value = g_strdup (value);
 	
-	g_mime_header_list_set_raw (iter->hdrlist, NULL);
+	g_mime_header_list_set_stream (iter->hdrlist, NULL);
 	
 	return TRUE;
 }
@@ -534,8 +534,8 @@
 	headers->hash = g_hash_table_new (g_mime_strcase_hash,
 					  g_mime_strcase_equal);
 	list_init (&headers->list);
+	headers->stream = NULL;
 	headers->version = 0;
-	headers->raw = NULL;
 	
 	return headers;
 }
@@ -564,7 +564,9 @@
 	
 	g_hash_table_destroy (headers->writers);
 	g_hash_table_destroy (headers->hash);
-	g_free (headers->raw);
+	
+	if (headers->stream)
+		g_object_unref (headers->stream);
 	
 	g_slice_free (GMimeHeaderList, headers);
 }
@@ -592,8 +594,10 @@
 	list_append (&headers->list, (ListNode *) header);
 	g_hash_table_replace (headers->hash, header->name, header);
 	
-	g_free (headers->raw);
-	headers->raw = NULL;
+	if (headers->stream) {
+		g_object_unref (headers->stream);
+		headers->stream = NULL;
+	}
 }
 
 
@@ -621,8 +625,10 @@
 	if (!g_hash_table_lookup (headers->hash, name))
 		g_hash_table_insert (headers->hash, header->name, header);
 	
-	g_free (headers->raw);
-	headers->raw = NULL;
+	if (headers->stream) {
+		g_object_unref (headers->stream);
+		headers->stream = NULL;
+	}
 }
 
 
@@ -696,8 +702,10 @@
 		g_hash_table_insert (headers->hash, header->name, header);
 	}
 	
-	g_free (headers->raw);
-	headers->raw = NULL;
+	if (headers->stream) {
+		g_object_unref (headers->stream);
+		headers->stream = NULL;
+	}
 }
 
 
@@ -741,8 +749,10 @@
 	list_unlink ((ListNode *) header);
 	g_mime_header_free (header);
 	
-	g_free (headers->raw);
-	headers->raw = NULL;
+	if (headers->stream) {
+		g_object_unref (headers->stream);
+		headers->stream = NULL;
+	}
 	
 	return TRUE;
 }
@@ -836,8 +846,10 @@
 	g_return_val_if_fail (headers != NULL, -1);
 	g_return_val_if_fail (stream != NULL, -1);
 	
-	if (headers->raw)
-		return g_mime_stream_write_string (stream, headers->raw);
+	if (headers->stream) {
+		g_mime_stream_reset (headers->stream);
+		return g_mime_stream_write_to_stream (headers->stream, stream);
+	}
 	
 	header = (GMimeHeader *) headers->list.head;
 	writers = headers->writers;
@@ -878,13 +890,17 @@
 	
 	g_return_val_if_fail (headers != NULL, NULL);
 	
-	if (headers->raw)
-		return g_strdup (headers->raw);
-	
 	array = g_byte_array_new ();
 	stream = g_mime_stream_mem_new ();
 	g_mime_stream_mem_set_byte_array (GMIME_STREAM_MEM (stream), array);
-	g_mime_header_list_write_to_stream (headers, stream);
+	
+	if (headers->stream) {
+		g_mime_stream_reset (headers->stream);
+		g_mime_stream_write_to_stream (headers->stream, stream);
+	} else {
+		g_mime_header_list_write_to_stream (headers, stream);
+	}
+	
 	g_object_unref (stream);
 	
 	g_byte_array_append (array, (unsigned char *) "", 1);
@@ -926,19 +942,70 @@
 
 
 /**
+ * g_mime_header_list_set_stream:
+ * @headers: a #GMimeHeaderList
+ * @stream: a #GMimeStream
+ *
+ * Set the raw header stream.
+ *
+ * Since: 2.4.7
+ **/
+void
+g_mime_header_list_set_stream (GMimeHeaderList *headers, GMimeStream *stream)
+{
+	g_return_if_fail (stream == NULL || GMIME_IS_STREAM (stream));
+	g_return_if_fail (headers != NULL);
+	
+	if (stream)
+		g_object_ref (stream);
+	
+	if (headers->stream)
+		g_object_unref (headers->stream);
+	
+	headers->stream = stream;
+}
+
+
+/**
+ * g_mime_header_list_get_stream:
+ * @headers: a #GMimeHeaderList
+ *
+ * Gets the raw stream representing @headers.
+ *
+ * Returns: a #GMimeStream if set or %NULL otherwise.
+ *
+ * Since: 2.4.7
+ **/
+GMimeStream *
+g_mime_header_list_get_stream (GMimeHeaderList *headers)
+{
+	g_return_val_if_fail (headers != NULL, NULL);
+	
+	return headers->stream;
+}
+
+
+/**
  * g_mime_header_list_set_raw:
  * @headers: a #GMimeHeaderList
  * @raw: raw mime part header
  *
  * Set the raw header.
+ *
+ * Deprecated:2.4.7: Use g_mime_header_list_set_stream() instead.
  **/
 void
 g_mime_header_list_set_raw (GMimeHeaderList *headers, const char *raw)
 {
 	g_return_if_fail (headers != NULL);
 	
-	g_free (headers->raw);
-	headers->raw = raw ? g_strdup (raw) : NULL;
+	if (headers->stream)
+		g_object_unref (headers->stream);
+	
+	if (raw)
+		headers->stream = g_mime_stream_mem_new_with_buffer (raw, strlen (raw));
+	else
+		headers->stream = NULL;
 }
 
 
@@ -949,11 +1016,14 @@
  * Gets whether or not a raw header has been set on @headers.
  *
  * Returns: %TRUE if a raw header is set or %FALSE otherwise.
+ *
+ * Deprecated:2.4.7: Use g_mime_header_list_get_stream() and check
+ * against NULL instead.
  **/
 gboolean
 g_mime_header_list_has_raw (const GMimeHeaderList *headers)
 {
 	g_return_val_if_fail (headers != NULL, FALSE);
 	
-	return headers->raw ? TRUE : FALSE;
-}
+	return headers->stream ? TRUE : FALSE;
+}

Modified: packages/unstable/gmime2.4/gmime/gmime-header.h
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-header.h?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-header.h [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-header.h [utf-8] Sun Dec  6 12:32:43 2009
@@ -87,6 +87,7 @@
 const char *g_mime_header_iter_get_name (GMimeHeaderIter *iter);
 gboolean g_mime_header_iter_set_value (GMimeHeaderIter *iter, const char *value);
 const char *g_mime_header_iter_get_value (GMimeHeaderIter *iter);
+
 gboolean g_mime_header_iter_remove (GMimeHeaderIter *iter);
 
 
@@ -108,6 +109,9 @@
 
 void g_mime_header_list_destroy (GMimeHeaderList *headers);
 
+void g_mime_header_list_set_stream (GMimeHeaderList *headers, GMimeStream *stream);
+GMimeStream *g_mime_header_list_get_stream (GMimeHeaderList *headers);
+
 void g_mime_header_list_prepend (GMimeHeaderList *headers, const char *name, const char *value);
 void g_mime_header_list_append (GMimeHeaderList *headers, const char *name, const char *value);
 void g_mime_header_list_set (GMimeHeaderList *headers, const char *name, const char *value);
@@ -122,9 +126,11 @@
 ssize_t g_mime_header_list_write_to_stream (const GMimeHeaderList *headers, GMimeStream *stream);
 char *g_mime_header_list_to_string (const GMimeHeaderList *headers);
 
+#ifndef GMIME_DISABLE_DEPRECATED
 /* for internal use only */
 void g_mime_header_list_set_raw (GMimeHeaderList *headers, const char *raw);
 gboolean g_mime_header_list_has_raw (const GMimeHeaderList *headers);
+#endif /* GMIME_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

Modified: packages/unstable/gmime2.4/gmime/gmime-message.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-message.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-message.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-message.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -48,10 +48,10 @@
 
 typedef void (* EventCallback) (gpointer sender, gpointer args);
 
-void _internet_address_list_block_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
-void _internet_address_list_unblock_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
-void _internet_address_list_add_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
-void _internet_address_list_remove_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
+extern void _internet_address_list_block_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
+extern void _internet_address_list_unblock_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
+extern void _internet_address_list_add_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
+extern void _internet_address_list_remove_event_handler (InternetAddressList *list, EventCallback callback, gpointer user_data);
 
 
 static void g_mime_message_class_init (GMimeMessageClass *klass);
@@ -185,7 +185,7 @@
 	
 	list = message->recipients[type];
 	
-	_internet_address_list_block_event_handler (list, recipient_types[type].changed_cb, message);
+	_internet_address_list_unblock_event_handler (list, recipient_types[type].changed_cb, message);
 }
 
 static void
@@ -790,7 +790,7 @@
 		g_mime_header_list_prepend (object->headers, header, value);
 	
 	if (message->mime_part)
-		g_mime_header_list_set_raw (message->mime_part->headers, NULL);
+		g_mime_header_list_set_stream (message->mime_part->headers, NULL);
 }
 
 static void
@@ -812,7 +812,7 @@
 		g_mime_header_list_append (object->headers, header, value);
 	
 	if (message->mime_part)
-		g_mime_header_list_set_raw (message->mime_part->headers, NULL);
+		g_mime_header_list_set_stream (message->mime_part->headers, NULL);
 }
 
 static void
@@ -834,7 +834,7 @@
 		g_mime_header_list_set (object->headers, header, value);
 	
 	if (message->mime_part)
-		g_mime_header_list_set_raw (message->mime_part->headers, NULL);
+		g_mime_header_list_set_stream (message->mime_part->headers, NULL);
 }
 
 static const char *
@@ -927,7 +927,7 @@
 	}
 	
 	if (message->mime_part)
-		g_mime_header_list_set_raw (message->mime_part->headers, NULL);
+		g_mime_header_list_set_stream (message->mime_part->headers, NULL);
 	
 	return GMIME_OBJECT_CLASS (parent_class)->remove_header (object, header);
 }
@@ -945,10 +945,15 @@
 	stream = g_mime_stream_mem_new ();
 	g_mime_stream_mem_set_byte_array (GMIME_STREAM_MEM (stream), ba);
 	
-	if (message->mime_part && g_mime_header_list_has_raw (message->mime_part->headers)) {
+	if (message->mime_part && g_mime_header_list_get_stream (message->mime_part->headers)) {
 		/* if the mime part has raw headers, then it contains the message headers as well */
 		g_mime_header_list_write_to_stream (message->mime_part->headers, stream);
 	} else {
+		/* Note: if the user changed the mime_part's headers,
+		 * we need to unset our cached header stream or it
+		 * won't reflect the changes. */
+		g_mime_header_list_set_stream (object->headers, NULL);
+		
 		g_mime_header_list_write_to_stream (object->headers, stream);
 		if (message->mime_part) {
 			if (g_mime_object_get_header (message->mime_part, "Content-Type"))
@@ -972,9 +977,12 @@
 	ssize_t nwritten, total = 0;
 	
 	if (message->mime_part) {
-		if (!g_mime_header_list_has_raw (message->mime_part->headers)) {
-			/* if the mime part has raw headers, then it contains the message
-			 * headers as well otherwise it doesn't, so write them now */
+		if (!g_mime_header_list_get_stream (message->mime_part->headers)) {
+			/* Note: if the user changed the mime_part's headers,
+			 * we need to unset our cached header stream or it
+			 * won't reflect the changes. */
+			g_mime_header_list_set_stream (object->headers, NULL);
+			
 			if ((nwritten = g_mime_header_list_write_to_stream (object->headers, stream)) == -1)
 				return -1;
 			
@@ -1444,12 +1452,14 @@
 	g_return_if_fail (GMIME_IS_OBJECT (mime_part));
 	
 	g_object_ref (mime_part);
-	g_mime_header_list_set_raw (mime_part->headers, NULL);
+	g_mime_header_list_set_stream (mime_part->headers, NULL);
 	
 	if (message->mime_part) {
-		g_mime_header_list_set_raw (message->mime_part->headers, NULL);
+		g_mime_header_list_set_stream (message->mime_part->headers, NULL);
 		g_object_unref (message->mime_part);
 	}
+	
+	g_mime_header_list_set_stream (((GMimeObject *) message)->headers, NULL);
 	
 	message->mime_part = mime_part;
 }

Modified: packages/unstable/gmime2.4/gmime/gmime-multipart.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-multipart.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-multipart.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-multipart.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -244,7 +244,7 @@
 	 * not, then it's a broken multipart and so we don't want to
 	 * alter it or we'll completely break the output) */
 	boundary = g_mime_object_get_content_type_parameter (object, "boundary");
-	if (!boundary && !g_mime_header_list_has_raw (object->headers)) {
+	if (!boundary && !g_mime_header_list_get_stream (object->headers)) {
 		g_mime_multipart_set_boundary (multipart, NULL);
 		boundary = g_mime_object_get_content_type_parameter (object, "boundary");
 	}
@@ -482,18 +482,20 @@
 	unsigned char *dest, *src;
 	guint n;
 	
-	g_ptr_array_set_size (array, array->len + 1);
-	
-	if (index == array->len) {
-		/* need to move items down */
+	if (index < array->len) {
+		/* need to shift some items */
+		g_ptr_array_set_size (array, array->len + 1);
+		
 		dest = ((unsigned char *) array->pdata) + (sizeof (void *) * (index + 1));
 		src = ((unsigned char *) array->pdata) + (sizeof (void *) * index);
 		n = array->len - index - 1;
 		
 		g_memmove (dest, src, (sizeof (void *) * n));
-	}
-	
-	array->pdata[index] = object;
+		array->pdata[index] = object;
+	} else {
+		/* the easy case */
+		g_ptr_array_add (array, object);
+	}
 }
 
 static void

Modified: packages/unstable/gmime2.4/gmime/gmime-object.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-object.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-object.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-object.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -609,7 +609,7 @@
 	disp = g_mime_content_disposition_new ();
 	g_mime_content_disposition_set_disposition (disp, disposition);
 	g_mime_object_set_content_disposition (object, disp);
-	g_object_ref (disp);
+	g_object_unref (disp);
 }
 
 

Modified: packages/unstable/gmime2.4/gmime/gmime-parser.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-parser.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-parser.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-parser.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -153,6 +153,10 @@
 	size_t rawleft;
 	
 	/* current message headerblock offsets */
+	gint64 message_headers_begin;
+	gint64 message_headers_end;
+	
+	/* current mime-part headerblock offsets */
 	gint64 headers_begin;
 	gint64 headers_end;
 	
@@ -298,16 +302,16 @@
 g_mime_parser_init (GMimeParser *parser, GMimeParserClass *klass)
 {
 	parser->priv = g_new (struct _GMimeParserPrivate, 1);
-	parser_init (parser, NULL);
+	parser->priv->respect_content_length = FALSE;
+	parser->priv->persist_stream = TRUE;
+	parser->priv->have_regex = FALSE;
+	parser->priv->scan_from = FALSE;
 	
 #if defined (HAVE_GLIB_REGEX)
 	parser->priv->regex = NULL;
 #endif
 	
-	parser->priv->scan_from = FALSE;
-	parser->priv->have_regex = FALSE;
-	parser->priv->persist_stream = TRUE;
-	parser->priv->respect_content_length = FALSE;
+	parser_init (parser, NULL);
 }
 
 static void
@@ -359,9 +363,18 @@
 	priv->headerleft = HEADER_INIT_SIZE - 1;
 	priv->headerptr = priv->headerbuf;
 	
-	priv->rawbuf = g_malloc (HEADER_RAW_INIT_SIZE);
-	priv->rawleft = HEADER_RAW_INIT_SIZE - 1;
-	priv->rawptr = priv->rawbuf;
+	if (offset == -1 || !priv->persist_stream) {
+		priv->rawbuf = g_malloc (HEADER_RAW_INIT_SIZE);
+		priv->rawleft = HEADER_RAW_INIT_SIZE - 1;
+		priv->rawptr = priv->rawbuf;
+	} else {
+		priv->rawbuf = NULL;
+		priv->rawptr = NULL;
+		priv->rawleft = 0;
+	}
+	
+	priv->message_headers_begin = -1;
+	priv->message_headers_end = -1;
 	
 	priv->headers_begin = -1;
 	priv->headers_end = -1;
@@ -501,9 +514,33 @@
 void
 g_mime_parser_set_persist_stream (GMimeParser *parser, gboolean persist)
 {
+	struct _GMimeParserPrivate *priv;
+	
 	g_return_if_fail (GMIME_IS_PARSER (parser));
 	
-	parser->priv->persist_stream = persist;
+	priv = parser->priv;
+	
+	if (priv->persist_stream == persist)
+		return;
+	
+	if (persist) {
+		priv->persist_stream = TRUE;
+		
+		if (priv->seekable && !priv->rawbuf) {
+			priv->rawbuf = g_malloc (HEADER_RAW_INIT_SIZE);
+			priv->rawleft = HEADER_RAW_INIT_SIZE - 1;
+			priv->rawptr = priv->rawbuf;
+		}
+	} else {
+		priv->persist_stream = FALSE;
+		
+		if (priv->rawbuf) {
+			g_free (priv->rawbuf);
+			priv->rawbuf = NULL;
+			priv->rawptr = NULL;
+			priv->rawleft = 0;
+		}
+	}
 }
 
 
@@ -849,25 +886,29 @@
 } G_STMT_END
 
 #define raw_header_append(priv, start, len) G_STMT_START {                \
-	if (priv->rawleft <= len) {                                       \
-		size_t hlen, hoff;                                        \
+	if (priv->rawbuf) {                                               \
+		if (priv->rawleft <= len) {                               \
+			size_t hlen, hoff;                                \
+			                                                  \
+			hoff = priv->rawptr - priv->rawbuf;               \
+			hlen = next_alloc_size (hoff + len + 1);          \
+			                                                  \
+			priv->rawbuf = g_realloc (priv->rawbuf, hlen);    \
+			priv->rawptr = priv->rawbuf + hoff;               \
+			priv->rawleft = (hlen - 1) - hoff;                \
+		}                                                         \
 		                                                          \
-		hoff = priv->rawptr - priv->rawbuf;                       \
-		hlen = next_alloc_size (hoff + len + 1);                  \
-		                                                          \
-		priv->rawbuf = g_realloc (priv->rawbuf, hlen);            \
-		priv->rawptr = priv->rawbuf + hoff;                       \
-		priv->rawleft = (hlen - 1) - hoff;                        \
+		memcpy (priv->rawptr, start, len);                        \
+		priv->rawptr += len;                                      \
+		priv->rawleft -= len;                                     \
 	}                                                                 \
-	                                                                  \
-	memcpy (priv->rawptr, start, len);                                \
-	priv->rawptr += len;                                              \
-	priv->rawleft -= len;                                             \
 } G_STMT_END
 
 #define raw_header_reset(priv) G_STMT_START {                             \
-	priv->rawleft += priv->rawptr - priv->rawbuf;                     \
-	priv->rawptr = priv->rawbuf;                                      \
+	if (priv->rawbuf) {                                               \
+		priv->rawleft += priv->rawptr - priv->rawbuf;             \
+		priv->rawptr = priv->rawbuf;                              \
+	}                                                                 \
 } G_STMT_END
 
 static void
@@ -933,7 +974,7 @@
 				 header->offset, priv->user_data);
 #elif defined (HAVE_REGEX_H)
 	if (priv->have_regex &&
-	    !regexec (&priv->header_regex, header->name, 0, NULL, 0))
+	    !regexec (&priv->regex, header->name, 0, NULL, 0))
 		priv->header_cb (parser, header->name, header->value,
 				 header->offset, priv->user_data);
 #endif
@@ -955,10 +996,8 @@
 	raw_header_reset (priv);
 	header_raw_clear (&priv->headers);
 	tail = (HeaderRaw *) &priv->headers;
-	priv->header_offset = parser_offset (priv, NULL);
-	
-	if (priv->headers_begin == -1)
-		priv->headers_begin = parser_offset (priv, NULL);
+	priv->headers_begin = parser_offset (priv, NULL);
+	priv->header_offset = priv->headers_begin;
 	
 	inptr = priv->inptr;
 	inend = priv->inend;
@@ -1089,33 +1128,30 @@
 	if (priv->headerptr > priv->headerbuf)
 		header_parse (parser, &tail);
 	
-	if (priv->headers_end == -1)
-		priv->headers_end = parser_offset (priv, start);
-	
+	priv->headers_end = parser_offset (priv, start);
 	priv->state = GMIME_PARSER_STATE_HEADERS_END;
-	*priv->rawptr = '\0';
+	if (priv->rawbuf)
+		*priv->rawptr = '\0';
 	priv->inptr = inptr;
 	
 	return 0;
 	
  next_message:
 	
-	if (priv->headers_end == -1)
-		priv->headers_end = parser_offset (priv, start);
-	
+	priv->headers_end = parser_offset (priv, start);
 	priv->state = GMIME_PARSER_STATE_COMPLETE;
-	*priv->rawptr = '\0';
+	if (priv->rawbuf)
+		*priv->rawptr = '\0';
 	priv->inptr = start;
 	
 	return 0;
 	
  content_start:
 	
-	if (priv->headers_end == -1)
-		priv->headers_end = parser_offset (priv, start);
-	
+	priv->headers_end = parser_offset (priv, start);
 	priv->state = GMIME_PARSER_STATE_CONTENT;
-	*priv->rawptr = '\0';
+	if (priv->rawbuf)
+		*priv->rawptr = '\0';
 	priv->inptr = start;
 	
 	return 0;
@@ -1210,20 +1246,25 @@
 	case GMIME_PARSER_STATE_ERROR:
 		break;
 	case GMIME_PARSER_STATE_INIT:
-		parser->priv->headers_begin = -1;
-		parser->priv->headers_end = -1;
+		priv->message_headers_begin = -1;
+		priv->message_headers_end = -1;
 		if (priv->scan_from)
 			priv->state = GMIME_PARSER_STATE_FROM;
 		else
 			priv->state = GMIME_PARSER_STATE_HEADERS;
 		break;
 	case GMIME_PARSER_STATE_FROM:
-		parser->priv->headers_begin = -1;
-		parser->priv->headers_end = -1;
+		priv->message_headers_begin = -1;
+		priv->message_headers_end = -1;
 		parser_step_from (parser);
 		break;
 	case GMIME_PARSER_STATE_HEADERS:
 		parser_step_headers (parser);
+		
+		if (priv->message_headers_begin == -1) {
+			priv->message_headers_begin = priv->headers_begin;
+			priv->message_headers_end = priv->headers_end;
+		}
 		break;
 	case GMIME_PARSER_STATE_HEADERS_END:
 		if (parser_skip_line (parser) == -1)
@@ -1460,6 +1501,7 @@
 	ContentType *content_type;
 	GMimeMessage *message;
 	GMimeObject *object;
+	GMimeStream *stream;
 	HeaderRaw *header;
 	
 	g_assert (priv->state == GMIME_PARSER_STATE_CONTENT);
@@ -1489,6 +1531,10 @@
 	content_type_destroy (content_type);
 	message->mime_part = object;
 	
+	/* set the same raw header stream on the message's header-list */
+	if ((stream = g_mime_header_list_get_stream (object->headers)))
+		g_mime_header_list_set_stream (((GMimeObject *) message)->headers, stream);
+	
 	g_mime_message_part_set_message (mpart, message);
 	g_object_unref (message);
 }
@@ -1498,6 +1544,7 @@
 {
 	struct _GMimeParserPrivate *priv = parser->priv;
 	GMimeObject *object;
+	GMimeStream *stream;
 	HeaderRaw *header;
 	
 	g_assert (priv->state >= GMIME_PARSER_STATE_HEADERS_END);
@@ -1520,7 +1567,15 @@
 	
 	header_raw_clear (&priv->headers);
 	
-	g_mime_header_list_set_raw (object->headers, priv->rawbuf);
+	/* set the raw header stream on the header-list */
+	if (priv->persist_stream && priv->seekable)
+		stream = g_mime_stream_substream (priv->stream, priv->headers_begin, priv->headers_end);
+	else
+		stream = g_mime_stream_mem_new_with_buffer (priv->rawbuf, priv->rawptr - priv->rawbuf);
+	
+	g_mime_header_list_set_stream (object->headers, stream);
+	g_object_unref (stream);
+	
 	raw_header_reset (priv);
 	
 	if (priv->state == GMIME_PARSER_STATE_HEADERS_END) {
@@ -1654,6 +1709,7 @@
 	GMimeMultipart *multipart;
 	const char *boundary;
 	GMimeObject *object;
+	GMimeStream *stream;
 	HeaderRaw *header;
 	
 	g_assert (priv->state >= GMIME_PARSER_STATE_HEADERS_END);
@@ -1668,7 +1724,15 @@
 	
 	header_raw_clear (&priv->headers);
 	
-	g_mime_header_list_set_raw (object->headers, priv->rawbuf);
+	/* set the raw header stream on the header-list */
+	if (priv->persist_stream && priv->seekable)
+		stream = g_mime_stream_substream (priv->stream, priv->headers_begin, priv->headers_end);
+	else
+		stream = g_mime_stream_mem_new_with_buffer (priv->rawbuf, priv->rawptr - priv->rawbuf);
+	
+	g_mime_header_list_set_stream (object->headers, stream);
+	g_object_unref (stream);
+	
 	raw_header_reset (priv);
 	
 	multipart = (GMimeMultipart *) object;
@@ -1758,6 +1822,7 @@
 	ContentType *content_type;
 	GMimeMessage *message;
 	GMimeObject *object;
+	GMimeStream *stream;
 	HeaderRaw *header;
 	char *endptr;
 	int found;
@@ -1802,6 +1867,10 @@
 	content_type_destroy (content_type);
 	message->mime_part = object;
 	
+	/* set the same raw header stream on the message's header-list */
+	if ((stream = g_mime_header_list_get_stream (object->headers)))
+		g_mime_header_list_set_stream (((GMimeObject *) message)->headers, stream);
+	
 	if (priv->scan_from) {
 		priv->state = GMIME_PARSER_STATE_FROM;
 		parser_pop_boundary (parser);
@@ -1896,7 +1965,7 @@
 {
 	g_return_val_if_fail (GMIME_IS_PARSER (parser), -1);
 	
-	return parser->priv->headers_begin;
+	return parser->priv->message_headers_begin;
 }
 
 
@@ -1915,5 +1984,5 @@
 {
 	g_return_val_if_fail (GMIME_IS_PARSER (parser), -1);
 	
-	return parser->priv->headers_end;
-}
+	return parser->priv->message_headers_end;
+}

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-buffer.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -466,8 +466,8 @@
 	    || (offset > 0 && offset <= buffer->buflen)) {
 		/* the position is within our pre-buffered region */
 		stream->position += offset;
-		buffer->bufptr += offset;
-		buffer->buflen -= offset;
+		buffer->bufptr += (size_t) offset;
+		buffer->buflen -= (size_t) offset;
 		
 		return stream->position;
 	}
@@ -489,7 +489,7 @@
 stream_seek_cache_read (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
 {
 	GMimeStreamBuffer *buffer = (GMimeStreamBuffer *) stream;
-	size_t len, total = 0;
+	gint64 buflen, len, total = 0;
 	gint64 pos, real;
 	ssize_t nread;
 	
@@ -538,7 +538,11 @@
 		
 		pos = buffer->bufptr - buffer->buffer;
 		
-		buffer->buflen = buffer->bufend - buffer->buffer + len;
+		buflen = (buffer->bufend - buffer->buffer) + len;
+		if (buflen < G_MAXSIZE)
+			buffer->buflen = (size_t) buflen;
+		else
+			buffer->buflen = G_MAXSIZE;
 		
 		buffer->buffer = g_realloc (buffer->buffer, buffer->buflen);
 		buffer->bufend = buffer->buffer + buffer->buflen;

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-file.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-file.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-file.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-file.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -21,6 +21,13 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <fcntl.h>
+#include <io.h>
 #endif
 
 #include <errno.h>
@@ -149,20 +156,8 @@
 	/* make sure we are at the right position */
 	fseek (fstream->fp, (long) stream->position, SEEK_SET);
 	
-	if ((nread = fread (buf, 1, len, fstream->fp)) > 0) {
-#ifdef G_OS_WIN32
-		/* fucking Windows... sigh. Since it might decide to translate \r\n into \n,
-		 * we need to query the real position rather than using simple math. */
-		long pos;
-		
-		if ((pos = ftell (fstream->fp)) == -1)
-			stream->position += nread;
-		else
-			stream->position = pos;
-#else
+	if ((nread = fread (buf, 1, len, fstream->fp)) > 0)
 		stream->position += nread;
-#endif
-	}
 	
 	return (ssize_t) nread;
 }
@@ -189,20 +184,8 @@
 	/* make sure we are at the right position */
 	fseek (fstream->fp, (long) stream->position, SEEK_SET);
 
-	if ((nwritten = fwrite (buf, 1, len, fstream->fp)) > 0) {
-#ifdef G_OS_WIN32
-		/* fucking Windows... sigh. Since it might decide to translate \n into \r\n,
-		 * we need to query the real position rather than using simple math. */
-		long pos;
-		
-		if ((pos = ftell (fstream->fp)) == -1)
-			stream->position += nwritten;
-		else
-			stream->position = pos;
-#else
+	if ((nwritten = fwrite (buf, 1, len, fstream->fp)) > 0)
 		stream->position += nwritten;
-#endif
-	}
 	
 	return (ssize_t) nwritten;
 }
@@ -373,7 +356,7 @@
 
 /**
  * g_mime_stream_file_new:
- * @fp: file pointer
+ * @fp: a FILE pointer
  *
  * Creates a new #GMimeStreamFile object around @fp.
  *
@@ -388,6 +371,10 @@
 	GMimeStreamFile *fstream;
 	gint64 start;
 	
+#ifdef G_OS_WIN32
+	_setmode (_fileno (fp), O_BINARY);
+#endif
+	
 	if ((start = ftell (fp)) == -1)
 		start = 0;
 	
@@ -402,7 +389,7 @@
 
 /**
  * g_mime_stream_file_new_with_bounds:
- * @fp: file pointer
+ * @fp: a FILE pointer
  * @start: start boundary
  * @end: end boundary
  *
@@ -419,6 +406,10 @@
 {
 	GMimeStreamFile *fstream;
 	
+#ifdef G_OS_WIN32
+	_setmode (_fileno (fp), O_BINARY);
+#endif
+	
 	fstream = g_object_newv (GMIME_TYPE_STREAM_FILE, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fstream), start, end);
 	fstream->owner = TRUE;
@@ -430,7 +421,7 @@
 
 /**
  * g_mime_stream_file_get_owner:
- * @stream: file stream
+ * @stream: a #GMimeStreamFile
  *
  * Gets whether or not @stream owns the backend FILE pointer.
  *
@@ -448,8 +439,8 @@
 
 /**
  * g_mime_stream_file_set_owner:
- * @stream: file stream
- * @owner: owner
+ * @stream: a #GMimeStreamFile
+ * @owner: %TRUE if this stream should own the FILE pointer or %FALSE otherwise
  *
  * Sets whether or not @stream owns the backend FILE pointer.
  *

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-fs.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-fs.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-fs.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-fs.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -172,18 +172,7 @@
 	} while (nread == -1 && errno == EINTR);
 	
 	if (nread > 0) {
-#ifdef G_OS_WIN32
-		/* fucking Windows... sigh. Since it might decide to translate \r\n into \n,
-		 * we need to query the real position rather than using simple math. */
-		off_t pos;
-		
-		if ((pos = lseek (fs->fd, 0, SEEK_CUR)) == -1)
-			stream->position += nread;
-		else
-			stream->position = pos;
-#else
 		stream->position += nread;
-#endif
 	} else if (nread == 0) {
 		fs->eos = TRUE;
 	}
@@ -227,18 +216,7 @@
 		fs->eos = TRUE;
 	
 	if (nwritten > 0) {
-#ifdef G_OS_WIN32
-		/* fucking Windows... sigh. Since it might decide to translate \n into \r\n,
-		 * we need to query the real position rather than using simple math. */
-		off_t pos;
-		
-		if ((pos = lseek (fs->fd, 0, SEEK_CUR)) == -1)
-			stream->position += nwritten;
-		else
-			stream->position = pos;
-#else
 		stream->position += nwritten;
-#endif
 	} else if (n == -1) {
 		/* error and nothing written */
 		return -1;
@@ -443,6 +421,10 @@
 	GMimeStreamFs *fs;
 	gint64 start;
 	
+#ifdef G_OS_WIN32
+	_setmode (fd, O_BINARY);
+#endif
+	
 	if ((start = lseek (fd, (off_t) 0, SEEK_CUR)) == -1)
 		start = 0;
 	
@@ -458,7 +440,7 @@
 
 /**
  * g_mime_stream_fs_new_with_bounds:
- * @fd: file descriptor
+ * @fd: a file descriptor
  * @start: start boundary
  * @end: end boundary
  *
@@ -471,6 +453,10 @@
 g_mime_stream_fs_new_with_bounds (int fd, gint64 start, gint64 end)
 {
 	GMimeStreamFs *fs;
+	
+#ifdef G_OS_WIN32
+	_setmode (fd, O_BINARY);
+#endif
 	
 	fs = g_object_newv (GMIME_TYPE_STREAM_FS, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fs), start, end);
@@ -484,7 +470,7 @@
 
 /**
  * g_mime_stream_fs_get_owner:
- * @stream: fs stream
+ * @stream: a #GMimeStreamFs
  *
  * Gets whether or not @stream owns the backend file descriptor.
  *
@@ -502,10 +488,10 @@
 
 /**
  * g_mime_stream_fs_set_owner:
- * @stream: fs stream
- * @owner: owner
- *
- * Sets whether or not @stream owns the backend FS pointer.
+ * @stream: a #GMimeStreamFs
+ * @owner: %TRUE if this stream should own the file descriptor or %FALSE otherwise
+ *
+ * Sets whether or not @stream owns the backend file descriptor.
  *
  * Note: @owner should be %TRUE if the stream should close() the
  * backend file descriptor when destroyed or %FALSE otherwise.

Modified: packages/unstable/gmime2.4/gmime/gmime-stream-mem.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-stream-mem.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-stream-mem.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-stream-mem.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -420,7 +420,7 @@
  * Sets the byte array on the memory stream.
  *
  * Note: The memory stream is not responsible for freeing the byte
- * array.
+ * array. Use g_mime_stream_mem_set_owner() to change this behavior.
  **/
 void
 g_mime_stream_mem_set_byte_array (GMimeStreamMem *mem, GByteArray *array)
@@ -465,7 +465,7 @@
 /**
  * g_mime_stream_mem_set_owner:
  * @mem: a #GMimeStreamMem
- * @owner: owner
+ * @owner: %TRUE if this stream should own the #GByteArray or %FALSE otherwise
  *
  * Sets whether or not @mem owns the backend memory buffer.
  *

Modified: packages/unstable/gmime2.4/gmime/gmime-utils.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/gmime/gmime-utils.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/gmime/gmime-utils.c [utf-8] (original)
+++ packages/unstable/gmime2.4/gmime/gmime-utils.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -126,26 +126,49 @@
 	111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
 };
 
-/* hrm, is there a library for this shit? */
+/* Timezone values defined in rfc5322 */
 static struct {
-	char *name;
+	const char *name;
 	int offset;
 } tz_offsets [] = {
-	{ "UT", 0 },
-	{ "GMT", 0 },
-	{ "EST", -500 },	/* these are all US timezones.  bloody yanks */
-	{ "EDT", -400 },
-	{ "CST", -600 },
-	{ "CDT", -500 },
-	{ "MST", -700 },
-	{ "MDT", -600 },
-	{ "PST", -800 },
-	{ "PDT", -700 },
-	{ "Z", 0 },
-	{ "A", -100 },
-	{ "M", -1200 },
-	{ "N", 100 },
-	{ "Y", 1200 },
+	{ "UT",       0 },
+	{ "GMT",      0 },
+	{ "EDT",   -400 },
+	{ "EST",   -500 },
+	{ "CDT",   -500 },
+	{ "CST",   -600 },
+	{ "MDT",   -600 },
+	{ "MST",   -700 },
+	{ "PDT",   -700 },
+	{ "PST",   -800 },
+	/* Note: rfc822 got the signs backwards for the military
+	 * timezones so some sending clients may mistakenly use the
+	 * wrong values. */
+	{ "A",      100 },
+	{ "B",      200 },
+	{ "C",      300 },
+	{ "D",      400 },
+	{ "E",      500 },
+	{ "F",      600 },
+	{ "G",      700 },
+	{ "H",      800 },
+	{ "I",      900 },
+	{ "K",     1000 },
+	{ "L",     1100 },
+	{ "M",     1200 },
+	{ "N",     -100 },
+	{ "O",     -200 },
+	{ "P",     -300 },
+	{ "Q",     -400 },
+	{ "R",     -500 },
+	{ "S",     -600 },
+	{ "T",     -700 },
+	{ "U",     -800 },
+	{ "V",     -900 },
+	{ "W",    -1000 },
+	{ "X",    -1100 },
+	{ "Y",    -1200 },
+	{ "Z",        0 },
 };
 
 static char *tm_months[] = {
@@ -1509,15 +1532,18 @@
 				errno = E2BIG;
 #endif
 			
-			if (errno == E2BIG) {
+			if (errno == E2BIG || outleft == 0) {
 				/* need to grow the output buffer */
 				outlen += (inleft * 2) + 16;
 				rc = (size_t) (outbuf - out);
 				out = g_realloc (out, outlen + 1);
 				outleft = outlen - rc;
 				outbuf = out + rc;
-			} else {
-				/* invalid byte(-sequence) in the input buffer */
+			}
+			
+			if (errno == EINVAL || errno == EILSEQ) {
+				/* invalid or incomplete multibyte
+				 * sequence in the input buffer */
 				*outbuf++ = '?';
 				outleft--;
 				inleft--;

Modified: packages/unstable/gmime2.4/install-sh
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/install-sh?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/install-sh [utf-8] (original)
+++ packages/unstable/gmime2.4/install-sh [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
 stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	shift;;
+
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,47 +458,58 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

Modified: packages/unstable/gmime2.4/missing
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/missing?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/missing [utf-8] (original)
+++ packages/unstable/gmime2.4/missing [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0

Modified: packages/unstable/gmime2.4/mono/GMime.metadata
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/mono/GMime.metadata?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/mono/GMime.metadata [utf-8] (original)
+++ packages/unstable/gmime2.4/mono/GMime.metadata [utf-8] Sun Dec  6 12:32:43 2009
@@ -124,6 +124,8 @@
 
   <!-- HeaderList -->
   <remove-node path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@cname='g_mime_header_list_foreach']"/>
+  <attr path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@name='SetStream']" name="hidden">true</attr>
+  <attr path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@name='GetStream']" name="hidden">true</attr>
   <attr path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@name='HasRaw']" name="hidden">true</attr>
   <attr path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@name='SetRaw']" name="hidden">true</attr>
   <attr path="/api/namespace/struct[@cname='GMimeHeaderList']/method[@name='Prepend']" name="name">PrependHeader</attr>

Modified: packages/unstable/gmime2.4/mono/gmime-api.raw
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/mono/gmime-api.raw?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/mono/gmime-api.raw [utf-8] (original)
+++ packages/unstable/gmime2.4/mono/gmime-api.raw [utf-8] Sun Dec  6 12:32:43 2009
@@ -2423,7 +2423,10 @@
           <parameter type="GMimeHeaderIter*" name="iter" />
         </parameters>
       </method>
-      <method name="HasRaw" cname="g_mime_header_list_has_raw">
+      <method name="GetStream" cname="g_mime_header_list_get_stream">
+        <return-type type="GMimeStream*" />
+      </method>
+      <method name="HasRaw" cname="g_mime_header_list_has_raw" deprecated="1">
         <return-type type="gboolean" />
       </method>
       <constructor cname="g_mime_header_list_new" />
@@ -2454,10 +2457,16 @@
           <parameter type="const-char*" name="value" />
         </parameters>
       </method>
-      <method name="SetRaw" cname="g_mime_header_list_set_raw">
+      <method name="SetRaw" cname="g_mime_header_list_set_raw" deprecated="1">
         <return-type type="void" />
         <parameters>
           <parameter type="const-char*" name="raw" />
+        </parameters>
+      </method>
+      <method name="SetStream" cname="g_mime_header_list_set_stream">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GMimeStream*" name="stream" />
         </parameters>
       </method>
       <method name="ToString" cname="g_mime_header_list_to_string">

Modified: packages/unstable/gmime2.4/mono/gmime-sharp.dll.config.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/mono/gmime-sharp.dll.config.in?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/mono/gmime-sharp.dll.config.in [utf-8] (original)
+++ packages/unstable/gmime2.4/mono/gmime-sharp.dll.config.in [utf-8] Sun Dec  6 12:32:43 2009
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gmime" target="libgmime-2.0.so. at GMIME_VERSION@"/>
+  <dllmap dll="gmime" target="libgmime- at GMIME_API_VERSION@.so. at GMIME_VERSION@"/>
 </configuration>

Modified: packages/unstable/gmime2.4/tests/test-parser.c
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gmime2.4/tests/test-parser.c?rev=22509&op=diff
==============================================================================
--- packages/unstable/gmime2.4/tests/test-parser.c [utf-8] (original)
+++ packages/unstable/gmime2.4/tests/test-parser.c [utf-8] Sun Dec  6 12:32:43 2009
@@ -129,11 +129,11 @@
 	{
 		GMimeStream *stream;
 		
-		g_mime_header_list_set_raw (GMIME_OBJECT (message)->headers, NULL);
+		g_mime_header_list_set_stream (GMIME_OBJECT (message)->headers, NULL);
 		
 		fprintf (stdout, "\nTesting preservation of headers...\n\n");
 		stream = g_mime_stream_file_new (stdout);
-		/*g_mime_header_set_raw (GMIME_OBJECT (message)->headers, NULL);*/
+		/*g_mime_header_set_stream (GMIME_OBJECT (message)->headers, NULL);*/
 		g_mime_header_list_write_to_stream (GMIME_OBJECT (message)->headers, stream);
 		g_mime_stream_flush (stream);
 		GMIME_STREAM_FILE (stream)->fp = NULL;




More information about the pkg-gnome-commits mailing list