diff options
| -rw-r--r-- | addressbook/ChangeLog | 14 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-storage.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 3 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 3 | ||||
| -rw-r--r-- | addressbook/printing/e-contact-print.c | 3 |
5 files changed, 23 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5302057895..10f066e633 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,17 @@ +2001-08-31 Zbigniew Chyla <cyba@gnome.pl> + + * gui/component/addressbook-storage.c + (addressbook_get_other_contact_storage): s/_/U_/ + + * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare): + Use g_utf8_collate. + + * gui/widgets/e-minicard.c (e_minicard_compare): + Ditto. + + * printing/e-contact-print.c (card_compare): + Ditto. + 2001-08-29 Jon Trowbridge <trow@ximian.com> * gui/component/select-names/e-select-names-manager.c diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index b888375a26..efff59a732 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -60,6 +60,8 @@ #include <gal/util/e-xml-utils.h> #include <libgnome/gnome-i18n.h> +#include "e-util/e-unicode-i18n.h" + #include "evolution-shell-component.h" #include "evolution-storage.h" @@ -135,7 +137,7 @@ addressbook_get_other_contact_storage (void) EvolutionStorageResult result; if (storage == NULL) { - storage = evolution_storage_new (_("Other Contacts"), NULL, NULL); + storage = evolution_storage_new (U_("Other Contacts"), NULL, NULL); gtk_signal_connect (GTK_OBJECT (storage), "remove_folder", GTK_SIGNAL_FUNC(remove_ldap_folder), NULL); diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 97ceb36a1f..b4092605ed 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -13,6 +13,7 @@ #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-font.h> #include <gal/widgets/e-popup-menu.h> +#include <gal/unicode/gunicode.h> #include "e-contact-save-as.h" #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" @@ -366,7 +367,7 @@ addressbook_compare (EReflowModel *erm, int n1, int n2) file_as1 = card1->file_as; file_as2 = card2->file_as; if (file_as1 && file_as2) - return strcasecmp(file_as1, file_as2); + return g_utf8_collate(file_as1, file_as2); if (file_as1) return -1; if (file_as2) diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 083791986f..d5d2b84bdf 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -32,6 +32,7 @@ #include <gal/util/e-util.h> #include <gal/widgets/e-canvas-utils.h> #include <gal/widgets/e-canvas.h> +#include <gal/unicode/gunicode.h> #include "addressbook/backend/ebook/e-book.h" #include "e-addressbook-util.h" #include "e-minicard.h" @@ -911,7 +912,7 @@ e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2) "file_as", &file_as2, NULL); if (file_as1 && file_as2) - return strcasecmp(file_as1, file_as2); + return g_utf8_collate(file_as1, file_as2); if (file_as1) return -1; if (file_as2) diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 1d3c48a38a..d1a0324f6d 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -40,6 +40,7 @@ #include <libgnomeprint/gnome-print-master-preview.h> #include <libgnomeprint/gnome-print-multipage.h> #include <gal/widgets/e-unicode.h> +#include <gal/unicode/gunicode.h> #include <addressbook/backend/ebook/e-book.h> #include <addressbook/backend/ebook/e-card.h> #include <addressbook/backend/ebook/e-card-simple.h> @@ -599,7 +600,7 @@ card_compare (ECard *card1, ECard *card2) { "file_as", &file_as2, NULL); if (file_as1 && file_as2) - return strcasecmp(file_as1, file_as2); + return g_utf8_collate(file_as1, file_as2); if (file_as1) return -1; if (file_as2) |