From f8574c815f3f2fe2c253d75d4a2dff8933aec545 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 13 Apr 2004 07:50:59 +0000 Subject: use %% for %%. 2004-04-13 Not Zed * 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 --- mail/mail-component.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mail/mail-component.c') 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); -- cgit