diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-09-19 23:35:40 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-09-19 23:35:40 +0800 |
| commit | 053af645da6e5f74474d13c19ce73d236d9b76a9 (patch) | |
| tree | 1ebbe95f9fcefc904dddde9faa0aea3a03391a82 /mail/mail-format.c | |
| parent | c09bcfdc4332454675f3ee5bb070f5cd702a065e (diff) | |
| download | gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar.gz gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar.bz2 gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar.lz gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar.xz gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.tar.zst gsoc2013-evolution-053af645da6e5f74474d13c19ce73d236d9b76a9.zip | |
Deal with NULL composer.
* mail-callbacks.c (create_msg_composer, compose_msg, send_to_url,
mail_reply, forward_msg):
* mail-format.c (mail_generate_reply):
* mail-ops.c (cleanup_edit_messages):
* mail-view.c (view_forward_msg): Deal with NULL composer.
svn path=/trunk/; revision=5502
Diffstat (limited to 'mail/mail-format.c')
| -rw-r--r-- | mail/mail-format.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/mail-format.c b/mail/mail-format.c index 21e9773353..93ad41fbcb 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1616,8 +1616,11 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) MailConfigIdentity *id; gchar *sig_file = NULL; - want_plain = !mail_config_send_html (); + composer = e_msg_composer_new_with_sig_file (sig_file); + if (!composer) + return NULL; + want_plain = !mail_config_send_html (); contents = camel_medium_get_content_object (CAMEL_MEDIUM (message)); text = mail_get_message_body (contents, want_plain, &is_html); @@ -1625,8 +1628,6 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) if (id) sig_file = id->sig; - composer = E_MSG_COMPOSER (e_msg_composer_new_with_sig_file (sig_file)); - /* Set the quoted reply text. */ if (text) { char *repl_text; |