2004-09-14 [colin] 0.9.12cvs99.5

	* src/common/socket.c
	* AUTHORS
		Fix send error on 64bit platforms
		Patch by Guy Rouillier <guy-rouillier@speakeasy.net>

diff --git a/AUTHORS b/AUTHORS
index 56fb0382e12202c4c4297feba167a2db09dbfe35..2ec6ca0aa13af3e804c6b9bd9773236f3c8a83f2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -209,3 +209,4 @@ contributors (beside the above; based on Changelog)
        Reza Pakdel
        Stephan Sachse
        Thomas Gilgin
+       Guy Rouillier

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 27d8de914b5efeb8c3e0438afa468c14d6cd27b8..693e248d4c44e25f7641553392b66383ac264814 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-09-14 [colin]     0.9.12cvs99.5
+
+       * src/common/socket.c
+       * AUTHORS
+               Fix send error on 64bit platforms
+               Patch by Guy Rouillier <guy-rouillier@speakeasy.net>
+
 2004-09-14 [colin]     0.9.12cvs99.4
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 6b2dcf726e7977ed0aa5751ce1f5babcfb36a5fb..aa03ad0c18ccfbeb9a5257a0d59a567960b92485 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -168,3 +168,4 @@
 ( cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/action.c; ) > 0.9.12cvs99.2.patchset
 ( cvs diff -u -r 1.2504.2.19 -r 1.2504.2.20 ChangeLog.claws; cvs diff -u -r 1.213.2.16 -r 1.213.2.17 src/folder.c; ) > 0.9.12cvs99.3.patchset
 ( cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/action.c; ) > 0.9.12cvs99.4.patchset
+( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/socket.c; cvs diff -u -r 1.100.2.4 -r 1.100.2.5 AUTHORS; ) > 0.9.12cvs99.5.patchset

diff --git a/configure.ac b/configure.ac
index 3f3f95a849a6289d83359dd55ab499127ad5a070..cceca0e4a29b58f6d7f371ca0f0460d4017fbb13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=99
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.5
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/common/socket.c b/src/common/socket.c
index 5081891cc20dc6b5db9603890de1ddfab8e96c1a..2b8773bb8df0b2e6b987aca8a25313b19a5c8bf9 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -797,7 +797,7 @@ static gboolean sock_get_address_info_async_cb(GIOChannel *source,
        SockLookupData *lookup_data = (SockLookupData *)data;
        GList *addr_list = NULL;
        SockAddrData *addr_data;
-       guint bytes_read;
+       gsize bytes_read;
        gint ai_member[4];
        struct sockaddr *addr;