Merge branch 'express2'

1 files changed, 11 insertions, 38 deletions

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 82984d698e..514885c28b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -710,16 +710,14 @@ em_utils_composer_print_cb (EMsgComposer *composer,
 /* Composing messages... */
 
 static EMsgComposer *
-create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite)
+create_new_composer (const gchar *subject, const gchar *fromuri)
 {
 	EMsgComposer *composer;
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 
-	if (lite)
-		composer = e_msg_composer_lite_new ();
-	else
-		composer = e_msg_composer_new ();
+	composer = e_msg_composer_new ();
+
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
@@ -749,7 +747,7 @@ em_utils_compose_new_message (const gchar *fromuri)
 {
 	GtkWidget *composer;
 
-	composer = (GtkWidget *) create_new_composer ("", fromuri, FALSE);
+	composer = (GtkWidget *) create_new_composer ("", fromuri);
 	if (composer == NULL)
 		return;
 
@@ -759,26 +757,6 @@ em_utils_compose_new_message (const gchar *fromuri)
 }
 
 /**
- * em_utils_compose_lite_new_message:
- *
- * Opens a new composer window as a child window of @parent's toplevel
- * window.
- **/
-EMsgComposer *
-em_utils_compose_lite_new_message (const gchar *fromuri)
-{
-	GtkWidget *composer;
-
-	composer = (GtkWidget *) create_new_composer ("", fromuri, TRUE);
-	if (composer == NULL)
-		return NULL;
-
-	composer_set_no_change (E_MSG_COMPOSER (composer), TRUE, TRUE);
-
-	return E_MSG_COMPOSER (composer);
-}
-
-/**
  * em_utils_compose_new_message_with_mailto:
  * @url: mailto url
  *
@@ -806,8 +784,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
 
 	composer_set_no_change (composer, TRUE, url == NULL);
 
-	if (!e_msg_composer_get_lite ())
-		gtk_window_present (GTK_WINDOW (composer));
+	gtk_window_present (GTK_WINDOW (composer));
 
 	return composer;
 }
@@ -986,8 +963,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return (GtkWidget *)composer;
 }
@@ -1136,7 +1112,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 {
 	EMsgComposer *composer;
 
-	composer = create_new_composer (subject, fromuri, FALSE);
+	composer = create_new_composer (subject, fromuri);
 	if (composer == NULL)
 		return NULL;
 
@@ -1147,8 +1123,7 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }
@@ -1218,7 +1193,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 		text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found);
 
 		if (text) {
-			composer = create_new_composer (subject, fromuri, FALSE);
+			composer = create_new_composer (subject, fromuri);
 
 			if (composer) {
 				if (CAMEL_IS_MULTIPART(camel_medium_get_content ((CamelMedium *)message)))
@@ -1235,8 +1210,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
 
 				emu_update_composers_security (composer, validity_found);
 				composer_set_no_change (composer, TRUE, TRUE);
-				if (!e_msg_composer_get_lite())
-					gtk_widget_show (GTK_WIDGET (composer));
+				gtk_widget_show (GTK_WIDGET (composer));
 			}
 			g_free (text);
 		}
@@ -2283,8 +2257,7 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	composer_set_no_change (composer, TRUE, TRUE);
 
-	if (!e_msg_composer_get_lite())
-		gtk_widget_show (GTK_WIDGET (composer));
+	gtk_widget_show (GTK_WIDGET (composer));
 
 	return composer;
 }