Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.458
diff -u -p -r1.458 ChangeLog
--- ChangeLog	11 May 2005 05:45:48 -0000	1.458
+++ ChangeLog	12 May 2005 12:12:37 -0000
@@ -1,3 +1,11 @@
+2005-05-12  Vivek Jain <jvivek@novell.com>
+	
+	 Fixes #271592
+	 * backends/contacts/e-cal-backend-contacts.c:
+	 (e_cal_backend_contacts_get_object):
+	 check the uid to return the object corresponding to
+	 birthday/anniversary
+
 2005-05-11  Rodrigo Moya <rodrigo@novell.com>
 
 	* libedata-cal/e-cal-backend-sync.c:
Index: backends/contacts/e-cal-backend-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/e-cal-backend-contacts.c,v
retrieving revision 1.18
diff -u -p -r1.18 e-cal-backend-contacts.c
--- backends/contacts/e-cal-backend-contacts.c	6 May 2005 03:26:47 -0000	1.18
+++ backends/contacts/e-cal-backend-contacts.c	12 May 2005 12:12:38 -0000
@@ -583,14 +583,14 @@ e_cal_backend_contacts_get_object (ECalB
 	if (!record)
 		return GNOME_Evolution_Calendar_ObjectNotFound;
 
-        if (record->comp_birthday) {
+        if (record->comp_birthday && g_str_has_suffix (uid, BIRTHDAY_UID_EXT)) {
                 *object = e_cal_component_get_as_string (record->comp_birthday);
 		
 		d(g_message ("Return birthday: %s", *object));
 		return GNOME_Evolution_Calendar_Success;
 	}
 	
-        if (record->comp_anniversary) {
+        if (record->comp_anniversary && g_str_has_suffix (uid, ANNIVERSARY_UID_EXT)) {
                 *object = e_cal_component_get_as_string (record->comp_anniversary);
 
 		d(g_message ("Return anniversary: %s", *object));
