diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2003-09-22 23:00:59 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-09-22 23:00:59 +0800 |
commit | 4ba952503e20bb6a2ced1e4f64b7df184333a8f6 (patch) | |
tree | 7bbc5ebba8ef2400b7fe48da708c86fa90817301 /camel/providers | |
parent | c5a06d54f661243c0775dd3d40e173e661616c1b (diff) | |
download | gsoc2013-evolution-4ba952503e20bb6a2ced1e4f64b7df184333a8f6.tar.gz gsoc2013-evolution-4ba952503e20bb6a2ced1e4f64b7df184333a8f6.tar.zst gsoc2013-evolution-4ba952503e20bb6a2ced1e4f64b7df184333a8f6.zip |
Fix the code that creates a new ssl stream to pass the correct arguments
2003-09-22 Jeffrey Stedfast <fejj@ximian.com>
* providers/nntp/camel-nntp-store.c (connect_to_server): Fix the
code that creates a new ssl stream to pass the correct arguments
and the proper flags.
* providers/imapp/camel-imapp-folder.c (imap_sync): Cast the
CamelFolder to a CamelIMAPPFolder to hush some compiler warnings.
* camel-mime-utils.h: Define a struct _CamelContentDisposition
(allows the imapp code to compile)
* providers/imapp/camel-imapp-driver.c: #include <string.h>
svn path=/trunk/; revision=22635
Diffstat (limited to 'camel/providers')
-rw-r--r-- | camel/providers/imapp/camel-imapp-driver.c | 5 | ||||
-rw-r--r-- | camel/providers/imapp/camel-imapp-folder.c | 3 | ||||
-rw-r--r-- | camel/providers/nntp/camel-nntp-store.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/camel/providers/imapp/camel-imapp-driver.c b/camel/providers/imapp/camel-imapp-driver.c index b0644dc199..106e98fbb3 100644 --- a/camel/providers/imapp/camel-imapp-driver.c +++ b/camel/providers/imapp/camel-imapp-driver.c @@ -1,8 +1,11 @@ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdlib.h> +#include <string.h> #include <stdio.h> #include <ctype.h> diff --git a/camel/providers/imapp/camel-imapp-folder.c b/camel/providers/imapp/camel-imapp-folder.c index 19f3795056..967ab541f6 100644 --- a/camel/providers/imapp/camel-imapp-folder.c +++ b/camel/providers/imapp/camel-imapp-folder.c @@ -34,6 +34,7 @@ #include "camel/camel-operation.h" #include "camel/camel-data-cache.h" #include "camel/camel-session.h" +#include "camel/camel-file-utils.h" #include "camel-imapp-store.h" #include "camel-imapp-folder.h" @@ -177,7 +178,7 @@ imap_refresh_info (CamelFolder *folder, CamelException *ex) static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex) { - camel_imapp_driver_sync(((CamelIMAPPStore *)(folder->parent_store))->driver, expunge, folder); + camel_imapp_driver_sync(((CamelIMAPPStore *)(folder->parent_store))->driver, expunge, (CamelIMAPPFolder *) folder); } static CamelMimeMessage * diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index a04857e8df..531d4aefdf 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -35,7 +35,7 @@ #include <errno.h> #include <camel/camel-url.h> -#include <camel/string-utils.h> +#include <camel/camel-string-utils.h> #include <camel/camel-session.h> #include <camel/camel-tcp-stream-raw.h> #include <camel/camel-tcp-stream-ssl.h> @@ -112,7 +112,7 @@ connect_to_server (CamelService *service, int ssl_mode, CamelException *ex) #ifdef HAVE_SSL if (ssl_mode != USE_SSL_NEVER) { port = service->url->port ? service->url->port : NNTPS_PORT; - tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host); + tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 | CAMEL_TCP_STREAM_SSL_ENABLE_SSL3); } else { tcp_stream = camel_tcp_stream_raw_new (); } |