callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fix for bug #517458

Browse Source 
2008-02-20  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #517458

	* gui/widgets/e-addressbook-reflow-adapter.c:
	(addressbook_compare): Handle broken UIDs.

svn path=/trunk/; revision=35054
This commit is contained in:
Srinivasa Ragavan
2008-02-19 18:52:03 +00:00
committed by Srinivasa Ragavan
parent 77bf0ad0c7
commit bbdb1887e1
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/ChangeLog
View File

@ -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

11
addressbook/gui/widgets/e-addressbook-reflow-adapter.c
View File

@ -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;