From ac4f13b93e22cc59dbe36ff3a4825bb5077523c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 20 Aug 2001 04:02:10 +0000 Subject: Allow the activity to be NULL if there isn't a global_shell_client so that 2001-08-19 Jeffrey Stedfast * mail-mt.c (do_op_status): Allow the activity to be NULL if there isn't a global_shell_client so that we don't try and report status updates when the shell is destroyed. * mail-config.c (add_shortcut_entry): Return if there isn't a global_shell_client. * component-factory.c (owner_set_cb): set the global_shell_client here and connect to the destroy signal. * mail-vfolder.c (vfolder_create_storage): Use an extern global_shell_client. svn path=/trunk/; revision=12242 --- mail/mail-callbacks.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mail/mail-callbacks.c') diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 429f5928f2..ed98392aa1 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -629,10 +629,11 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char camel_internet_address_get (sender, 0, &name, &address); date = camel_mime_message_get_date (message, NULL); - format = e_utf8_from_locale_string (_("On %a, %Y-%m-%d at %H:%M, %%s wrote:")); - strftime (date_str, sizeof (date_str), format, localtime (&date)); - g_free (format); + strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), + localtime (&date)); + format = e_utf8_from_locale_string (date_str); text = mail_tool_quote_message (message, date_str, name && *name ? name : address); + g_free (format); if (text) { e_msg_composer_set_body_text (composer, text); -- cgit