diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 13 | ||||
| -rw-r--r-- | mail/mail-display.c | 7 |
3 files changed, 16 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 838d31935f..9f3919a0d5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-05-20 Jeffrey Stedfast <fejj@ximian.com> + + * mail-display.c (mail_display_render): Fixed the "Overdue:" + string to not contain any HTML tags. + 2002-05-20 Ettore Perazzoli <ettore@ximian.com> * subscribe-dialog.c (recursive_add_folder): Pass TRUE for diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index b1d8174542..ec84ceec06 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -557,14 +557,15 @@ struct _save_draft_info { }; static void -save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, char *appended_uid, void *data) +save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, + char *appended_uid, void *data) { struct _save_draft_info *sdi = data; char *old_uid; - + if (!ok) goto done; - + old_uid = gtk_object_get_data (GTK_OBJECT (sdi->composer), "draft_uid"); if (old_uid) { /* delete the original draft message */ @@ -572,11 +573,11 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); } - + if (appended_uid) { gtk_object_set_data_full (GTK_OBJECT (sdi->composer), "draft_uid", appended_uid, - (GtkDestroyNotify)g_free); + (GtkDestroyNotify) g_free); } else { gtk_object_set_data (GTK_OBJECT (sdi->composer), "draft_uid", NULL); @@ -584,7 +585,7 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i if (sdi->quit) gtk_widget_destroy (GTK_WIDGET (sdi->composer)); - + done: gtk_object_unref (GTK_OBJECT (sdi->composer)); g_free (info); diff --git a/mail/mail-display.c b/mail/mail-display.c index 267f28f078..990905fc41 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -1550,7 +1550,7 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll) now = time (NULL); if (now >= md->followup->target_date) - overdue = U_("<b>Overdue:</b> "); + overdue = U_("Overdue:"); else overdue = ""; @@ -1564,9 +1564,10 @@ mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll) "<table cellspacing=1 cellpadding=1 bgcolor=\"#000000\"><tr><td>" "<table cellspacing=0 bgcolor=\"#%s\" cellpadding=2 cellspacing=2>" "<tr><td align=\"left\" width=20><img src=\"%s\" align=\"middle\"></td>" - "<td>%s%s by %s</td></table></td></tr></table></font>", fontcolor, bgcolor, + "<td>%s%s%s%s by %s</td></table></td></tr></table></font>", fontcolor, bgcolor, mail_display_get_url_for_icon (md, EVOLUTION_IMAGES "/flag-for-followup-16.png"), - overdue, message_tag_followup_i18n_name (md->followup->type), due_date); + overdue ? "<b>" : "", overdue, overdue ? "</b> " : "", + message_tag_followup_i18n_name (md->followup->type), due_date); } if (md->current_message) { |