aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/em-composer-utils.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index a555da6bbd..32c30fdb60 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1140,17 +1140,17 @@ em_utils_forward_attached (CamelFolder *folder, GPtrArray *uids, const gchar *fr
mail_build_attachment (folder, uids, forward_attached_cb, fad);
}
-static void
+static struct _EMsgComposer *
forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, gint style, const gchar *fromuri)
{
CamelMimeMessage *message;
- EMsgComposer *composer;
+ EMsgComposer *composer = NULL;
gchar *subject, *text;
gint i;
guint32 flags;
if (messages->len == 0)
- return;
+ return NULL;
flags = EM_FORMAT_QUOTE_HEADERS | EM_FORMAT_QUOTE_KEEP_SIG;
if (style == MAIL_CONFIG_FORWARD_QUOTED)
@@ -1183,14 +1183,16 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
emu_update_composers_security (composer, validity_found);
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));
}
g_free (text);
}
g_free (subject);
}
+
+ return composer;
}
static void
@@ -1277,10 +1279,10 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
g_free (subject);
break;
case MAIL_CONFIG_FORWARD_INLINE:
- forward_non_attached (NULL, NULL, messages, MAIL_CONFIG_FORWARD_INLINE, fromuri);
+ composer = forward_non_attached (NULL, NULL, messages, MAIL_CONFIG_FORWARD_INLINE, fromuri);
break;
case MAIL_CONFIG_FORWARD_QUOTED:
- forward_non_attached (NULL, NULL, messages, MAIL_CONFIG_FORWARD_QUOTED, fromuri);
+ composer = forward_non_attached (NULL, NULL, messages, MAIL_CONFIG_FORWARD_QUOTED, fromuri);
break;
}