sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5c27e2d3a78af19922a42489c8981d79d00c94e3..c7c40b23b9e6d18d80d4487c70a05f5a0abe1999 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-08 [colin]     0.9.11cvs17.15
+
+       * src/common/smtp.h
+               Sync with HEAD
+

 2004-07-08 [colin]     0.9.11cvs17.14
 
        * src/messageview.c
 2004-07-08 [colin]     0.9.11cvs17.14
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 2f28f9f51d55d9503b5af144d6f111740c773047..024d0696472a006bddc666e7b5e174595098f4df 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -8,3 +8,4 @@
 ( cvs diff -u -r 1.11.2.1 -r 1.11.2.2 src/common/smtp.c; cvs diff -u -r 1.6 -r 1.7 src/common/smtp.h; ) > 0.9.11cvs17.12.patchset
 ( cvs diff -u -r 1.149.2.7 -r 1.149.2.8 src/inc.c; cvs diff -u -r 1.94.2.8 -r 1.94.2.9 src/messageview.c; cvs diff -u -r 1.56.2.4 -r 1.56.2.5 src/pop.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/pop.h; cvs diff -u -r 1.150.2.4 -r 1.150.2.5 src/procmsg.c; ) > 0.9.11cvs17.13.patchset
 ( cvs diff -u -r 1.94.2.9 -r 1.94.2.11 src/messageview.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.4 src/common/smtp.c; ) > 0.9.11cvs17.14.patchset
 ( cvs diff -u -r 1.11.2.1 -r 1.11.2.2 src/common/smtp.c; cvs diff -u -r 1.6 -r 1.7 src/common/smtp.h; ) > 0.9.11cvs17.12.patchset
 ( cvs diff -u -r 1.149.2.7 -r 1.149.2.8 src/inc.c; cvs diff -u -r 1.94.2.8 -r 1.94.2.9 src/messageview.c; cvs diff -u -r 1.56.2.4 -r 1.56.2.5 src/pop.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/pop.h; cvs diff -u -r 1.150.2.4 -r 1.150.2.5 src/procmsg.c; ) > 0.9.11cvs17.13.patchset
 ( cvs diff -u -r 1.94.2.9 -r 1.94.2.11 src/messageview.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.4 src/common/smtp.c; ) > 0.9.11cvs17.14.patchset

+( cvs diff -u -r 1.6.2.1 -r 1.6.2.2 src/common/smtp.h; ) > 0.9.11cvs17.15.patchset

diff --git a/configure.ac b/configure.ac
index 7ebbfd3d64085567367b3ec636cae09f21a0471a..4178534c90a4e3e933931d8b0f2bcaf39c932671 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=17.14
+EXTRA_VERSION=17.15

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/common/smtp.h b/src/common/smtp.h
index 4212234a020cc6b672cc215e4281205a450d709a..0cc70cec1cdb330c719655ebb804581405190ea0 100644 (file)
--- a/src/common/smtp.h
+++ b/src/common/smtp.h
@@ -103,7 +103,7 @@ struct _SMTPSession
        guchar *send_data;
        guint send_data_len;
 
        guchar *send_data;
        guint send_data_len;
 

-       guint max_message_size;
+       gint max_message_size;

 
        SMTPAuthType avail_auth_type;
        SMTPAuthType forced_auth_type;
 
        SMTPAuthType avail_auth_type;
        SMTPAuthType forced_auth_type;