callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync before going home

Browse Source 
svn path=/trunk/; revision=1026
This commit is contained in:
Bertrand Guiheneuf
1999-07-15 15:54:52 +00:00
parent 16d79f5577
commit 4a765990e5
6 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,8 @@
1999-07-15 root <guiheneu@linoleum.inria.fr>
* camel/camel-simple-data-wrapper.c:
* camel/camel-simple-data-wrapper.h:
1999-07-15 bertrand <Bertrand.Guiheneuf@aful.org>
* camel/url-util.c:
@ -9,6 +14,7 @@
* AUTHORS:
* ChangeLog:
Changed my email address.
1999-07-13 Miguel de Icaza <miguel@gnu.org>

14
camel/camel-data-wrapper.c
View File

@ -33,8 +33,8 @@ static GtkObjectClass *parent_class=NULL;
static void _construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
static void _write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
static void _set_mime_type (CamelDataWrapper *data_wrapper, GString *mime_type);
static GString *_get_mime_type (CamelDataWrapper *data_wrapper);
static void _set_mime_type (CamelDataWrapper *data_wrapper, gchar *mime_type);
static gchar *_get_mime_type (CamelDataWrapper *data_wrapper);
static void
camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
@ -147,28 +147,28 @@ camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper, CamelS
static void
_set_mime_type (CamelDataWrapper *data_wrapper, GString *mime_type)
_set_mime_type (CamelDataWrapper *data_wrapper, gchar *mime_type)
{
g_assert (mime_type);
gmime_content_field_construct_from_string (data_wrapper->mime_type, mime_type);
}
void
camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, GString *mime_type)
camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, gchar *mime_type)
{
CDW_CLASS(data_wrapper)->set_mime_type (data_wrapper, mime_type);
}
static GString *
static gchar *
_get_mime_type (CamelDataWrapper *data_wrapper)
{
GString *mime_type;
gchar *mime_type;
mime_type = gmime_content_field_get_mime_type (data_wrapper->mime_type);
return mime_type;
}
static GString *
static gchar *
camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
{
return CDW_CLASS(data_wrapper)->get_mime_type (data_wrapper);

8
camel/camel-data-wrapper.h
View File

@ -59,8 +59,8 @@ typedef struct {
/* Virtual methods */
void (*write_to_stream) (CamelDataWrapper *data_wrapper, CamelStream *stream);
void (*construct_from_stream) (CamelDataWrapper *data_wrapper, CamelStream *stream);
void (*set_mime_type) (CamelDataWrapper *data_wrapper, GString *content_type);
GString * (*get_mime_type) (CamelDataWrapper *data_wrapper);
void (*set_mime_type) (CamelDataWrapper *data_wrapper, gchar *content_type);
gchar * (*get_mime_type) (CamelDataWrapper *data_wrapper);
} CamelDataWrapperClass;
@ -74,8 +74,8 @@ GtkType camel_data_wrapper_get_type (void);
void camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
void camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
void camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, GString *mime_type);
static GString *camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper);
void camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, gchar *mime_type);
static gchar *camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper);
#ifdef __cplusplus
}

84
camel/gmime-content-field.c
View File

