diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-01-28 14:24:53 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-01-28 14:24:53 +0800 |
| commit | 89791fb36475d2cfceefd8613f1f2802b3b96267 (patch) | |
| tree | 64d496076244f30fe55f89a3c5a258ad9e2d469d | |
| parent | 8d0007578eef6f69c3a2af9b7954f44c671ec331 (diff) | |
| download | gsoc2013-evolution-89791fb36475d2cfceefd8613f1f2802b3b96267.tar.gz gsoc2013-evolution-89791fb36475d2cfceefd8613f1f2802b3b96267.tar.zst gsoc2013-evolution-89791fb36475d2cfceefd8613f1f2802b3b96267.zip | |
Patch from Milan Crha <mcrha@redhat.com> ** Fix for bug #504062 (Don't use collate keys for comparing addresses as they are not hashed)
svn path=/trunk/; revision=34911
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/message-list.c | 5 | ||||
| -rw-r--r-- | mail/message-list.etspec | 2 |
3 files changed, 13 insertions, 2 deletions
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 <mcrha@redhat.com> + + ** 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 <a9016009@gmx.de> * 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 @@ <ETableColumn model_col="4" compare_col="19" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/> - <ETableColumn model_col="5" compare_col="20" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="collate" search="string"/> + <ETableColumn model_col="5" compare_col="20" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/> <ETableColumn model_col="6" _title="Date" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/> |