[evolution-patches] fix for crash editing meeting



? alarm
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.248
diff -u -r1.248 ChangeLog
--- ChangeLog	27 Apr 2004 13:32:04 -0000	1.248
+++ ChangeLog	28 Apr 2004 17:10:43 -0000
@@ -1,3 +1,9 @@
+2004-04-28  Dan Winship  <danw ximian com>
+
+	* libecal/e-cal-component.c (get_attendee_list): Fill in some
+	default values to avoid libical assertions later. #57767. Also,
+	fix some really awful cut+pastos
+
 2004-04-27  Harish Krishnaswamy  <kharish novell com>
 
 	Fixes #56535
Index: libecal/e-cal-component.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-component.c,v
retrieving revision 1.6
diff -u -r1.6 e-cal-component.c
--- libecal/e-cal-component.c	13 Jan 2004 13:14:58 -0000	1.6
+++ libecal/e-cal-component.c	28 Apr 2004 17:10:43 -0000
@@ -4046,25 +4046,31 @@
 		if (attendee->member_param)
 			a->member = icalparameter_get_member (attendee->member_param);		
 		if (attendee->cutype_param)
-			a->cutype = icalparameter_get_cutype (attendee->cutype_param);			
+			a->cutype = icalparameter_get_cutype (attendee->cutype_param);
+		else
+			a->cutype = ICAL_CUTYPE_UNKNOWN;
 		if (attendee->role_param)
 			a->role = icalparameter_get_role (attendee->role_param);
+		else
+			a->role = ICAL_ROLE_REQPARTICIPANT;
 		if (attendee->partstat_param)
-			a->status = icalparameter_get_role (attendee->partstat_param);
+			a->status = icalparameter_get_partstat (attendee->partstat_param);
+		else
+			a->status = ICAL_PARTSTAT_NEEDSACTION;
 		if (attendee->rsvp_param && icalparameter_get_rsvp (attendee->rsvp_param) == ICAL_RSVP_TRUE)
 			a->rsvp = TRUE;
 		else
 			a->rsvp = FALSE;
 		if (attendee->delfrom_param)
-			a->delfrom = icalparameter_get_sentby (attendee->delfrom_param);
+			a->delfrom = icalparameter_get_delegatedfrom (attendee->delfrom_param);
 		if (attendee->delto_param)
-			a->delto = icalparameter_get_sentby (attendee->delto_param);
+			a->delto = icalparameter_get_delegatedto (attendee->delto_param);
 		if (attendee->sentby_param)
 			a->sentby = icalparameter_get_sentby (attendee->sentby_param);
 		if (attendee->cn_param)
-			a->cn = icalparameter_get_sentby (attendee->cn_param);
+			a->cn = icalparameter_get_cn (attendee->cn_param);
 		if (attendee->language_param)
-			a->language = icalparameter_get_sentby (attendee->language_param);
+			a->language = icalparameter_get_language (attendee->language_param);
 
 		*al = g_slist_prepend (*al, a);
 	}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]