Saving progress on a massive attachment handling rewrite.

svn path=/branches/kill-bonobo/; revision=37465

1 files changed, 4 insertions, 9 deletions

diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 5984d3cb2b..fc30472897 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -25,13 +25,14 @@
 
 #include <camel/camel-iconv.h>
 
-#include "e-attachment-bar.h"
 #include "e-composer-actions.h"
 #include "e-composer-autosave.h"
 #include "e-composer-header-table.h"
 #include "e-util/e-binding.h"
 #include "e-util/e-util.h"
 #include "e-util/gconf-bridge.h"
+#include "widgets/misc/e-attachment-paned.h"
+#include "widgets/misc/e-attachment-store.h"
 
 #define E_MSG_COMPOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -94,6 +95,8 @@ struct _EMsgComposerPrivate {
 
 	GtkWidget *html_editor;
 	GtkWidget *header_table;
+	GtkWidget *attachment_paned;
+
 	GtkActionGroup *charset_actions;
 	GtkActionGroup *composer_actions;
 
@@ -102,13 +105,6 @@ struct _EMsgComposerPrivate {
 
 	GtkWidget *focused_entry;
 
-	GtkWidget *attachment_bar;
-	GtkWidget *attachment_scrolled_window;
-	GtkWidget *attachment_expander;
-	GtkWidget *attachment_expander_label;
-	GtkWidget *attachment_expander_icon;
-	GtkWidget *attachment_expander_num;
-
 	GtkWidget *address_dialog;
 
 	GHashTable *inline_images;
@@ -117,7 +113,6 @@ struct _EMsgComposerPrivate {
 
 	gchar *mime_type, *mime_body, *charset;
 
-	guint32 attachment_bar_visible : 1;
 	guint32 is_alternative         : 1;
 	guint32 autosaved              : 1;
 	guint32 mode_post              : 1;