From f9352579b48ee7a697979e3f7043399097652cd9 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Fri, 7 May 2010 15:03:03 -0500
Subject: Use the lite-composer when the shell is in small-screen mode
Remove various utility functions that conditionally create
a lite composer, and just use the normal functions to
create a composer. The composer will know by itself whether
it needs to adjust for small screens.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
mail/em-composer-utils.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
(limited to 'mail/em-composer-utils.c')
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index fc312c8ae4..fd0b56e7da 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -720,16 +720,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) {
@@ -759,7 +757,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;
@@ -768,26 +766,6 @@ em_utils_compose_new_message (const gchar *fromuri)
gtk_widget_show (composer);
}
-/**
- * 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
@@ -1146,7 +1124,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;
@@ -1228,7 +1206,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_object((CamelMedium *)message)))
--
cgit