Index: ChangeLog
===================================================================
--- ChangeLog	(revision 8403)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-01-22  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes a part of #511208
+	* backends/groupwise/e-cal-backend-groupwise-utils.c:
+	(e_gw_item_to_cal_component): Strip the organizer name 
+	from the display name.				     
+
 2008-01-21  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #510168
Index: backends/groupwise/e-cal-backend-groupwise-utils.c
===================================================================
--- backends/groupwise/e-cal-backend-groupwise-utils.c	(revision 8397)
+++ backends/groupwise/e-cal-backend-groupwise-utils.c	(working copy)
@@ -912,6 +912,23 @@
 }
 
 
+static char *
+get_cn_from_display_name (char *display_name)
+{	
+	char *dn;
+	
+	/* Strip the name part alone as the display name might contain email also*/
+	dn = g_strstr_len (display_name, strlen (display_name), " <");
+
+	if (!dn)
+		return g_strdup (display_name);
+	else { 
+		dn = g_strndup (display_name, (dn - display_name));
+		dn = g_strdelimit (dn, "\"", ' ');
+		return dn;
+	}	
+}
+
 ECalComponent *
 e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
 {
@@ -1121,7 +1138,7 @@
 				EGwItemRecipient *recipient = (EGwItemRecipient *) rl->data;
 				ECalComponentAttendee *attendee = g_new0 (ECalComponentAttendee, 1);
 
-				attendee->cn = g_strdup (recipient->display_name);
+				attendee->cn = get_cn_from_display_name (recipient->display_name);
 				attendee->value = g_strconcat("MAILTO:", recipient->email, NULL);
 				if (recipient->type == E_GW_ITEM_RECIPIENT_TO)
 					attendee->role = ICAL_ROLE_REQPARTICIPANT;
@@ -1160,7 +1177,7 @@
 		ECalComponentOrganizer *cal_organizer;
 
 		cal_organizer = g_new0 (ECalComponentOrganizer, 1);
-		cal_organizer->cn = g_strdup (organizer->display_name);
+		cal_organizer->cn = get_cn_from_display_name (organizer->display_name);
 		cal_organizer->value = g_strconcat("MAILTO:", organizer->email, NULL);
 		e_cal_component_set_organizer (comp, cal_organizer);
 	}
