diff options
| author | Milan Crha <mcrha@src.gnome.org> | 2007-09-21 14:47:45 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2007-09-21 14:47:45 +0800 |
| commit | 572dd23bba3af63e9af1c6389f40008f6afe039b (patch) | |
| tree | 2b676887891496e54299f0cd29f0f369f26b9037 /addressbook | |
| parent | 50ff474bf88324c6adf6dbe65c4bce9b4240d928 (diff) | |
| download | gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar.gz gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar.bz2 gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar.lz gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar.xz gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.tar.zst gsoc2013-evolution-572dd23bba3af63e9af1c6389f40008f6afe039b.zip | |
2007-09-21 mcrha Fix for bug #411125
svn path=/trunk/; revision=34289
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 9 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.etspec | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.etspec | 74 |
3 files changed, 47 insertions, 38 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"/> |