New convenience function.

	* e-msg-composer.c (e_msg_composer_attach): New convenience
	function.

	* e-msg-composer-attachment.c: Store a CamelMimePart rather than
	filename/description/mime_type info. Also record whether we were
	told or guessed the MIME type.
	(e_msg_composer_attachment_new_from_mime_part): New constructor.
	(e_msg_composer_attachment_edit): Remove the "browse" button. (If
	the user wants to change the actual file that the attachment is
	based on, he should delete the attachment and create a new one...)
	Remove the "Apply" button, because it's not all that useful. Make
	the MIME type only track the filename if it was guessed rather
	than being provided.

	* e-msg-composer-attachment.glade: Remove "browse" and "apply"
	buttons. Make filename editable.

	* e-msg-composer-attachment-bar.c (sort): Removed. Send the
	attachments in the order the user attached them in.
	(text_changed): Removed, since we weren't enabling the relevant
	GnomeIconList functionality that would have used this.
	(update): Don't print the size if it's 0.
	(attach_to_multipart, etc): adjust for EMsgComposerAttachment
	changes.
	(attach_to_multipart): Use 7bit encoding for message/ subparts.
	(e_msg_composer_attachment_bar_attach_mime_part): New convenience
	function.

svn path=/trunk/; revision=3430

1 files changed, 4 insertions, 4 deletions

diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h
index 7e3c88238b..e0cd2eb867 100644
--- a/composer/e-msg-composer-attachment.h
+++ b/composer/e-msg-composer-attachment.h
@@ -25,6 +25,7 @@
 
 #include <gnome.h>
 #include <glade/glade-xml.h>
+#include <camel/camel-mime-part.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,10 +47,8 @@ struct _EMsgComposerAttachment {
 
 	GladeXML *editor_gui;
 
-	gchar *file_name;
-	gchar *description;
-	gchar *mime_type;
-
+	CamelMimePart *body;
+	gboolean guessed_type;
 	gulong size;
 };
 
@@ -62,6 +61,7 @@ struct _EMsgComposerAttachmentClass {
 
 GtkType e_msg_composer_attachment_get_type (void);
 EMsgComposerAttachment *e_msg_composer_attachment_new (const gchar *file_name);
+EMsgComposerAttachment *e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part);
 void e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,
 				     GtkWidget *parent);