From 572dd23bba3af63e9af1c6389f40008f6afe039b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@src.gnome.org>
Date: Fri, 21 Sep 2007 06:47:45 +0000
Subject: 2007-09-21 mcrha Fix for bug #411125

svn path=/trunk/; revision=34289
---
 addressbook/ChangeLog                              |  9 +++
 .../e-contact-list-editor.etspec                   |  2 +-
 addressbook/gui/widgets/e-addressbook-view.etspec  | 74 +++++++++++-----------
 calendar/ChangeLog                                 | 12 ++++
 calendar/gui/dialogs/meeting-page.etspec           | 20 +++---
 calendar/gui/e-cal-list-view.etspec                |  6 +-
 calendar/gui/e-calendar-table.etspec               |  2 +-
 calendar/gui/e-meeting-time-sel.etspec             | 20 +++---
 calendar/gui/e-memo-table.etspec                   |  2 +-
 mail/ChangeLog                                     |  8 +++
 mail/message-list.etspec                           |  6 +-
 11 files changed, 95 insertions(+), 66 deletions(-)

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2ddfeaf1b2..ad55546d75 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #411125
+
+	* gui/widgets/e-addressbook-view.etspec:
+	* gui/contact-list-editor/e-contact-list-editor.etspec:
+	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
+	characters correctly.
+
 2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #476231
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
index b621e670ea..f4337c3f90 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.etspec
@@ -1,5 +1,5 @@
 <ETableSpecification no-headers="true" cursor-mode="line" selection-mode="multiple">
-<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="string" />
+<ETableColumn model_col= "0" _title="Contact" expansion="1.0" minimum_width="20" resizable="true" cell="string" compare="collate" />
 	<ETableState>
 		<column source="0"/>
 	        <grouping> </grouping>
diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec
index 1f15103664..45eaea1df3 100644
--- a/addressbook/gui/widgets/e-addressbook-view.etspec
+++ b/addressbook/gui/widgets/e-addressbook-view.etspec
@@ -1,32 +1,32 @@
 <ETableSpecification draw-grid="true" cursor-mode="line">
   <ETableColumn model_col= "2" _title="File As"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
-  <ETableColumn model_col= "4" _title="Full Name"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "5" _title="Given Name"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Family Name"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Nickname"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col= "4" _title="Full Name"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "5" _title="Given Name"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "6" _title="Family Name"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "7" _title="Nickname"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
-  <ETableColumn model_col= "8" _title="Email"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Email 2"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "10" _title="Email 3"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col= "8" _title="Email"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "9" _title="Email 2"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "10" _title="Email 3"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
-  <ETableColumn model_col= "16" _title="Assistant Phone"  expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "17" _title="Business Phone"   expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "18" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="19" _title="Business Fax"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="20" _title="Callback Phone"    expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="21" _title="Car Phone"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="22" _title="Company Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="23" _title="Home Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="24" _title="Home Phone 2"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="25" _title="Home Fax"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="26" _title="ISDN Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="27" _title="Mobile Phone"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="28" _title="Other Phone"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="29" _title="Other Fax"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="30" _title="Pager"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="31" _title="Primary Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="32" _title="Radio"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="33" _title="Telex"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col= "16" _title="Assistant Phone"  expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "17" _title="Business Phone"   expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "18" _title="Business Phone 2" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="19" _title="Business Fax"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="20" _title="Callback Phone"    expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="21" _title="Car Phone"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="22" _title="Company Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="23" _title="Home Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="24" _title="Home Phone 2"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="25" _title="Home Fax"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="26" _title="ISDN Phone"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="27" _title="Mobile Phone"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="28" _title="Other Phone"       expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="29" _title="Other Fax"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="30" _title="Pager"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="31" _title="Primary Phone"     expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="32" _title="Radio"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="33" _title="Telex"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
 <!-- Translators: This is a vcard standard and stands for the type of
     phone used by the hearing impaired. TTY stands for "teletype"
@@ -34,23 +34,23 @@
     Device for Deaf". However, you probably want to leave this
     abbreviation unchanged unless you know that there is actually a
     different and established translation for this in your language. -->	
-  <ETableColumn model_col="34" _title="TTYTDD"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col="34" _title="TTYTDD"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
   <ETableColumn model_col="35" _title="Company"      expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="stringcase"/>
-  <ETableColumn model_col="36" _title="Unit"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="37" _title="Office"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="38" _title="Title"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="39" _title="Role"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="40" _title="Manager"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="41" _title="Assistant"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col="36" _title="Unit"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="37" _title="Office"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="38" _title="Title"             expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="39" _title="Role"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="40" _title="Manager"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="41" _title="Assistant"         expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
-  <ETableColumn model_col="42" _title="Web Site"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="43" _title="Journal"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col="42" _title="Web Site"          expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="43" _title="Journal"           expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
-  <ETableColumn model_col="44" _title="Categories"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col="44" _title="Categories"        expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
-  <ETableColumn model_col="49" _title="Spouse"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col="50" _title="Note"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col="49" _title="Spouse"            expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col="50" _title="Note"              expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="collate"/>
 
   <ETableState>
     <column source="0"/>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0b66e07e65..ee997d1a75 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2007-09-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #411125
+
+	* gui/dialogs/meeting-page.etspec:
+	* gui/e-meeting-time-sel.etspec:
+	* gui/e-memo-table.etspec:
+	* gui/e-calendar-table.etspec:
+	* gui/e-cal-list-view.etspec:
+	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
+	characters correctly.
+
 2007-09-21  Jedy Wang  <jedy.wang@sun.com>
 
 	** Fixes bug #476124.
diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec
index 96bc480fe9..a52c874cd2 100644
--- a/calendar/gui/dialogs/meeting-page.etspec
+++ b/calendar/gui/dialogs/meeting-page.etspec
@@ -1,14 +1,14 @@
 <ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="collate"/>
+  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="collate"/>
+  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="collate"/>
+  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="collate"/>
+  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
 
   <ETableState>
      <column source="0"/>
diff --git a/calendar/gui/e-cal-list-view.etspec b/calendar/gui/e-cal-list-view.etspec
index 68cfbc9d22..2168d7363e 100644
--- a/calendar/gui/e-cal-list-view.etspec
+++ b/calendar/gui/e-cal-list-view.etspec
@@ -1,9 +1,9 @@
 <ETableSpecification draw-grid="true" alternating-row-colors="true">
   <ETableColumn model_col="5" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
   <ETableColumn model_col="10" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
-  <ETableColumn model_col="8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col="11" _title="Location" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/>
-  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="string" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
+  <ETableColumn model_col="8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="collate" priority="10"/>
+  <ETableColumn model_col="11" _title="Location" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="collate" priority="10"/>
+  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="collate" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
 
   <ETableState>
     <column source="2"/>
diff --git a/calendar/gui/e-calendar-table.etspec b/calendar/gui/e-calendar-table.etspec
index fff60b1de6..9ae3f0dc84 100644
--- a/calendar/gui/e-calendar-table.etspec
+++ b/calendar/gui/e-calendar-table.etspec
@@ -7,7 +7,7 @@
   <ETableColumn model_col= "12" _title="Due date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
   <ETableColumn model_col= "15" _title="% Complete" expansion="1.0" minimum_width="10" resizable="true" cell="percent" compare="percent-compare" priority="-3"/>
   <ETableColumn model_col= "16" _title="Priority" expansion="1.0" minimum_width="10" resizable="true" cell="priority" compare="priority-compare" priority="-3"/>
-  <ETableColumn model_col="17" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="string" priority="-1"/>
+  <ETableColumn model_col="17" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="collate" priority="-1"/>
   <ETableColumn model_col="19" _title="Task sort" cell="task-sort" compare="task-sort" priority="-4"/>
   <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="stringcase" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
 
diff --git a/calendar/gui/e-meeting-time-sel.etspec b/calendar/gui/e-meeting-time-sel.etspec
index c0b5c721dd..e9567832ef 100644
--- a/calendar/gui/e-meeting-time-sel.etspec
+++ b/calendar/gui/e-meeting-time-sel.etspec
@@ -1,14 +1,14 @@
 <ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true">
-  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/>
-  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/>
-  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/>
-  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/>
-  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
-  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/>
+  <ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="collate"/>
+  <ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="collate"/>
+  <ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="collate"/>
+  <ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="collate"/>
+  <ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
+  <ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="collate"/>
 
   <ETableState>
      <column source="0"/>
diff --git a/calendar/gui/e-memo-table.etspec b/calendar/gui/e-memo-table.etspec
index 6474b69d96..95faa93429 100644
--- a/calendar/gui/e-memo-table.etspec
+++ b/calendar/gui/e-memo-table.etspec
@@ -1,7 +1,7 @@
 <ETableSpecification click-to-add="true" _click-to-add-message="Click to add a memo" draw-grid="true">
   <ETableColumn model_col="8" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="stringcase" priority="0"/>
   <ETableColumn model_col="7" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer" priority="-4"/>
-  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="string" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
+  <ETableColumn model_col="0" _title="Categories" cell="calstring" compare="collate" expansion="1.0" minimum_width="10" resizable="true" priority="-2"/>
   <ETableColumn model_col="5" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/>
   <ETableColumn model_col="19" _title="Memo sort" cell="task-sort" compare="memo-sort" priority="-4"/>
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c4017a12f7..205e27c2c6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #411125
+
+	* message-list.etspec:
+	Uses 'compare="collate"' instead of 'compare="string"' to handle UTF
+	characters correctly.
+
 2007-09-17  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #472865
diff --git a/mail/message-list.etspec b/mail/message-list.etspec
index 3887e2723a..80edd4a9cd 100644
--- a/mail/message-list.etspec
+++ b/mail/message-list.etspec
@@ -9,7 +9,7 @@
 
   <ETableColumn model_col="4" compare_col="18" _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="19" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
+  <ETableColumn model_col="5" compare_col="19" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="collate" search="string"/>
 
   <ETableColumn model_col="6" _title="Date" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
 
@@ -21,11 +21,11 @@
 
   <ETableColumn model_col="10" _title="Flag Status" pixbuf="followup" expansion="0.0" minimum_width="18" resizable="false" cell="render_flag_status" compare="integer"/>
 
-  <ETableColumn model_col="11" _title="Follow Up Flag" expansion="0.2" minimum_width="32" resizable="true" cell="render_text" compare="string"/>
+  <ETableColumn model_col="11" _title="Follow Up Flag" expansion="0.2" minimum_width="32" resizable="true" cell="render_text" compare="collate"/>
 
   <ETableColumn model_col="12" _title="Due By" expansion="0.2" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
 
-  <ETableColumn model_col="13" _title="Location" expansion="0.2" minimum_width="32" resizable="true" cell="render_text" compare="string"/>
+  <ETableColumn model_col="13" _title="Location" expansion="0.2" minimum_width="32" resizable="true" cell="render_text" compare="collate"/>
 
   <ETableColumn model_col="14"  _title="Sender" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
   <ETableColumn model_col="15"  _title="Recipients" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
-- 
cgit v1.2.3