use %% for %%.

2004-04-13  Not Zed  <NotZed@Ximian.com>

        * em-format-html.c (efh_format_headers): use %% for %%.

        * em-folder-view.c (emfv_init, emfv_finalise, emfv_activate):
        revert dans' creatable items handler patch, moved to
        mail-component instead (which deals with the actual menu's).

        * mail-component.c (impl_createControls): setup a user creatable
        items handler on the view widget.
        (view_control_activate_cb): activate the user creatable items
        handler on the view widget.

        * em-folder-view.c (emfv_init): add a comment about jeff's last
        fix.

        * em-utils.c (forward_non_attached): Set attachments from
        forwardee before we set the body, otherwise images wont resolve
        properly.  Related to #56566.

svn path=/trunk/; revision=25428

5 files changed, 31 insertions, 14 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 56840d091a..70cceb0f1b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,23 @@
+2004-04-13  Not Zed  <NotZed@Ximian.com>
+
+	* em-format-html.c (efh_format_headers): use %% for %%.
+
+	* em-folder-view.c (emfv_init, emfv_finalise, emfv_activate):
+	revert dans' creatable items handler patch, moved to
+	mail-component instead (which deals with the actual menu's).
+
+	* mail-component.c (impl_createControls): setup a user creatable
+	items handler on the view widget.
+	(view_control_activate_cb): activate the user creatable items
+	handler on the view widget.
+
+	* em-folder-view.c (emfv_init): add a comment about jeff's last
+	fix.
+
+	* em-utils.c (forward_non_attached): Set attachments from
+	forwardee before we set the body, otherwise images wont resolve
+	properly.  Related to #56566.
+
 2004-04-12  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* em-folder-view.c (emfv_init): Need to set the session on the
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index e275d822bd..dc877498b3 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -55,7 +55,6 @@
 #include <bonobo/bonobo-ui-util.h>
 
 #include "widgets/misc/e-charset-picker.h"
-#include "shell/e-user-creatable-items-handler.h"
 
 #include <e-util/e-dialog-utils.h>
 
@@ -118,8 +117,6 @@ struct _EMFolderViewPrivate {
 
 	GtkWidget *invisible;
 	char *selection_uri;
-
-	EUserCreatableItemsHandler *creatable_items_handler;
 };
 
 static GtkVBoxClass *emfv_parent;
@@ -163,6 +160,7 @@ emfv_init(GObject *o)
 	g_signal_connect(emfv->list->tree, "key_press", G_CALLBACK(emfv_list_key_press), emfv);
 
 	emfv->preview = (EMFormatHTMLDisplay *)em_format_html_display_new();
+	/* FIXME: set_session should NOT be called here.  Should it be a constructor attribute? */
 	em_format_set_session ((EMFormat *) emfv->preview, session);
 	g_signal_connect(emfv->preview, "link_clicked", G_CALLBACK(emfv_format_link_clicked), emfv);
 	g_signal_connect(emfv->preview, "popup_event", G_CALLBACK(emfv_format_popup_event), emfv);
@@ -178,8 +176,6 @@ emfv_init(GObject *o)
 
 	emfv->async = mail_async_event_new();
 
-	p->creatable_items_handler = e_user_creatable_items_handler_new ("mail");
-
 	emfv_setting_setup(emfv);
 }
 
@@ -199,9 +195,6 @@ emfv_finalise(GObject *o)
 		g_free(emfv->folder_uri);
 	}
 
-	if (p->creatable_items_handler)
-		g_object_unref (p->creatable_items_handler);
-
 	g_slist_free(emfv->ui_files);
 	g_slist_free(emfv->enable_map);
 
@@ -1657,8 +1650,6 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act)
 		emfv_enable_menus(emfv);
 		if (emfv->statusbar_active)
 			bonobo_ui_component_set_translate (uic, "/", "<status><item name=\"main\"/></status>", NULL);
-
-		e_user_creatable_items_handler_activate (emfv->priv->creatable_items_handler, uic);
 	} else {
 		const BonoboUIVerb *v;
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 914455e000..c408af304f 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1631,7 +1631,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 	if (!efh->simple_headers)
 		camel_stream_printf(stream,
 				    "<font color=\"#%06x\">\n"
-				    "<table cellpadding=\"0\" width=\"100%\"><tr><td><table cellpadding=\"0\">\n",
+				    "<table cellpadding=\"0\" width=\"100%%\"><tr><td><table cellpadding=\"0\">\n",
 				    efh->text_colour & 0xffffff);
 
 	/* dump selected headers */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 1225604bd7..5f6236f1cc 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -538,12 +538,13 @@ forward_non_attached (GPtrArray *messages, int style)
 		if (text) {
 			composer = create_new_composer ();
 			e_msg_composer_set_headers (composer, NULL, NULL, NULL, NULL, subject);
-			e_msg_composer_set_body_text (composer, text);
-			
+
 			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));
 			if (CAMEL_IS_MULTIPART (wrapper))
 				e_msg_composer_add_message_attachments (composer, message, FALSE);
-			
+
+			e_msg_composer_set_body_text (composer, text);
+						
 			e_msg_composer_unset_changed (composer);
 			e_msg_composer_drop_editor_undo (composer);
 			
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 58648a9cbd..e8b6d3ccf4 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -59,6 +59,7 @@
 #include "mail-offline-handler.h"
 
 #include "e-activity-handler.h"
+#include "shell/e-user-creatable-items-handler.h"
 
 #include "composer/e-msg-composer.h"
 
@@ -381,6 +382,7 @@ view_control_activate_cb (BonoboControl *control, gboolean activate, EMFolderVie
 		g_return_if_fail (container != CORBA_OBJECT_NIL);
 		
 		em_folder_view_activate (view, uic, activate);
+		e_user_creatable_items_handler_activate(g_object_get_data((GObject *)view, "e-creatable-items-handler"), uic);
 	} else {
 		em_folder_view_activate (view, uic, activate);
 		bonobo_ui_component_unset_container (uic, NULL);
@@ -523,6 +525,9 @@ impl_createControls (PortableServer_Servant servant,
 	*corba_tree_control = CORBA_Object_duplicate (BONOBO_OBJREF (tree_control), ev);
 	*corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
 	*corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
+
+	g_object_set_data_full((GObject *)view_widget, "e-creatable-items-handler",
+			       e_user_creatable_items_handler_new("mail"), (GDestroyNotify)g_object_unref);
 	
 	g_signal_connect (view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
 	g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget);