[evolution/gnome-3-8] em_utils_compose_new_message(): Return the EMsgComposer.

[Matthew Barnes <mbarnes src gnome org>]

commit 2d3fbbaa9205a6ed6f65650bb99e91d9aac00908
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 2 11:48:46 2013 -0400

    em_utils_compose_new_message(): Return the EMsgComposer.
    
    (cherry picked from commit 1b7fc9224b7107361282904483805c67d4980586)

 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 686b493..b941e06 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1087,22 +1087,26 @@ create_new_composer (EShell *shell,
  *
  * Opens a new composer window as a child window of @parent's toplevel
  * window.
+ *
+ * Returns: the resulting #EMsgComposer
  **/
-void
+EMsgComposer *
 em_utils_compose_new_message (EShell *shell,
                               CamelFolder *folder)
 {
        EMsgComposer *composer;
 
-       g_return_if_fail (E_IS_SHELL (shell));
+       g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
        if (folder != NULL)
-               g_return_if_fail (CAMEL_IS_FOLDER (folder));
+               g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
 
        composer = create_new_composer (shell, "", folder);
        composer_set_no_change (composer);
 
        gtk_widget_show (GTK_WIDGET (composer));
+
+       return composer;
 }
 
 /**
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index fff3362..719bc5b 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -32,7 +32,7 @@
 
 G_BEGIN_DECLS
 
-void           em_utils_compose_new_message    (EShell *shell,
+EMsgComposer * em_utils_compose_new_message    (EShell *shell,
                                                 CamelFolder *folder);
 EMsgComposer * em_utils_compose_new_message_with_mailto
                                                (EShell *shell,