evolution r35054 - in trunk/addressbook: . gui/widgets

[sragavan svn gnome org]

Author: sragavan
Date: Tue Feb 19 18:52:03 2008
New Revision: 35054
URL: http://svn.gnome.org/viewvc/evolution?rev=35054&view=rev

Log:
2008-02-20  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #517458

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


Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/widgets/e-addressbook-reflow-adapter.c

Modified: trunk/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
==============================================================================
--- trunk/addressbook/gui/widgets/e-addressbook-reflow-adapter.c	(original)
+++ trunk/addressbook/gui/widgets/e-addressbook-reflow-adapter.c	Tue Feb 19 18:52:03 2008
@@ -181,6 +181,7 @@
 
 		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 @@
 				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;