diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-02 23:57:20 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-03 04:15:46 +0800 |
| commit | 8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a (patch) | |
| tree | f35f1a03cd769d1f76b207742431621a1108a851 | |
| parent | 475ea467c199cf08411611efc00848ca9354f702 (diff) | |
| download | gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar.gz gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar.bz2 gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar.lz gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar.xz gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.tar.zst gsoc2013-evolution-8f5a1d2c718089b7b5734dbe178ef6a3cbd3da5a.zip | |
em_utils_edit_message: Change return type to EMsgComposer.
(cherry picked from commit 1570f53d1eab0a750680df72be3363659f11db46)
Conflicts:
plugins/templates/templates.c
| -rw-r--r-- | mail/em-composer-utils.c | 4 | ||||
| -rw-r--r-- | mail/em-composer-utils.h | 2 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 2ba3a14d41..f1c219b41c 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1375,7 +1375,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, @@ -1471,7 +1471,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 0fb46d4664..3a47967483 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 9b11ab5f2e..948fa05bf3 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -928,7 +928,7 @@ 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)); + composer = em_utils_edit_message (shell, folder, new, message_uid); if (composer && context->source_folder_uri && context->message_uid) e_msg_composer_set_source_headers ( composer, context->source_folder_uri, |