diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-05-08 01:12:48 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-05-08 01:12:48 +0800 |
| commit | 2aa44ca3df3a60357397a47316465ffbeda1e82c (patch) | |
| tree | 9b5c20341f42d9b1bb53cfbf59207f3dd85704b9 /shell/e-shell-window-actions.c | |
| parent | ac2ef9fb41e51292b379c6dee62dd765f783dae0 (diff) | |
| parent | 4aa2552cb46f0daa67e135231f82f7d5403e2d19 (diff) | |
| download | gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.gz gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.bz2 gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.lz gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.xz gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.tar.zst gsoc2013-evolution-2aa44ca3df3a60357397a47316465ffbeda1e82c.zip | |
Merge express2 into relayout-composer
Diffstat (limited to 'shell/e-shell-window-actions.c')
| -rw-r--r-- | shell/e-shell-window-actions.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 2cb53c1a02..06fce0fe69 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -926,10 +926,17 @@ action_preferences_cb (GtkAction *action, shell_backend = e_shell_view_get_shell_backend (shell_view); shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend); - if (shell_backend_class->preferences_page != NULL) - e_preferences_window_show_page ( - E_PREFERENCES_WINDOW (preferences_window), - shell_backend_class->preferences_page); + if (shell_backend_class->preferences_page != NULL) { + if (e_shell_get_express_mode (shell)) { + e_preferences_window_filter_page ( + E_PREFERENCES_WINDOW (preferences_window), + shell_backend_class->preferences_page); + } else { + e_preferences_window_show_page ( + E_PREFERENCES_WINDOW (preferences_window), + shell_backend_class->preferences_page); + } + } } /** |