diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-02-25 01:41:10 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-14 09:49:49 +0800 |
| commit | 304777ae4cd03026fcee98c0863e9e43f483c97a (patch) | |
| tree | eff5e49cd55840db565e11c80d9e8deecfa5bf91 /shell | |
| parent | 2166e7f4c73e8cc1f9b7f00027eec9de05961ee2 (diff) | |
| download | gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar.gz gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar.bz2 gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar.lz gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar.xz gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.tar.zst gsoc2013-evolution-304777ae4cd03026fcee98c0863e9e43f483c97a.zip | |
Add generic 'express mode' conditionals to the UI XML
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-view.c | 5 | ||||
| -rw-r--r-- | shell/e-shell-window-actions.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 6135b58848..d029627153 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -594,8 +594,11 @@ shell_view_toggled (EShellView *shell_view) id = shell_view_class->ui_manager_id; if (view_is_active && priv->merge_id == 0) { + gboolean express = e_shell_get_express_mode ( + e_shell_backend_get_shell ( + e_shell_view_get_shell_backend (shell_view))); priv->merge_id = e_load_ui_manager_definition ( - ui_manager, basename); + ui_manager, basename, express); e_plugin_ui_enable_manager (ui_manager, id); } else if (!view_is_active && priv->merge_id != 0) { diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index d751251eb3..b29a96e49b 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1867,13 +1867,16 @@ e_shell_window_actions_init (EShellWindow *shell_window) GtkActionGroup *action_group; EFocusTracker *focus_tracker; GtkUIManager *ui_manager; + gboolean express; gchar *path; - + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + express = e_shell_get_express_mode ( + e_shell_window_get_shell (shell_window)); ui_manager = e_shell_window_get_ui_manager (shell_window); - e_load_ui_manager_definition (ui_manager, "evolution-shell.ui"); + e_load_ui_manager_definition (ui_manager, "evolution-shell.ui", express); /* Shell Actions */ action_group = ACTION_GROUP (SHELL); |