Various fixes to make it work.

2003-08-18  Not Zed  <NotZed@Ximian.com>

        * camel-http-stream.c: Various fixes to make it work.

        * tests/smime/pgp-mime.c (main): added missing 'ret' variable.

        * providers/smtp/camel-smtp-transport.c (connect_to_server):
        * providers/imapp/camel-imapp-store.c (connect_to_server:
        * providers/imap/camel-imap-store.c (connect_to_server):
        * providers/pop3/camel-pop3-store.c (connect_to_server):
        * camel-http-stream.c (http_connect): change service->session for
        tcp_stream_ssl_new.

        * camel-tcp-stream-ssl.c: Changed service to session, and fix some
        refcounting of it.
        include camel-operation.h

svn path=/trunk/; revision=22275

1 files changed, 3 insertions, 3 deletions

diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index 40733662ef..41a82d0def 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -31,7 +31,6 @@ extern "C" {
 
 #include <camel/camel-mime-parser.h>
 #include <camel/camel-mime-utils.h>
-#include <camel/camel-service.h>
 #include <camel/camel-stream.h>
 #include <camel/camel-url.h>
 
@@ -63,7 +62,7 @@ struct _CamelHttpStream {
 	struct _header_raw *headers;
 	
 	CamelHttpMethod method;
-	CamelService *service;
+	struct _CamelSession *session;
 	CamelURL *url;
 	
 	char *user_agent;
@@ -76,6 +75,7 @@ struct _CamelHttpStream {
 	int statuscode;
 	
 	CamelStream *raw;
+	CamelStream *read;
 };
 
 struct _CamelHttpStreamClass {
@@ -88,7 +88,7 @@ struct _CamelHttpStreamClass {
 CamelType camel_http_stream_get_type (void);
 
 /* public methods */
-CamelStream *camel_http_stream_new (CamelHttpMethod method, CamelService *service, CamelURL *url);
+CamelStream *camel_http_stream_new (CamelHttpMethod method, struct _CamelSession *session, CamelURL *url);
 
 void camel_http_stream_set_user_agent (CamelHttpStream *http_stream, const char *user_agent);