From f425fdc8e2a68fe6fece41ee0684ced30cebc1ed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Jul 2009 09:33:38 -0400 Subject: Fix some issues when building Anjal. --- mail/em-composer-utils.c | 10 +++++++--- mail/em-composer-utils.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 40abdcf37d..ce72600ed4 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -734,7 +734,7 @@ em_utils_compose_lite_new_message (const gchar *fromuri) * window. If @url is non-NULL, the composer fields will be filled in * according to the values in the mailto url. **/ -void +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri) { EMsgComposer *composer; @@ -754,8 +754,12 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri composer_set_no_change (composer, TRUE, url == NULL); - gtk_widget_show ((GtkWidget *) composer); - gdk_window_raise (((GtkWidget *) composer)->window); + if (!e_msg_composer_get_lite ()) { + gtk_widget_show ((GtkWidget *) composer); + gdk_window_raise (((GtkWidget *) composer)->window); + } + + return composer; } /* Editing messages... */ diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index f8c2cd580c..763de3301c 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -36,7 +36,7 @@ void em_utils_compose_new_message (const gchar *fromuri); EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace); -- cgit v1.2.3