diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-04-13 15:50:59 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-04-13 15:50:59 +0800 |
| commit | f8574c815f3f2fe2c253d75d4a2dff8933aec545 (patch) | |
| tree | a645c71b801df92d5d04775b6d2164ee7939c561 /mail/em-folder-view.c | |
| parent | 1dfdac328cf8fd46042513dc9950cedb130f4593 (diff) | |
| download | gsoc2013-evolution-f8574c815f3f2fe2c253d75d4a2dff8933aec545.tar.gz gsoc2013-evolution-f8574c815f3f2fe2c253d75d4a2dff8933aec545.tar.zst gsoc2013-evolution-f8574c815f3f2fe2c253d75d4a2dff8933aec545.zip | |
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
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 11 |
1 files changed, 1 insertions, 10 deletions
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; |