[evolution/gnome-3-8] em_utils_redirect_message: Return the EMsgComposer.

[Matthew Barnes <mbarnes src gnome org>]

commit 475ea467c199cf08411611efc00848ca9354f702
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 2 11:07:43 2013 -0400

    em_utils_redirect_message: Return the EMsgComposer.
    
    (cherry picked from commit ca14cc115ee90650f1546ed3d95bf1ce6010569f)

 mail/em-composer-utils.c |   10 +++++++---
 mail/em-composer-utils.h |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index b941e06..2ba3a14 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2181,21 +2181,25 @@ redirect_get_composer (EShell *shell,
  *
  * Opens a composer to redirect @message (Note: only headers will be
  * editable). Adds Resent-From/Resent-To/etc headers.
+ *
+ * Returns: the resulting #EMsgComposer
  **/
-void
+EMsgComposer *
 em_utils_redirect_message (EShell *shell,
                            CamelMimeMessage *message)
 {
        EMsgComposer *composer;
 
-       g_return_if_fail (E_IS_SHELL (shell));
-       g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+       g_return_val_if_fail (E_IS_SHELL (shell), NULL);
+       g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
 
        composer = redirect_get_composer (shell, message);
 
        gtk_widget_show (GTK_WIDGET (composer));
 
        composer_set_no_change (composer);
+
+       return composer;
 }
 
 /* Replying to messages... */
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 719bc5b..0fb46d4 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -56,7 +56,7 @@ void          em_utils_forward_messages       (EMailReader *reader,
                                                 GPtrArray *uids,
                                                 EMailForwardStyle style,
                                                 GtkWidget *destroy_when_done);
-void           em_utils_redirect_message       (EShell *shell,
+EMsgComposer * em_utils_redirect_message       (EShell *shell,
                                                 CamelMimeMessage *message);
 gchar *                em_utils_construct_composer_text
                                                (CamelSession *session,