From 89791fb36475d2cfceefd8613f1f2802b3b96267 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 28 Jan 2008 06:24:53 +0000 Subject: Patch from Milan Crha ** Fix for bug #504062 (Don't use collate keys for comparing addresses as they are not hashed) svn path=/trunk/; revision=34911 --- mail/ChangeLog | 8 ++++++++ mail/message-list.c | 5 ++++- mail/message-list.etspec | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 0be2a3cb3a..7222fb34d4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-01-28 Milan Crha + + ** Fix for bug #504062 + + * message-list.c: (get_normalised_string): Store strings for addresses, + instead of collate keys. + * message-list.etspec: Compare Subject as strings, not as collate. + 2008-01-28 Andre Klapper * em-filter-i18n.h: Added translator comments. diff --git a/mail/message-list.c b/mail/message-list.c index 470b6acbfe..3211d2d84d 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -475,9 +475,12 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int co subject++; string = (const char *) subject; + normalised = g_utf8_collate_key (string, -1); + } else { + /* because addresses require strings, not collate keys */ + normalised = g_strdup (string); } - normalised = g_utf8_collate_key (string, -1); e_poolv_set (poolv, index, normalised, TRUE); return e_poolv_get (poolv, index); diff --git a/mail/message-list.etspec b/mail/message-list.etspec index bd2ec76554..84fc12fafb 100644 --- a/mail/message-list.etspec +++ b/mail/message-list.etspec @@ -9,7 +9,7 @@ - + -- cgit v1.2.3