diff options
author | Not Zed <NotZed@Ximian.com> | 2004-10-13 10:20:40 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2004-10-13 10:20:40 +0800 |
commit | 894f6a90c2d22d88c45c0226c898b16ed5110a67 (patch) | |
tree | e760c73d8ed6aa6e347a6172fa7c5311399de1a3 /camel/providers/imap | |
parent | 7553a0698cdb6567ec9ecf6bdf438949caf88ed5 (diff) | |
download | gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.gz gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.zst gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.zip |
kill cast as lvalue warning.
2004-10-13 Not Zed <NotZed@Ximian.com>
* providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new)
(imap4_sync_changes, imap4_sync):
* providers/imap4/camel-imap4-summary.c (untagged_fetch_all): kill
cast as lvalue warning.
* camel-string-utils.h: add prototype for camel_toupper.
* providers/imap4/camel-imap4-utils.c:
* providers/imap4/camel-imap4-summary.c:
* providers/imap4/camel-imap4-folder.c:
* providers/imap4/camel-imap4-engine.c:
* providers/imap4/camel-imap4-command.c:
* providers/imap4/camel-imap4-store.c: include camel-i18n.h.
2004-10-12 Not Zed <NotZed@Ximian.com>
** See bug ???
* providers/nntp/camel-nntp-store.c (connect_to_server): if we
have a username, try to authenticate before doing anything else.
** See bug #67895.
* providers/nntp/camel-nntp-summary.c (add_range_xover)
(add_range_head): use raw_command_auth since we might need auth
here.
* providers/nntp/camel-nntp-store.c (camel_nntp_raw_command_auth):
new almost-raw command that also does auth.
(xover_setup, connect_to_server, camel_nntp_command): use
raw_command_auth since we might need auth here.
2004-10-12 Not Zed <NotZed@Ximian.com>
** See bug #67898 and probably others.
* providers/imapp/camel-imapp-store.c (connect_to_server):
* providers/pop3/camel-pop3-store.c (connect_to_server_wrapper):
* providers/imap4/camel-imap4-store.c (connect_to_server_wrapper):
* providers/imap/camel-imap-store.c (connect_to_server_wrapper):
* providers/nntp/camel-nntp-store.c (connect_to_server_wrapper):
* providers/smtp/camel-smtp-transport.c (connect_to_server_wrapper):
Fallback to hard-coded port number if the name lookup fails and no
port was supplied.
svn path=/trunk/; revision=27562
Diffstat (limited to 'camel/providers/imap')
-rw-r--r-- | camel/providers/imap/camel-imap-store.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index bc89bae55b..afe9ed8c4b 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 SIMAP_PORT 993 +#define IMAP_PORT "143" +#define IMAPS_PORT "993" static CamelDiscoStoreClass *parent_class = NULL; @@ -867,13 +867,14 @@ connect_to_server_process (CamelService *service, const char *cmd, CamelExceptio static struct { char *value; char *serv; + char *port; int mode; } ssl_options[] = { - { "", "imaps", MODE_SSL }, /* really old (1.x) */ - { "always", "imaps", MODE_SSL }, - { "when-possible", "imap", MODE_TLS }, - { "never", "imap", MODE_CLEAR }, - { NULL, "imap", MODE_CLEAR }, + { "", "imaps", IMAPS_PORT, MODE_SSL }, /* really old (1.x) */ + { "always", "imaps", IMAPS_PORT, MODE_SSL }, + { "when-possible", "imap", IMAP_PORT, MODE_TLS }, + { "never", "imap", IMAP_PORT, MODE_CLEAR }, + { NULL, "imap", IMAP_PORT, MODE_CLEAR }, }; static gboolean @@ -883,7 +884,8 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) struct addrinfo hints, *ai; int mode, ret, i; char *serv; - + const char *port; + if ((command = camel_url_get_param (service->url, "command"))) return connect_to_server_process (service, command, ex); @@ -893,22 +895,30 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) break; mode = ssl_options[i].mode; serv = ssl_options[i].serv; + port = ssl_options[i].port; } else { mode = MODE_CLEAR; serv = "imap"; + port = IMAP_PORT; } if (service->url->port) { serv = g_alloca (16); sprintf (serv, "%d", service->url->port); + port = NULL; } memset (&hints, 0, sizeof (hints)); hints.ai_socktype = SOCK_STREAM; hints.ai_family = PF_UNSPEC; - if (!(ai = camel_getaddrinfo (service->url->host, serv, &hints, ex))) + 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); + } + if (ai == NULL) return FALSE; - + ret = connect_to_server (service, ai, mode, ex); camel_freeaddrinfo (ai); |