[evolution-data-server: 33/33] Merge branch camel-socks-proxy-master for SOCKS5 / IPv6 support

[Federico Mena Quintero <federico src gnome org>]

commit 3a5fb1f1d3cfdcf64173518138bc0e4c02bb6a64
Merge: 6d4660f 4f17f0f
Author: Federico Mena Quintero <federico novell com>
Date:   Thu Aug 12 18:12:36 2010 -0500

    Merge branch camel-socks-proxy-master for SOCKS5 / IPv6 support
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 camel/camel-http-stream.c                   |   13 +-
 camel/camel-tcp-stream-raw.c                | 1176 ++++++++++++++++++++-------
 camel/camel-tcp-stream-raw.h                |   24 +-
 camel/camel-tcp-stream-ssl.c                |  742 +----------------
 camel/camel-tcp-stream-ssl.h                |    9 +-
 camel/camel-tcp-stream.c                    |   25 +-
 camel/camel-tcp-stream.h                    |    9 +-
 camel/providers/imap/camel-imap-store.c     |   43 +-
 camel/providers/imapx/camel-imapx-server.c  |   77 +--
 camel/providers/imapx/camel-imapx-server.h  |    1 -
 camel/providers/nntp/camel-nntp-store.c     |   41 +-
 camel/providers/pop3/camel-pop3-store.c     |   43 +-
 camel/providers/smtp/camel-smtp-transport.c |   43 +-
 13 files changed, 1047 insertions(+), 1199 deletions(-)
---
diff --cc camel/camel-tcp-stream-ssl.h
index 74b1174,1ea727b..49c2b33
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@@ -27,10 -27,9 +27,9 @@@
  #ifndef CAMEL_TCP_STREAM_SSL_H
  #define CAMEL_TCP_STREAM_SSL_H
  
 -#ifdef HAVE_SSL
 +#ifdef CAMEL_HAVE_SSL
  
- #include <camel/camel-tcp-stream.h>
- #include <prio.h>
+ #include <camel/camel-tcp-stream-raw.h>
  
  /* Standard GObject macros */
  #define CAMEL_TYPE_TCP_STREAM_SSL \
@@@ -81,10 -80,8 +80,8 @@@ CamelStream *camel_tcp_stream_ssl_new_r
  
  gint camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl);
  
- PRFileDesc * camel_tcp_stream_ssl_sockfd (CamelTcpStreamSSL *stream);
- 
  G_END_DECLS
  
 -#endif /* HAVE_SSL */
 +#endif /* CAMEL_HAVE_SSL */
  
  #endif /* CAMEL_TCP_STREAM_SSL_H */
diff --cc camel/providers/imapx/camel-imapx-server.c
index 3a02423,d11f659..8a09195
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@@ -2702,11 -2701,12 +2701,12 @@@ imapx_connect_to_server (CamelIMAPXServ
  	if (is->url->port) {
  		serv = g_alloca(16);
  		sprintf((gchar *) serv, "%d", is->url->port);
+ 		fallback_port = 0;
  	} else {
  		serv = "imap";
- 		port = "143";
+ 		fallback_port = 143;
  	}
 -#ifdef HAVE_SSL
 +#ifdef CAMEL_HAVE_SSL
  	mode = camel_url_get_param(is->url, "use_ssl");
  	if (mode && strcmp(mode, "never") != 0) {
  		if (!strcmp(mode, "when-possible")) {
@@@ -2725,9 -2724,7 +2724,7 @@@
  	}
  #else
  	tcp_stream = camel_tcp_stream_raw_new ();
- 	is->is_ssl_stream = FALSE;
 -#endif /* HAVE_SSL */
 +#endif /* CAMEL_HAVE_SSL */
  
  	camel_session_get_socks_proxy (is->session, &socks_host, &socks_port);