b328a21e7c
* tests/message/test4.c: New test suite for the mime parser (which is where the below 2 fixes were noticed). * camel-mime-parser.c (folder_boundary_check): Calculate 'len' by subtracting the boundary start from inend rather than 'atleast'. (folder_scan_content): Calculate 'inend' differently depending on the EOF state. 2003-08-08 Jeffrey Stedfast <fejj@ximian.com> * camel-mime-filter-tohtml.c (html_convert): Rather than checking *inptr == '\n', check inptr >= inend - this gets rid of an Invalid Read report from valgrind. * camel-mime-part.c (write_to_stream): Don't necessarily re-encode just because the encodings differ. Need to look into making it so that message/rfc822 and multipart parts ignore the Content-Transfer-Encoding header and just keep their 'encoding' bits set to DEFAULT. 2003-08-05 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (get_content): Updated. * camel-mime-message.c (camel_mime_message_init): Don't override the mime_type here. (process_header): Updated to use CamelDataWrapper's mime_type field. (find_best_encoding): Same. (best_encoding): Here too. * camel-digest-folder.c (camel_digest_folder_new): Updated for CamelMimePart::content_type change. * camel-mime-part.c (camel_mime_part_init): Override our parent class's default mime_type. (camel_mime_part_finalize): Don't need to unref the content_type anymore. (process_header): Updated to use CamelDataWrapper's mime_type field. (camel_mime_part_set_filename): Same. (camel_mime_part_get_filename): Same. (camel_mime_part_get_content_type): Same. (set_content_object): Here too. (write_to_stream): Updated. (construct_from_parser): Updated. * camel-mime-part.h: Remove the content_type field. 2003-07-31 Jeffrey Stedfast <fejj@ximian.com> * tests/lib/messages.c (test_message_compare_content): If the chunks differ, perform a hexdump on the data being compared so that we may analyse it easier. * camel-multipart-signed.c (write_to_stream): Return ssize_t. * camel-mime-utils.h: Added the CamelMimePartEncodingType enum here. * camel-mime-part.h: Removed the CamelMimePartEncodingType enum from here. * camel-mime-part.c (write_to_stream): Updated to return ssize_t. Also minor changes to only re-encode the content stream if the charset or encoding changed (this way we write it out in the original raw form if nothing changed). * camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): Drastically simplify. We no longer scan html content to try and find the charset, nor do we care about converting the content to UTF-8 and handling broken windows charsets. * camel-mime-message.c (find_best_encoding): Use decode_to_stream() here. Also updated to not assume the content charset is UTF-8 since it is very likely not the case anymore since data-wrappers no longer are converted to UTF-8 at parse time. * camel-folder-summary.c (summary_build_content_info_message): Use decode_to_stream instead here too. * camel-folder-search.c (match_words_1message): Use decode_to_stream instead of write_to_stream so we can search the contents. * camel-data-wrapper.c (camel_data_wrapper_init): Set the default encoding to DEFAULT. (write_to_stream): Updated to return ssize_t (camel_data_wrapper_decode_to_stream): New virtual function to decode a data wrapper to a stream (results in nearly identical behaviour to the old write_to_stream method). (decode_to_stream): Default implementation of above virtual method. Decodes base64/qp/etc streams. * camel-data-wrapper.h: Removed the rawtext bit and added an encoding member. svn path=/trunk/; revision=22171
106 lines
3.9 KiB
C
106 lines
3.9 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* Authors: Bertrand Guiheneuf <bertrand@helixcode.com>
|
|
* Michael Zucchi <notzed@ximian.com>
|
|
* Jeffrey Stedfast <fejj@ximian.com>
|
|
*
|
|
* Copyright 1999-2003 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
|
|
#ifndef CAMEL_DATA_WRAPPER_H
|
|
#define CAMEL_DATA_WRAPPER_H 1
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#pragma }
|
|
#endif /* __cplusplus */
|
|
|
|
#include <glib.h>
|
|
#include <sys/types.h>
|
|
#include <camel/camel-object.h>
|
|
#include <camel/camel-mime-utils.h>
|
|
|
|
#define CAMEL_DATA_WRAPPER_TYPE (camel_data_wrapper_get_type ())
|
|
#define CAMEL_DATA_WRAPPER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))
|
|
#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))
|
|
#define CAMEL_IS_DATA_WRAPPER(o) (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))
|
|
|
|
struct _CamelDataWrapper {
|
|
CamelObject parent_object;
|
|
struct _CamelDataWrapperPrivate *priv;
|
|
|
|
CamelMimePartEncodingType encoding;
|
|
|
|
CamelContentType *mime_type;
|
|
CamelStream *stream;
|
|
|
|
unsigned int offline:1;
|
|
};
|
|
|
|
typedef struct {
|
|
CamelObjectClass parent_class;
|
|
|
|
/* Virtual methods */
|
|
void (*set_mime_type) (CamelDataWrapper *data_wrapper,
|
|
const char *mime_type);
|
|
char * (*get_mime_type) (CamelDataWrapper *data_wrapper);
|
|
CamelContentType * (*get_mime_type_field) (CamelDataWrapper *data_wrapper);
|
|
void (*set_mime_type_field) (CamelDataWrapper *data_wrapper,
|
|
CamelContentType *mime_type_field);
|
|
|
|
ssize_t (*write_to_stream) (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
|
|
ssize_t (*decode_to_stream) (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
|
|
int (*construct_from_stream) (CamelDataWrapper *data_wrapper,
|
|
CamelStream *);
|
|
|
|
gboolean (*is_offline) (CamelDataWrapper *data_wrapper);
|
|
} CamelDataWrapperClass;
|
|
|
|
/* Standard Camel function */
|
|
CamelType camel_data_wrapper_get_type (void);
|
|
|
|
/* public methods */
|
|
CamelDataWrapper *camel_data_wrapper_new(void);
|
|
ssize_t camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
ssize_t camel_data_wrapper_decode_to_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
|
|
void camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,
|
|
const char *mime_type);
|
|
char *camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper);
|
|
CamelContentType *camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper);
|
|
void camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,
|
|
CamelContentType *mime_type);
|
|
|
|
int camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,
|
|
CamelStream *stream);
|
|
|
|
gboolean camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* CAMEL_DATA_WRAPPER_H */
|