build libcomposer static and don't install it.

* Makefile.am: build libcomposer static and don't install it.

	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was
	only half-implemented. Finish it, mostly.

svn path=/trunk/; revision=2561
This commit is contained in:
Dan Winship
2000-04-23 17:12:18 +00:00
parent 5fcb83b5fb
commit b33db409a6
3 changed files with 33 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2000-04-23 Dan Winship <danw@helixcode.com>
* Makefile.am: build libcomposer static and don't install it.
* e-msg-composer-attachment-bar.c (attach_to_multipart): This was
only half-implemented. Finish it, mostly.
2000-04-22 Dan Winship <danw@helixcode.com>
* e-msg-composer.c (e_msg_composer_add_header): new function to

View File

@ -6,7 +6,8 @@ glade_DATA = \
libcomposerincludedir = $(includedir)/composer
lib_LTLIBRARIES = libcomposer.la
noinst_LTLIBRARIES = libcomposer.la
libcomposer_la_LDFLAGS = -static
INCLUDES = \
-I$(top_srcdir) \

View File

@ -26,6 +26,8 @@
#include "e-msg-composer-attachment.h"
#include "e-msg-composer-attachment-bar.h"
#include "camel/camel-simple-data-wrapper.h"
#include "camel/camel-stream-fs.h"
#define ICON_WIDTH 64
@ -603,19 +605,32 @@ attach_to_multipart (CamelMultipart *multipart,
EMsgComposerAttachment *attachment)
{
CamelMimeBodyPart *part;
/* FIXME encoding etc. etc. ? */
/* FIXME I am not sure how to add an attachment through the Camel
API. :-/ */
CamelDataWrapper *content;
CamelStream *stream;
char *filename;
part = camel_mime_body_part_new ();
camel_mime_part_set_disposition (CAMEL_MIME_PART (part), "attachment");
camel_mime_part_set_filename (CAMEL_MIME_PART (part),
g_strdup (g_basename (attachment->file_name)));
filename = g_basename (attachment->file_name);
camel_mime_part_set_filename (CAMEL_MIME_PART (part), filename);
g_free (filename);
camel_mime_part_set_description (CAMEL_MIME_PART (part),
g_strdup (attachment->description));
camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (part),
g_strdup (attachment->mime_type));
attachment->description);
camel_mime_part_set_content_type (CAMEL_MIME_PART (part),
attachment->mime_type);
content = CAMEL_DATA_WRAPPER (gtk_object_new (CAMEL_SIMPLE_DATA_WRAPPER_TYPE,
NULL));
camel_data_wrapper_set_mime_type (content, attachment->mime_type);
stream = camel_stream_fs_new_with_name (attachment->file_name,
CAMEL_STREAM_FS_READ);
camel_data_wrapper_construct_from_stream (content, stream);
camel_stream_close (stream);
camel_medium_set_content_object (CAMEL_MEDIUM (part), content);
/* FIXME: What about Content-Transfer-Encoding? */
camel_multipart_add_part (multipart, part);
}
void