Merge commit 'origin/express2' into express2

1 files changed, 12 insertions, 22 deletions

diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index f8e34718a1..e5d21862f0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -85,8 +85,6 @@ enum {
 	LAST_SIGNAL
 };
 
-gboolean composer_lite = FALSE;
-
 static gpointer parent_class;
 static guint signals[LAST_SIGNAL];
 
@@ -2146,7 +2144,7 @@ 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)) {
@@ -2198,29 +2196,21 @@ e_msg_composer_new (void)
 		"html", e_web_view_new (), NULL);
 }
 
-void
-e_msg_composer_set_lite (void)
-{
-	composer_lite = TRUE;
-}
-
+/**
+ * e_msg_composer_get_lite:
+ *
+ * Used within the composer to see if it should be made suitable for small
+ * screens.
+ *
+ * Return value: whether the surrounding #EShell is in small screen mode.
+ */
 gboolean
 e_msg_composer_get_lite (void)
 {
-	return composer_lite;
-}
-
-EMsgComposer *
-e_msg_composer_lite_new (void)
-{
-	EMsgComposer *composer;
-
-	/* Init lite-composer for ever for the session */
-	composer_lite = TRUE;
-
-	composer = e_msg_composer_new ();
+	EShell *shell;
 
-	return composer;
+	shell = e_shell_get_default ();
+	return e_shell_get_small_screen_mode (shell);
 }
 
 EFocusTracker *