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/imapp | |
parent | 7553a0698cdb6567ec9ecf6bdf438949caf88ed5 (diff) | |
download | gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.gz gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.bz2 gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.lz gsoc2013-evolution-894f6a90c2d22d88c45c0226c898b16ed5110a67.tar.xz 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/imapp')
-rw-r--r-- | camel/providers/imapp/camel-imapp-store.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c index 00ba0d00ce..23b6d3ca32 100644 --- a/camel/providers/imapp/camel-imapp-store.c +++ b/camel/providers/imapp/camel-imapp-store.c @@ -196,6 +196,7 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls) ex = camel_exception_new(); CAMEL_TRY { char *serv; + const char *port = NULL; struct addrinfo *ai, hints = { 0 }; /* parent class connect initialization */ @@ -206,16 +207,20 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls) if (service->url->port) { serv = g_alloca(16); sprintf(serv, "%d", service->url->port); - } else + } else { serv = "imap"; + port = "143"; + } #ifdef HAVE_SSL if (camel_url_get_param (service->url, "use_ssl")) { if (try_starttls) tcp_stream = camel_tcp_stream_ssl_new_raw (service->session, service->url->host, STARTTLS_FLAGS); else { - if (service->url->port == 0) + if (service->url->port == 0) { serv = "imaps"; + port = "993"; + } tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS); } } else { @@ -227,6 +232,11 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls) hints.ai_socktype = SOCK_STREAM; ai = camel_getaddrinfo(service->url->host, serv, &hints, ex); + if (ex->id && ex->id != CAMEL_EXCEPTION_USER_CANCEL && port != NULL) { + camel_exception_clear(ex); + ai = camel_getaddrinfo(service->url->host, port, &hints, ex); + } + if (ex->id) camel_exception_throw_ex(ex); |