diff options
author | NotZed <NotZed@HelixCode.com> | 2000-04-24 14:05:41 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2000-04-24 14:05:41 +0800 |
commit | 8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07 (patch) | |
tree | 9667ffd1192096e68ebeaf1183c5d0a8d818d2e5 /camel/camel-medium.c | |
parent | 7455842584ee656cb375b52064ff8c23560c568b (diff) | |
download | gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.gz gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.bz2 gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.lz gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.xz gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.tar.zst gsoc2013-evolution-8c9b0cc3f0d9cf8ca0c7b416a08d742b2694af07.zip |
No longer call data_wrapper_repository_init.
2000-04-24 NotZed <NotZed@HelixCode.com>
* camel.c (camel_init): No longer call
data_wrapper_repository_init.
* camel-medium.c (write_to_stream): Moved (back) to
camel-mime-part.
(add_header):
(set_header):
(remove_header):
(get_header): Make all these abstract, and spit warnings if
called. I guess it could manage the list, but well, it doesn't.
* camel-medium.h (struct _CamelMedium): Dont store headers here,
the implementor is the only one who knows their format.
(CamelMediumClass): Changed header values to be void *'s. They
need not be strings?
* camel-simple-data-wrapper.c (construct_from_stream): And we're
back. Set the output stream.
(construct_from_parser): Moved to camel-mime-part-utils.
* camel-mime-part-utils.c
(camel_mime_part_construct_content_from_parser): Create the
contents of multipart and simple messages.
* camel-multipart.c (construct_from_parser): Moved to
camel-mime-part-utils.
(separate_part): Removed.
* camel-mime-part.c (construct_from_stream): Back again! This now
switches over to using a mime parser for any mime parts, only.
(my_write_to_stream): Write our headers and so forth here.
(add_header): Add header directly, parent class is abstract.
(remove_header): Ditto.
(set_header): Ditto.
* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):
Remade abstract.
(camel_data_wrapper_construct_from_parser): Moved to
camel_mime_part.
* camel-data-wrapper.h: Put back construct_from_stream.
* camel-mime-part.h: Put construct_from_parser in here, the
data-wrapper shouldn't know about mime. Ok, so now to undo half
of the last hours changes ... duh.
2a51,93
* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use
construct_from_stream instead of set_input_stream().
* camel-simple-data-wrapper-stream.c
(camel_simple_data_wrapper_stream_construct): REmoved the destroy
callback code.
(wrapper_destroy_cb): Removed.
* camel-simple-data-wrapper.h: Add prototype for _construct()
method.
* camel.c: Include unicode.h to kill a warning.
* camel-data-wrapper.h (CameldataWrapperClass): Removed
construct_from_stream virtual method.
Removed get/set input stream.
* data-wrapper-repository.[ch]: Removed&from build. Obsoleted?
The justification as is follows: It is mixing storage
protocol/format with message architecture. It really just doesn't
serve any purpose, as each medium implementor will have to have its
own type->handler mapping, and the only current implementor,
mimepart has a very simple structure and no need for this.
* camel-medium.c (write_to_stream): Moved here from most of the
stuff in camel-mime-part. Well, the MEDIUM is the one that knows
what the headers are, and the content is, let it write it out.
* camel-mime-part-utils.c (camel_mime_part_construct_content):
Copied from camel-mime-part.c, removed handling of message
followon state (moved to camel-mime-message).
(camel_mime_part_construct_content_from_parser): Renamed from
construct_content.
(camel_mime_part_construct_headers_from_stream):
(camel_mime_part_construct_content_from_stream):
(camel_mime_part_store_stream_in_buffer): Removed. Replaced by
the new construct from parser stuff.
* camel-mime-message.c (construct_from_parser): Do
construct_from_parser for mime-message.
(_write_to_stream): Set the mime-version header for medium to
write out, rather than writing it out ourselves.
4a96,102
(construct_from_stream): Removed.
(camel_data_wrapper_construct_from_stream): Changed to a helper
function, creates a mime_parser, and constructs from that.
(set_input_stream): Removed.
(camel_data_wrapper_set_input_stream): Removed.
(get_input_stream): Removed.
(camel_data_wrapper_get_input_stream): Removed.
11a110,111
(_get_message_by_uid): Use construct_from_stream() instead of
creating our own parser.
16a117,131
(camel_mime_part_construct_content): Removed to
camel-mime-part-utils.c
(my_get_output_stream): Removed. The streeam is in the
data-wrapper.
(my_get_content_object): Removed. The content object is stored in
the medium. If none is there, the object wasn't created properly.
(my_write_content_to_stream): Removed. The content object is the
one that knows how to write itself out!!!!!!!!
(my_write_to_stream): Remove the base header writing stuff - has
been moved to camel-medium, where it belongs. This can just be
used to check for mandatory headers.
(my_construct_from_stream): Removed.
(my_set_input_stream): What the hell, i'll remove this too.
Nobody seems to understand how it differs from create from stream,
and they both seem to serve the same purpose ...
19a135,136
(construct_from_stream): Removed! Job taken over by
construct_from_parser.
24a142
(set_input_stream): REmoved. Replaced by construct_from_parser.
svn path=/trunk/; revision=2577
Diffstat (limited to 'camel/camel-medium.c')
-rw-r--r-- | camel/camel-medium.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/camel/camel-medium.c b/camel/camel-medium.c index fe87911b14..142d146ffe 100644 --- a/camel/camel-medium.c +++ b/camel/camel-medium.c @@ -1,7 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* camelMedium.c : Abstract class for a medium */ -/* +/* camelMedium.c : Abstract class for a medium * * Authors: Bertrand Guiheneuf <bertrand@helixcode.com> * Michael Zucchi <notzed@helixcode.com> @@ -24,14 +23,16 @@ * USA */ #include <config.h> -#include "camel-medium.h" #include <stdio.h> +#include <ctype.h> +#include "camel-medium.h" #include "gmime-content-field.h" #include "string-utils.h" #include "gmime-utils.h" #include "hash-table-utils.h" #include "camel-simple-data-wrapper.h" +#define d(x) static CamelDataWrapperClass *parent_class = NULL; @@ -39,15 +40,14 @@ static CamelDataWrapperClass *parent_class = NULL; #define CM_CLASS(so) CAMEL_MEDIUM_CLASS (GTK_OBJECT (so)->klass) static void add_header (CamelMedium *medium, const gchar *header_name, - const gchar *header_value); -static void set_header (CamelMedium *medium, const gchar *header_name, const gchar *header_value); + const void *header_value); +static void set_header (CamelMedium *medium, const gchar *header_name, const void *header_value); static void remove_header (CamelMedium *medium, const gchar *header_name); -static const gchar *get_header (CamelMedium *medium, const gchar *header_name); +static const void *get_header (CamelMedium *medium, const gchar *header_name); static CamelDataWrapper *get_content_object (CamelMedium *medium); static void set_content_object (CamelMedium *medium, CamelDataWrapper *content); - static void finalize (GtkObject *object); static void @@ -77,7 +77,6 @@ camel_medium_init (gpointer object, gpointer klass) { CamelMedium *camel_medium = CAMEL_MEDIUM (object); - camel_medium->headers = NULL; camel_medium->content = NULL; } @@ -111,8 +110,6 @@ finalize (GtkObject *object) { CamelMedium *medium = CAMEL_MEDIUM (object); - header_raw_clear(&medium->headers); - if (medium->content) gtk_object_unref (GTK_OBJECT (medium->content)); @@ -121,9 +118,9 @@ finalize (GtkObject *object) static void add_header (CamelMedium *medium, const gchar *header_name, - const gchar *header_value) + const void *header_value) { - header_raw_append(&medium->headers, header_name, header_value, -1); + g_warning("No %s::add_header implemented, adding %s", gtk_type_name(((GtkObject *)medium)->klass->type), header_name); } /** @@ -140,7 +137,7 @@ add_header (CamelMedium *medium, const gchar *header_name, **/ void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, - const gchar *header_value) + const void *header_value) { g_return_if_fail (CAMEL_IS_MEDIUM (medium)); g_return_if_fail (header_name != NULL); @@ -150,9 +147,9 @@ camel_medium_add_header (CamelMedium *medium, const gchar *header_name, } static void -set_header (CamelMedium *medium, const gchar *header_name, const gchar *header_value) +set_header (CamelMedium *medium, const gchar *header_name, const void *header_value) { - header_raw_replace(&medium->headers, header_name, header_value, -1); + g_warning("No %s::set_header implemented, setting %s", gtk_type_name(((GtkObject *)medium)->klass->type), header_name); } /** @@ -165,7 +162,7 @@ set_header (CamelMedium *medium, const gchar *header_name, const gchar *header_v * will be removed. **/ void -camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const gchar *header_value) +camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value) { g_return_if_fail (CAMEL_IS_MEDIUM (medium)); g_return_if_fail (header_name != NULL); @@ -177,7 +174,7 @@ camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const gc static void remove_header (CamelMedium *medium, const gchar *header_name) { - header_raw_remove(&medium->headers, header_name); + g_warning("No %s::remove_header implemented, removing %s", gtk_type_name(((GtkObject *)medium)->klass->type), header_name); } /** @@ -198,10 +195,11 @@ camel_medium_remove_header (CamelMedium *medium, const gchar *header_name) } -static const gchar * +static const void * get_header (CamelMedium *medium, const gchar *header_name) { - return header_raw_find(&medium->headers, header_name, NULL); + g_warning("No %s::get_header implemented, getting %s", gtk_type_name(((GtkObject *)medium)->klass->type), header_name); + return NULL; } /** @@ -216,12 +214,14 @@ get_header (CamelMedium *medium, const gchar *header_name) * * Return value: the value of the named header, or %NULL **/ -const gchar * +const void * camel_medium_get_header (CamelMedium *medium, const gchar *header_name) { g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL); g_return_val_if_fail (header_name != NULL, NULL); +#warning No way to get multi-valued headers? + return CM_CLASS (medium)->get_header (medium, header_name); } |