evolution r37368 - in trunk/calendar: . gui gui/dialogs

[mcrha svn gnome org]

Author: mcrha
Date: Wed Mar  4 16:03:06 2009
New Revision: 37368
URL: http://svn.gnome.org/viewvc/evolution?rev=37368&view=rev

Log:
2009-03-04  Milan Crha  <mcrha redhat com>

	** Fix for bug #573119

	* gui/dialogs/comp-editor.c: (set_attendees_for_delegation):
	* gui/e-cal-popup.c: (is_delegated), (needs_to_accept):
	Do not ask value of not included (NULL) parameters.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/dialogs/comp-editor.c
   trunk/calendar/gui/e-cal-popup.c

Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c	(original)
+++ trunk/calendar/gui/dialogs/comp-editor.c	Wed Mar  4 16:03:06 2009
@@ -3015,10 +3015,11 @@
 			prop;
 			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
 		const char *attendee = icalproperty_get_attendee (prop);
-		const char *delfrom;
+		const char *delfrom = NULL;
 
 		param = icalproperty_get_first_parameter(prop, ICAL_DELEGATEDFROM_PARAMETER);
-		delfrom = icalparameter_get_delegatedfrom (param);
+		if (param)
+			delfrom = icalparameter_get_delegatedfrom (param);
 		if (!(g_str_equal (itip_strip_mailto (attendee), address) ||
 				((delfrom && *delfrom) &&
 				 g_str_equal (itip_strip_mailto (delfrom), address)))) {

Modified: trunk/calendar/gui/e-cal-popup.c
==============================================================================
--- trunk/calendar/gui/e-cal-popup.c	(original)
+++ trunk/calendar/gui/e-cal-popup.c	Wed Mar  4 16:03:06 2009
@@ -522,20 +522,23 @@
 
 	if (prop) {
 		param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);
-		delto = icalparameter_get_delegatedto (param);
+		if (param)
+			delto = icalparameter_get_delegatedto (param);
 	} else
 		return FALSE;
 
 	prop = get_attendee_prop (icalcomp, itip_strip_mailto (delto));
 
 	if (prop) {
-		const char *delfrom;
-		icalparameter_partstat	status;
+		const char *delfrom = NULL;
+		icalparameter_partstat status = ICAL_PARTSTAT_NONE;
 
 		param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
-		delfrom = icalparameter_get_delegatedfrom (param);
+		if (param)
+			delfrom = icalparameter_get_delegatedfrom (param);
 		param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-		status = icalparameter_get_partstat (param);
+		if (param)
+			status = icalparameter_get_partstat (param);
 		if ((delfrom && *delfrom) && g_str_equal (itip_strip_mailto (delfrom), user_email)
 				&& status != ICAL_PARTSTAT_DECLINED)
 			return TRUE;
@@ -549,7 +552,7 @@
 {
 	icalproperty *prop;
 	icalparameter *param;
-	icalparameter_partstat status;
+	icalparameter_partstat status = ICAL_PARTSTAT_NONE;
 
 	prop = get_attendee_prop (icalcomp, user_email);
 
@@ -557,7 +560,8 @@
 	if (!prop)
 		return TRUE;
 	param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-	status = icalparameter_get_partstat (param);
+	if (param)
+		status = icalparameter_get_partstat (param);
 
 	if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE)
 		return FALSE;