From 4ba952503e20bb6a2ced1e4f64b7df184333a8f6 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 22 Sep 2003 15:00:59 +0000 Subject: Fix the code that creates a new ssl stream to pass the correct arguments 2003-09-22 Jeffrey Stedfast * 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 svn path=/trunk/; revision=22635 --- camel/ChangeLog | 16 +++++++++++++++- camel/camel-mime-utils.h | 2 +- camel/providers/imapp/camel-imapp-driver.c | 5 ++++- camel/providers/imapp/camel-imapp-folder.c | 3 ++- camel/providers/nntp/camel-nntp-store.c | 4 ++-- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 5588c52786..f3a1ee8888 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,17 @@ +2003-09-22 Jeffrey Stedfast + + * 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 + 2003-09-18 Jeffrey Stedfast * camel-mime-utils.c (camel_transfer_encoding_to_string): New @@ -503,7 +517,7 @@ class's default mime_type. (camel_mime_part_finalize): Don't need to unref the content_type anymore. -M (process_header): Updated to use CamelDataWrapper's mime_type + (process_header): Updated to use CamelDataWrapper's mime_type field. (camel_mime_part_set_filename): Same. (camel_mime_part_get_filename): Same. diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h index 3048950411..d6274d5e2e 100644 --- a/camel/camel-mime-utils.h +++ b/camel/camel-mime-utils.h @@ -83,7 +83,7 @@ struct _camel_header_raw { int offset; /* in file, if known */ }; -typedef struct { +typedef struct _CamelContentDisposition { char *disposition; struct _camel_header_param *params; unsigned int refcount; 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 +#endif #include +#include #include #include 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 #include -#include +#include #include #include #include @@ -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 (); } -- cgit