evolution r34911 - trunk/mail

[msuman svn gnome org]

Author: msuman
Date: Mon Jan 28 06:24:53 2008
New Revision: 34911
URL: http://svn.gnome.org/viewvc/evolution?rev=34911&view=rev

Log:
Patch from Milan Crha  <mcrha redhat com> ** Fix for bug #504062 (Don't use collate keys for comparing addresses as they are not hashed)

Modified:
   trunk/mail/ChangeLog
   trunk/mail/message-list.c
   trunk/mail/message-list.etspec

Modified: trunk/mail/message-list.c
==============================================================================
--- trunk/mail/message-list.c	(original)
+++ trunk/mail/message-list.c	Mon Jan 28 06:24:53 2008
@@ -475,9 +475,12 @@
 			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);

Modified: trunk/mail/message-list.etspec
==============================================================================
--- trunk/mail/message-list.etspec	(original)
+++ trunk/mail/message-list.etspec	Mon Jan 28 06:24:53 2008
@@ -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"/>