diff options
Diffstat (limited to 'shell/e-shell-window-private.c')
| -rw-r--r-- | shell/e-shell-window-private.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 2272faca9e..6878ff7456 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -300,7 +300,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window) merge_id = gtk_ui_manager_new_merge_id (ui_manager); priv->gal_view_merge_id = merge_id; - /* Construct window widgets. */ widget = gtk_vbox_new (FALSE, 0); @@ -433,7 +432,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window) object = G_OBJECT (shell_window); key = "/apps/evolution/shell/view_defaults/component_id"; - gconf_bridge_bind_property (bridge, key, object, "active-view"); + g_object_set (object, "active-view", + gconf_client_get_string (e_shell_get_gconf_client (shell), key, NULL), + NULL); object = G_OBJECT (priv->content_pane); key = "/apps/evolution/shell/view_defaults/folder_bar/width"; @@ -443,14 +444,17 @@ e_shell_window_private_constructed (EShellWindow *shell_window) key = "/apps/evolution/shell/view_defaults/sidebar_visible"; gconf_bridge_bind_property (bridge, key, object, "sidebar-visible"); - object = G_OBJECT (shell_window); - key = "/apps/evolution/shell/view_defaults/statusbar_visible"; - gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); - if (e_shell_get_express_mode (shell)) { + const char *active_view = e_shell_window_get_active_view (shell_window); e_shell_window_set_switcher_visible (shell_window, FALSE); + e_shell_window_set_taskbar_visible (shell_window, active_view && + !strcmp (active_view, "mail")); } else { object = G_OBJECT (shell_window); + key = "/apps/evolution/shell/view_defaults/statusbar_visible"; + gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); + + object = G_OBJECT (shell_window); key = "/apps/evolution/shell/view_defaults/buttons_visible"; gconf_bridge_bind_property (bridge, key, object, "switcher-visible"); } |