From ef31f5027f8ca03b6cc611aa75cc6437b7fec4b4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 14 Apr 2010 12:40:59 +0200 Subject: Bug #608203 - Left pane of mailer window is really narrow at startup --- shell/e-shell-window-private.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index faccac8052..2272faca9e 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -413,6 +413,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"); @@ -441,22 +459,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"; -- cgit From 74c9169a075d9edceb7d468b5026f5d285fcb370 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Tue, 20 Apr 2010 15:15:11 +0200 Subject: Give the windows version of evolution-alarm-notify a nice win32 icon --- shell/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index 0a93912680..7b742debae 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -87,7 +87,7 @@ libeshell_la_LIBADD = \ # Evolution executable if HAVE_WINDRES -EVOLUTIONICONRC = evolution-icon.o +EVOLUTIONICON = evolution-icon.o endif evolution_CPPFLAGS = \ @@ -131,7 +131,7 @@ evolution_LDADD = \ $(TZDIALOG_LIBS) \ $(SHELL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTIONICONRC) + $(EVOLUTIONICON) if OS_WIN32 evolution_LDFLAGS = -mwindows -- cgit