From 36b97dcf5dc8c0346ec5a389c8be7f1bd15de3bb Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 29 Apr 2003 18:18:36 +0000 Subject: ** See bug #41972 2003-04-29 Not Zed ** See bug #41972 * message-list.c (ml_tree_value_at): fix (void *) casts on trinary ops. * folder-browser.c (on_right_click): Store the label tag in the label callback data, not the translated name. * mail-config.c (label_defaults[]): Initialise with the tag values. (config_clear_labels): free tag field. (config_cache_labels): setup the tag field based on the position of the label name. (mail_config_get_label_color_by_name): Lookup colour by the untranslated TAG, not the translated/customisable tag. * mail-config.h (MailConfigLabel): Add a tag field, we were using the translated name as the label(!). svn path=/trunk/; revision=21008 --- mail/message-list.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/message-list.c') diff --git a/mail/message-list.c b/mail/message-list.c index 631b5b5519..3c1dd7e9f7 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -950,17 +950,17 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) } case COL_FOLLOWUP_FLAG: str = camel_tag_get ((CamelTag **) &msg_info->user_tags, "follow-up"); - return (void *) str ? str : ""; + return (void *)(str ? str : ""); case COL_ATTACHMENT: return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_ATTACHMENTS) != 0); case COL_FROM: str = camel_message_info_from (msg_info); - return (void *) str ? str : ""; + return (void *)(str ? str : ""); case COL_FROM_NORM: return (void *) get_normalised_string (message_list, msg_info, col); case COL_SUBJECT: str = camel_message_info_subject (msg_info); - return (void *) str ? str : ""; + return (void *)(str ? str : ""); case COL_SUBJECT_NORM: return (void *) get_normalised_string (message_list, msg_info, col); case COL_SENT: @@ -969,7 +969,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data) return GINT_TO_POINTER (msg_info->date_received); case COL_TO: str = camel_message_info_to (msg_info); - return (void *) str ? str : ""; + return (void *)(str ? str : ""); case COL_TO_NORM: return (void *) get_normalised_string (message_list, msg_info, col); case COL_SIZE: -- cgit v1.2.3