diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-31 21:58:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-04-01 00:10:54 +0800 |
| commit | 0494d4c3c67403293c496d0ab6ce498b954a8a06 (patch) | |
| tree | 845fb73df494c60b39132fc6bbb1c1358f46ba54 /mail | |
| parent | 0125093ff7f0883fd8b97176a18cac5e798a37b9 (diff) | |
| download | gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.gz gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.bz2 gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.lz gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.xz gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.zst gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.zip | |
Remove EUIManager.
No longer needed. Use GtkUIManager directly.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-browser.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 8556fb2d3e..19b74fc311 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -553,7 +553,7 @@ mail_browser_constructed (GObject *object) shell_backend = E_SHELL_BACKEND (backend); shell = e_shell_backend_get_shell (shell_backend); - ui_manager = e_ui_manager_new (); + ui_manager = gtk_ui_manager_new (); browser->priv->ui_manager = ui_manager; domain = GETTEXT_PACKAGE; @@ -618,12 +618,10 @@ mail_browser_constructed (GObject *object) e_mail_reader_init (reader, TRUE, TRUE); - e_ui_manager_add_ui_from_file ( - E_UI_MANAGER (ui_manager), E_MAIL_READER_UI_DEFINITION); - e_ui_manager_add_ui_from_string ( - E_UI_MANAGER (ui_manager), ui, NULL); + e_load_ui_manager_definition (ui_manager, E_MAIL_READER_UI_DEFINITION); + gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); - merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (ui_manager)); + merge_id = gtk_ui_manager_new_merge_id (ui_manager); e_mail_reader_create_charset_menu (reader, ui_manager, merge_id); accel_group = gtk_ui_manager_get_accel_group (ui_manager); |