diff options
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 9838f9c730..de6cda0e76 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -377,11 +377,13 @@ e_shell_window_get_menu_bar_box (EShellWindow *shell_window) static GtkWidget * shell_window_construct_toolbar (EShellWindow *shell_window) { + EShell *shell; GtkUIManager *ui_manager; GtkWidget *toolbar; GtkWidget *box; GtkToolItem *item; + shell = e_shell_window_get_shell (shell_window); ui_manager = e_shell_window_get_ui_manager (shell_window); box = gtk_hbox_new (FALSE, 0); @@ -394,7 +396,7 @@ shell_window_construct_toolbar (EShellWindow *shell_window) toolbar = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar"); - if (e_shell_get_meego_mode (shell_window->priv->shell)) + if (e_shell_get_meego_mode (shell)) gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); /* XXX Having this separator in the UI definition doesn't work @@ -430,16 +432,18 @@ shell_window_construct_toolbar (EShellWindow *shell_window) toolbar = e_shell_window_get_managed_widget ( shell_window, "/search-toolbar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); - gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); - if (e_shell_get_meego_mode (shell_window->priv->shell)) - gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + if (e_shell_get_express_mode (shell)) + gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); + if (e_shell_get_meego_mode (shell)) + gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); toolbar = e_shell_window_get_managed_widget ( shell_window, "/close-toolbar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); - gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); - if (e_shell_get_meego_mode (shell_window->priv->shell)) - gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + if (e_shell_get_meego_mode (shell)) + gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); + if (e_shell_get_meego_mode (shell)) + gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); return box; } |