diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-03-03 18:36:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-14 09:53:16 +0800 |
| commit | 19eea41c74154855cb68ee3a1fb41e2ec136b764 (patch) | |
| tree | 4c638c63b1bdca7a2352795c1da0e30fc5b14e7e /mail/e-mail-browser.c | |
| parent | 3d95369f38b22dea1fc22bb3f2cf306ae82aed9d (diff) | |
| download | gsoc2013-evolution-19eea41c74154855cb68ee3a1fb41e2ec136b764.tar.gz gsoc2013-evolution-19eea41c74154855cb68ee3a1fb41e2ec136b764.tar.zst gsoc2013-evolution-19eea41c74154855cb68ee3a1fb41e2ec136b764.zip | |
clean up the 'express' mode hooks for UI Managers and start to
extend them to plugins - use a simple one-off boolean on the UI Manager
instead of exhaustively trying to propagate this information everywhere.
Diffstat (limited to 'mail/e-mail-browser.c')
| -rw-r--r-- | mail/e-mail-browser.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 91dacbb392..13934d9c59 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -505,9 +505,8 @@ mail_browser_constructed (GObject *object) G_N_ELEMENTS (mail_browser_popup_entries)); gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); - e_load_ui_manager_definition (ui_manager, E_MAIL_READER_UI_DEFINITION, - e_shell_get_express_mode (shell)); - gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); + e_load_ui_manager_definition (ui_manager, E_MAIL_READER_UI_DEFINITION); + e_load_ui_manager_definition_from_string (ui_manager, ui, NULL); merge_id = gtk_ui_manager_new_merge_id (ui_manager); e_mail_reader_create_charset_menu (reader, ui_manager, merge_id); @@ -777,6 +776,8 @@ mail_browser_init (EMailBrowser *browser) browser->priv = E_MAIL_BROWSER_GET_PRIVATE (browser); browser->priv->ui_manager = gtk_ui_manager_new (); + e_load_ui_manager_set_express (browser->priv->ui_manager, + e_shell_get_express_mode (NULL)); browser->priv->action_group = gtk_action_group_new ("mail-browser"); browser->priv->html_display = em_format_html_display_new (); |