diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 76a40d5b3b..b769cc9558 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2005-02-09 Not Zed <NotZed@Ximian.com> + + ** See bug #71429 + + * em-folder-view.c (emfv_activate): setup the plugin menu's after + the main ones. + 2005-02-08 Not Zed <NotZed@Ximian.com> ** See bug #72228 diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index c3273697c0..8793aba3ea 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1806,9 +1806,6 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) { struct _EMFolderViewPrivate *p = emfv->priv; - if (emfv->menu) - e_menu_activate((EMenu *)emfv->menu, uic, act); - if (act) { em_format_mode_t style; gboolean state; @@ -1822,6 +1819,10 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) bonobo_ui_component_add_verb_list_with_data(uic, emfv_message_verbs, emfv); e_pixmaps_update(uic, emfv_message_pixmaps); + /* must do plugin menu's after main ones because of bonobo bustedness */ + if (emfv->menu) + e_menu_activate((EMenu *)emfv->menu, uic, act); + state = emfv->preview->caret_mode; bonobo_ui_component_set_prop(uic, "/commands/CaretMode", "state", state?"1":"0", NULL); bonobo_ui_component_add_listener(uic, "CaretMode", emfv_caret_mode, emfv); @@ -1849,6 +1850,9 @@ emfv_activate(EMFolderView *emfv, BonoboUIComponent *uic, int act) } else { const BonoboUIVerb *v; + if (emfv->menu) + e_menu_activate((EMenu *)emfv->menu, uic, act); + /* TODO: Should this just rm /? */ for (v = &emfv_message_verbs[0]; v->cname; v++) bonobo_ui_component_remove_verb(uic, v->cname); |