From 87773593220e581de841e837c29acb99a818c890 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Thu, 25 Jun 2009 10:37:10 +0530
Subject: Add more apis for Anjal to draft composer.
---
mail/em-composer-utils.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
(limited to 'mail/em-composer-utils.c')
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 7bb87222cd..d76fc4eecb 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -763,7 +763,7 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri
/* Editing messages... */
-static void
+static GtkWidget *
edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
{
EMsgComposer *composer;
@@ -910,7 +910,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
composer_set_no_change (composer, TRUE, FALSE);
- gtk_widget_show (GTK_WIDGET (composer));
+ if (!e_msg_composer_get_lite())
+ gtk_widget_show (GTK_WIDGET (composer));
+
+ return (GtkWidget *)composer;
}
/**
@@ -921,15 +924,18 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
* Opens a composer filled in with the headers/mime-parts/etc of
* @message.
**/
-void
+GtkWidget *
em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
{
+ GtkWidget *composer = NULL;
g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
if (folder)
- edit_message (message, folder, NULL);
+ composer = edit_message (message, folder, NULL);
else
- edit_message (message, NULL, NULL);
+ composer = edit_message (message, NULL, NULL);
+
+ return composer;
}
static void
--
cgit
From 7984b925c84692df2ea9d30480431c8a84c0b657 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Thu, 25 Jun 2009 14:13:03 +0530
Subject: Fix some warnings
---
mail/em-composer-utils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'mail/em-composer-utils.c')
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index d76fc4eecb..9341950335 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -788,7 +788,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
content = camel_medium_get_content_object ((CamelMedium *) message);
if (!content)
- return;
+ return NULL;
/*
* Get non-multipart content from multipart message.
@@ -801,11 +801,11 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const gchar *uid)
}
if (!mime_part)
- return;
+ return NULL;
type = camel_mime_part_get_content_type (mime_part);
if (!camel_content_type_is (type, "text", "plain"))
- return;
+ return NULL;
mem = camel_stream_mem_new ();
camel_data_wrapper_decode_to_stream (content, mem);
@@ -928,7 +928,7 @@ GtkWidget *
em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
{
GtkWidget *composer = NULL;
- g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+ g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
if (folder)
composer = edit_message (message, folder, NULL);
--
cgit