[evolution/relayout-composer: 6/9] Merge express2 into relayout-composer

[Federico Mena Quintero <federico src gnome org>]

commit 2aa44ca3df3a60357397a47316465ffbeda1e82c
Merge: ac2ef9f 4aa2552
Author: Federico Mena Quintero <federico novell com>
Date:   Fri May 7 12:12:48 2010 -0500

    Merge express2 into relayout-composer

 capplet/settings/mail-account-view.c |    2 +
 composer/e-msg-composer.c            |    7 +++
 mail/e-mail-backend.c                |    6 ++
 shell/e-shell-window-actions.c       |   15 ++++--
 ui/evolution-calendars.ui            |    4 ++
 widgets/misc/e-preferences-window.c  |   89 ++++++++++++++++++++++++++++++++--
 widgets/misc/e-preferences-window.h  |    2 +
 7 files changed, 116 insertions(+), 9 deletions(-)
---
diff --cc composer/e-msg-composer.c
index ca8e487,f8e3471..888705d
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@@ -2145,7 -2145,14 +2145,14 @@@ msg_composer_class_init (EMsgComposerCl
  static void
  msg_composer_init (EMsgComposer *composer)
  {
+ 	EShell *shell = e_shell_get_default ();
 -	composer->lite = composer_lite;
++
  	composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
+ 
+ 	if (e_shell_get_express_mode (shell)) {
+ 		GtkWindow *window = e_shell_get_active_window(shell);
+ 		gtk_window_set_transient_for (GTK_WINDOW(composer), window);
+ 	}
  }
  
  GType