From 2cb330eb0978689dd2535c70be08fc01c0e05379 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 May 2010 16:17:30 -0400 Subject: Revert "Bug #608203 - Left pane of mailer window is really narrow at startup" This reverts commit 0cdd9484fec0b1fec0801df7d7e0b05c6544ba9b. Causes the Mail window to erroneously switch to Contacts when opening the Contacts window in express mode. --- shell/e-shell-window-private.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 7bcf069408..7e7185963e 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -412,24 +412,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window) bridge = gconf_bridge_get (); - /* First restore window size, then the rest */ - - /* Configure the initial size and position of the window by way - * of either a user-supplied geometry string or the last recorded - * values. Note that if a geometry string is applied, the window - * size and position are -not- recorded. */ - if (priv->geometry != NULL) { - if (!gtk_window_parse_geometry (window, priv->geometry)) - g_printerr ( - "Failed to parse geometry '%s'\n", - priv->geometry); - g_free (priv->geometry); - priv->geometry = NULL; - } else { - key = "/apps/evolution/shell/view_defaults/window"; - gconf_bridge_bind_window (bridge, key, window, TRUE, TRUE); - } - object = G_OBJECT (shell_window); key = "/apps/evolution/shell/view_defaults/component_id"; gconf_bridge_bind_property (bridge, key, object, "active-view"); @@ -464,6 +446,22 @@ e_shell_window_private_constructed (EShellWindow *shell_window) key = "/apps/evolution/shell/view_defaults/toolbar_visible"; gconf_bridge_bind_property (bridge, key, object, "toolbar-visible"); + /* Configure the initial size and position of the window by way + * of either a user-supplied geometry string or the last recorded + * values. Note that if a geometry string is applied, the window + * size and position are -not- recorded. */ + if (priv->geometry != NULL) { + if (!gtk_window_parse_geometry (window, priv->geometry)) + g_printerr ( + "Failed to parse geometry '%s'\n", + priv->geometry); + g_free (priv->geometry); + priv->geometry = NULL; + } else { + key = "/apps/evolution/shell/view_defaults/window"; + gconf_bridge_bind_window (bridge, key, window, TRUE, TRUE); + } + shell_window_init_switcher_style (shell_window); id = "org.gnome.evolution.shell"; -- cgit v1.2.3