[evolution] em_utils_edit_message: Change return type to EMsgComposer.

[Matthew Barnes <mbarnes src gnome org>]

commit 1570f53d1eab0a750680df72be3363659f11db46
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 2 11:57:20 2013 -0400

    em_utils_edit_message: Change return type to EMsgComposer.

 mail/em-composer-utils.c      |    4 ++--
 mail/em-composer-utils.h      |    2 +-
 plugins/templates/templates.c |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index cc8c1e3..6c60925 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1394,7 +1394,7 @@ quoting_text (QuotingTextEnum type)
  * Opens a composer filled in with the headers/mime-parts/etc of
  * @message.
  **/
-GtkWidget *
+EMsgComposer *
 em_utils_edit_message (EShell *shell,
                        CamelFolder *folder,
                        CamelMimeMessage *message,
@@ -1491,7 +1491,7 @@ em_utils_edit_message (EShell *shell,
 
        gtk_widget_show (GTK_WIDGET (composer));
 
-       return GTK_WIDGET (composer);
+       return composer;
 }
 
 static void
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 5c3eb73..7084c37 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -38,7 +38,7 @@ EMsgComposer *        em_utils_compose_new_message_with_mailto
                                                (EShell *shell,
                                                 const gchar *mailto,
                                                 CamelFolder *folder);
-GtkWidget *    em_utils_edit_message           (EShell *shell,
+EMsgComposer * em_utils_edit_message           (EShell *shell,
                                                 CamelFolder *folder,
                                                 CamelMimeMessage *message,
                                                 const gchar *message_uid,
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 69fae43..7a176b4 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -928,7 +928,8 @@ create_new_message (CamelFolder *folder,
                        template, CAMEL_RECIPIENT_TYPE_BCC));
 
        /* Create the composer */
-       composer = E_MSG_COMPOSER (em_utils_edit_message (shell, folder, new, message_uid, TRUE));
+       composer = em_utils_edit_message (
+               shell, folder, new, message_uid, TRUE);
        if (composer && context->source_folder_uri && context->message_uid)
                e_msg_composer_set_source_headers (
                        composer, context->source_folder_uri,