From bbdb1887e18ddc02f0260067e68bb3e76dc101a2 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 19 Feb 2008 18:52:03 +0000 Subject: ** Fix for bug #517458 2008-02-20 Srinivasa Ragavan ** Fix for bug #517458 * gui/widgets/e-addressbook-reflow-adapter.c: (addressbook_compare): Handle broken UIDs. svn path=/trunk/; revision=35054 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 06caebedee..345a4e9c8b 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -181,6 +181,7 @@ addressbook_compare (EReflowModel *erm, int n1, int n2) if (contact1 && contact2) { const char *file_as1, *file_as2; + const char *uid1, *uid2; file_as1 = e_contact_get_const (contact1, E_CONTACT_FILE_AS); file_as2 = e_contact_get_const (contact2, E_CONTACT_FILE_AS); if (file_as1 && file_as2) @@ -189,8 +190,14 @@ addressbook_compare (EReflowModel *erm, int n1, int n2) return -1; if (file_as2) return 1; - return strcmp(e_contact_get_const (contact1, E_CONTACT_UID), - e_contact_get_const (contact2, E_CONTACT_UID)); + uid1 = e_contact_get_const (contact1, E_CONTACT_UID); + uid2 = e_contact_get_const (contact2, E_CONTACT_UID); + if (uid1 && uid2) + return strcmp(uid1, uid2); + if (uid1) + return -1; + if (uid2) + return 1; } if (contact1) return -1; -- cgit