@ -23,44 +23,80 @@
#include <config.h>
#include "gmime-content-field.h"
#include "gstring-util.h"
/* #include "-util.h" */
#include "camel-log.h"
/
GMimeContentField *
gmime_content_field_new (GString *type, GString *subtype)
/**
* gmime_content_field_new: Creates a new GMimeContentField object
* @type: mime type
* @subtype: mime subtype
*
* Creates a GMimeContentField object and initialize it with
* a mime type and a mime subtype. For example,
* gmime_content_field_new ("application", "postcript");
* will create a content field with complete mime type
* "application/postscript"
*
* Return value: The newly created GMimeContentField object
**/
void
gmime_content_field_new (const gchar *type, const gchar *subtype)
{
GMimeContentField *ctf;
ctf = g_new (GMimeContentField,1);
ctf = g_new (GMimeContentField, 1);
ctf->type = type;
ctf->subtype = subtype;
ctf->parameters = g_hash_table_new(g_string_hash, g_string_equal_for_hash);
ctf->parameters = g_hash_table_new (g_str_hash, g_str_equal);
return ctf;
}
/**
* gmime_content_field_set_parameter: set a parameter for a GMimeContentField object
* @content_field: content field
* @attribute: parameter name
* @value: paramteter value
*
* set a parameter (called attribute in RFC 2045) of a content field. Meaningfull
* or valid parameters name depend on the content type object. For example,
* gmime_content_field_set_parameter (cf, "charset", "us-ascii");
* will make sense for a "text/plain" content field but not for a
* "image/gif". This routine does not check parameter validuty.
**/
void
gmime_content_field_set_parameter (GMimeContentField *content_field, GString *attribute, GString *value)
gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value)
{
gboolean attribute_exists;
GString *old_attribute;
GString *old_value;
gchar *old_attribute;
gchar *old_value;
attribute_exists = g_hash_table_lookup_extended (content_field->parameters,
attribute,
(gpointer *) &old_attribute,
(gpointer *) &old_value);
/** CHECK THAT **/
if (attribute_exists) {
g_string_assign(old_value, value->str);
g_string_free (value, TRUE);
g_string_free (attribute, TRUE);
} else
g_hash_table_insert (content_field->parameters, attribute, value);
g_string_free (old_value, TRUE);
g_string_free (old_attribute, TRUE);
}
g_hash_table_insert (content_field->parameters, attribute, value);
}
/**
* _print_parameter: print a parameter/value pair to a stream as
* described in RFC 2045
* @name: name of the parameter
* @value: value of the parameter
* @user_data: CamelStream object to write the text to.
*
*
**/
static void
_print_parameter (gpointer name, gpointer value, gpointer user_data)
{
@ -68,9 +104,9 @@ _print_parameter (gpointer name, gpointer value, gpointer user_data)
camel_stream_write_strings (stream,
"; \n ",
((GString *)name)->str,
(gchar *)name,
"=",
((GString *)value)->str,
(gchar *)value,
NULL);
}
@ -87,9 +123,9 @@ gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStre
{
if (!content_field) return;
if ((content_field->type) && ((content_field->type)->str)) {
camel_stream_write_strings (stream, "Content-Type: ", content_field->type->str, NULL);
if ((content_field->subtype) && ((content_field->subtype)->str)) {
camel_stream_write_strings (stream, "/", content_field->subtype->str, NULL);
camel_stream_write_strings (stream, "Content-Type: ", content_field->type, NULL);
if (content_field->subtype) {
camel_stream_write_strings (stream, "/", content_field->subtype, NULL);
}
/* print all parameters */
g_hash_table_foreach (content_field->parameters, _print_parameter, stream);
@ -97,13 +133,13 @@ gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStre
}
}
GString *
gchar *
gmime_content_field_get_mime_type (GMimeContentField *content_field)
{
GString *mime_type;
gchar *mime_type;
if (!content_field->type) return NULL;
mime_type = g_string_clone (content_field->type);
mime_type = g_strdup (content_field->type);
if (content_field->subtype) {
g_string_append_c (mime_type, '/');
g_string_append_g_string (mime_type, content_field->subtype);
@ -113,13 +149,13 @@ gmime_content_field_get_mime_type (GMimeContentField *content_field)
void
gmime_content_field_construct_from_string (GMimeContentField *content_field, GString *string)
gmime_content_field_construct_from_string (GMimeContentField *content_field, gchar *string)
{
gint first, len;
gchar *str;
gint i=0;
GString *type, *subtype;
GString *param_name, *param_value;
gchar *type, *subtype;
gchar *param_name, *param_value;
gboolean param_end;
CAMEL_LOG (TRACE, "Entering gmime_content_field_construct_from_string\n");

12
camel/gmime-content-field.h
View File

@ -37,18 +37,18 @@ extern "C" {
typedef struct {
GString *type;
GString *subtype;
gchar *type;
gchar *subtype;
GHashTable *parameters;
} GMimeContentField;
GMimeContentField *gmime_content_field_new (GString *type, GString *subtype);
void gmime_content_field_set_parameter(GMimeContentField *content_field, GString *attribute, GString *value);
GMimeContentField *gmime_content_field_new (const gchar *type, const gchar *subtype);
void gmime_content_field_set_parameter (GMimeContentField *content_field, const gchar *attribute, const gchar *value);
void gmime_content_field_write_to_stream (GMimeContentField *content_field, CamelStream *stream);
void gmime_content_field_construct_from_string (GMimeContentField *content_field, GString *string);
void gmime_content_field_construct_from_string (GMimeContentField *content_field, gchar *string);
void gmime_content_field_free (GMimeContentField *content_field);
GString * gmime_content_field_get_mime_type (GMimeContentField *content_field);
gchar * gmime_content_field_get_mime_type (GMimeContentField *content_field);
#ifdef __cplusplus

1
camel/url-util.h
View File

@ -39,6 +39,7 @@ typedef struct {
gchar *port;
gchar *path;
/* used only as a cache */
gchar *url_string;
} Gurl;