aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-06-02 23:57:20 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-06-02 23:58:08 +0800
commit1570f53d1eab0a750680df72be3363659f11db46 (patch)
tree8e29a2dea46565f29e9bae3b8250a778f39849a7
parentca14cc115ee90650f1546ed3d95bf1ce6010569f (diff)
downloadgsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar.gz
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar.bz2
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar.lz
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar.xz
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.tar.zst
gsoc2013-evolution-1570f53d1eab0a750680df72be3363659f11db46.zip
em_utils_edit_message: Change return type to EMsgComposer.
-rw-r--r--mail/em-composer-utils.c4
-rw-r--r--mail/em-composer-utils.h2
-rw-r--r--plugins/templates/templates.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index cc8c1e33d6..6c60925c3f 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 5c3eb73889..7084c37371 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 69fae43ee2..7a176b4b70 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,