Commit the rest of the attachment UI rewrite

Oops, last commit only included the -new- files.
This also removes EExpander, which is no longer used.

1 files changed, 5 insertions, 7 deletions

diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index f6b2ca7cc0..54520ec941 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -28,6 +28,7 @@
 #include <libedataserver/e-account.h>
 #include <libebook/e-destination.h>
 #include <gtkhtml-editor.h>
+#include <widgets/misc/e-attachment-view.h>
 
 #include "e-composer-header-table.h"
 
@@ -100,7 +101,7 @@ void		e_msg_composer_modify_header	(EMsgComposer *composer,
 void		e_msg_composer_remove_header	(EMsgComposer *composer,
 						 const gchar *name);
 void		e_msg_composer_attach		(EMsgComposer *composer,
-						 CamelMimePart *attachment);
+						 CamelMimePart *mime_part);
 CamelMimePart *	e_msg_composer_add_inline_image_from_file
 						(EMsgComposer *composer,
 						 const gchar *filename);
@@ -139,22 +140,19 @@ void		e_msg_composer_add_message_attachments
 gboolean	e_msg_composer_request_close_all(void);
 EMsgComposer *	e_msg_composer_load_from_file	(const gchar *filename);
 void		e_msg_composer_check_autosave	(GtkWindow *parent);
-gint		e_msg_composer_get_remote_download_count
-						(EMsgComposer *composer);
 
 void		e_msg_composer_reply_indent	(EMsgComposer *composer);
 
 EComposerHeaderTable *
 		e_msg_composer_get_header_table	(EMsgComposer *composer);
+EAttachmentView *
+		e_msg_composer_get_attachment_view
+						(EMsgComposer *composer);
 void		e_msg_composer_set_send_options	(EMsgComposer *composer,
 						 gboolean send_enable);
 GByteArray *	e_msg_composer_get_raw_message_text
 						(EMsgComposer *composer);
 
-struct _EAttachmentBar *
-		e_msg_composer_get_attachment_bar
-						(EMsgComposer *composer);
-
 gboolean	e_msg_composer_is_exiting	(EMsgComposer *composer);
 
 GList *		e_load_spell_languages		(void);