diff options
| author | Radek Doulik <rodo@ximian.com> | 2001-04-25 17:32:46 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2001-04-25 17:32:46 +0800 |
| commit | b024121e896a03f60f92496b9ed5df259547aa7a (patch) | |
| tree | 1b2df13b389d52170f80831103f4b0e4251a00dc /mail/mail-callbacks.c | |
| parent | 0f25a9078109a26a08f909c6d2c34e1289c543d8 (diff) | |
| download | gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar.gz gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar.bz2 gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar.lz gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar.xz gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.tar.zst gsoc2013-evolution-b024121e896a03f60f92496b9ed5df259547aa7a.zip | |
signature changing
* signature changing
2001-04-25 Radek Doulik <rodo@ximian.com>
* mail-tools.c (mail_tool_quote_message): set object data directly
in HTML source
* mail-callbacks.c (mail_generate_reply): remove \n from citation
(mail_generate_reply): don't use e_msg_composer_mark_text_orig
svn path=/trunk/; revision=9558
Diffstat (limited to 'mail/mail-callbacks.c')
| -rw-r--r-- | mail/mail-callbacks.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 083c3e89ff..722d8c9a7e 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -400,20 +400,19 @@ create_msg_composer (const char *url) gchar *sig_file = NULL; EMsgComposer *composer; - account = mail_config_get_default_account (); + account = mail_config_get_default_account (); send_html = mail_config_get_send_html (); if (account->id) sig_file = account->id->signature; - if (url != NULL) { - composer = e_msg_composer_new_from_url (url); - if (composer) - e_msg_composer_set_send_html (composer, send_html); - } else - composer = e_msg_composer_new_with_sig_file (sig_file, send_html); + composer = url ? e_msg_composer_new_from_url (url) : e_msg_composer_new (); + if (composer) { + e_msg_composer_set_send_html (composer, send_html); + e_msg_composer_set_sig_file (composer, sig_file); + } - return (GtkWidget *)composer; + return GTK_WIDGET (composer); } void @@ -590,13 +589,12 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all) camel_internet_address_get (sender, 0, &name, &address); date = camel_mime_message_get_date (message, &offset); date_str = header_format_date (date, offset); - text = mail_tool_quote_message (message, _("On %s, %s wrote:\n"), date_str, name && *name ? name : address); + text = mail_tool_quote_message (message, _("On %s, %s wrote:"), date_str, name && *name ? name : address); g_free (date_str); if (text) { e_msg_composer_set_body_text (composer, text); g_free (text); - e_msg_composer_mark_text_orig (composer); } /* Set the recipients */ |