Merge commit 'origin/gnome-2-30' into express2

2 files changed, 20 insertions, 18 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3e073d2e96..1241dd41d3 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -89,7 +89,7 @@ libeshell_la_LIBADD =					\
 # Evolution executable
 
 if HAVE_WINDRES
-EVOLUTIONICONRC = evolution-icon.o
+EVOLUTIONICON = evolution-icon.o
 endif
 
 evolution_CPPFLAGS =						\
@@ -133,7 +133,7 @@ evolution_LDADD =							\
 	$(TZDIALOG_LIBS)						\
 	$(SHELL_LIBS)							\
 	$(GNOME_PLATFORM_LIBS)						\
-	$(EVOLUTIONICONRC)
+	$(EVOLUTIONICON)
 
 if OS_WIN32
 evolution_LDFLAGS = -mwindows
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index eda1d9106b..be5064a698 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -412,6 +412,24 @@ 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");
@@ -443,22 +461,6 @@ 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";