[evolution-data-server/camel-socks-proxy] Change CamelImapStore to use the new API

[Federico Mena Quintero <federico src gnome org>]

commit b067b9e71949a2702c0ef89a2ffedeb7db5fd276
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Jul 12 15:36:18 2010 -0500

    Change CamelImapStore to use the new API
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 camel/providers/imap/camel-imap-store.c |   61 +++++++++++++------------------
 1 files changed, 25 insertions(+), 36 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 973cc6e..cfc245d 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -66,8 +66,8 @@
 #define d(x)
 
 /* Specified in RFC 2060 */
-#define IMAP_PORT "143"
-#define IMAPS_PORT "993"
+#define IMAP_PORT  143
+#define IMAPS_PORT 993
 
 #ifdef G_OS_WIN32
 /* The strtok() in Microsoft's C library is MT-safe (but still uses
@@ -545,7 +545,7 @@ enum {
 #endif
 
 static gboolean
-connect_to_server (CamelService *service, struct addrinfo *ai, gint ssl_mode, CamelException *ex)
+connect_to_server (CamelService *service, const char *host, const char *serv, gint fallback_port, gint ssl_mode, CamelException *ex)
 {
 	CamelImapStore *store = (CamelImapStore *) service;
 	CamelSession *session;
@@ -583,15 +583,21 @@ connect_to_server (CamelService *service, struct addrinfo *ai, gint ssl_mode, Ca
 		g_free (socks_host);
 	}
 
-	if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai) == -1) {
-		if (errno == EINTR)
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not connect to %s: %s"),
-					      service->url->host,
-					      g_strerror (errno));
+	if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, host, serv, fallback_port, ex) == -1) {
+		gint saved_errno;
+
+		saved_errno = errno;
+
+		if (!camel_exception_is_set (ex)) {
+			if (saved_errno == EINTR)
+				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
+						     _("Connection cancelled"));
+			else
+				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
+						      _("Could not connect to %s: %s"),
+						      host,
+						      g_strerror (saved_errno));
+		}
 
 		camel_object_unref (tcp_stream);
 
@@ -932,7 +938,7 @@ connect_to_server_process (CamelService *service, const gchar *cmd, CamelExcepti
 static struct {
 	const gchar *value;
 	const gchar *serv;
-	const gchar *port;
+	gint fallback_port;
 	gint mode;
 } ssl_options[] = {
 	{ "",              "imaps", IMAPS_PORT, MODE_SSL   },  /* really old (1.x) */
@@ -946,10 +952,9 @@ static gboolean
 connect_to_server_wrapper (CamelService *service, CamelException *ex)
 {
 	const gchar *ssl_mode;
-	struct addrinfo hints, *ai;
-	gint mode, ret, i;
+	gint mode, i;
 	const gchar *serv;
-	const gchar *port;
+	gint fallback_port;
 
 #ifndef G_OS_WIN32
 	const gchar *command;
@@ -965,36 +970,20 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
 				break;
 		mode = ssl_options[i].mode;
 		serv = (gchar *) ssl_options[i].serv;
-		port = ssl_options[i].port;
+		fallback_port = ssl_options[i].fallback_port;
 	} else {
 		mode = MODE_CLEAR;
 		serv = (gchar *) "imap";
-		port = IMAP_PORT;
+		fallback_port = IMAP_PORT;
 	}
 
 	if (service->url->port) {
 		serv = g_alloca (16);
 		sprintf ((gchar *)serv, "%d", service->url->port);
-		port = NULL;
-	}
-
-	memset (&hints, 0, sizeof (hints));
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_family = PF_UNSPEC;
-	ai = camel_getaddrinfo(service->url->host, serv, &hints, ex);
-	if (ai == NULL && port != NULL && camel_exception_get_id(ex) != CAMEL_EXCEPTION_USER_CANCEL) {
-		camel_exception_clear (ex);
-		ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
+		fallback_port = 0;
 	}
 
-	if (ai == NULL)
-		return FALSE;
-
-	ret = connect_to_server (service, ai, mode, ex);
-
-	camel_freeaddrinfo (ai);
-
-	return ret;
+	return connect_to_server (service, service->url->host, serv, fallback_port, mode, ex);
 }
 
 extern CamelServiceAuthType camel_imap_password_authtype;