diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ca13fc437b..fae273d5d4 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2008-02-20 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #517458 + + * gui/widgets/e-addressbook-reflow-adapter.c: + (addressbook_compare): Handle broken UIDs. + 2008-02-18 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #515744 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; |