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

[mcrha svn gnome org]

Author: mcrha
Date: Wed Mar  4 15:41:36 2009
New Revision: 37366
URL: http://svn.gnome.org/viewvc/evolution?rev=37366&view=rev

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

	** Fix for bug #573122

	* gui/dialogs/cal-prefs-dialog.c: (timezone_changed), (show_config):
	* gui/calendar-config.c: (calendar_config_get_icaltimezone):
	* gui/e-cal-model.c: (ecm_value_at):
	Do not pass NULL to icalcomponent_get_first_component.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/calendar-config.c
   trunk/calendar/gui/dialogs/cal-prefs-dialog.c
   trunk/calendar/gui/e-cal-model.c

Modified: trunk/calendar/gui/calendar-config.c
==============================================================================
--- trunk/calendar/gui/calendar-config.c	(original)
+++ trunk/calendar/gui/calendar-config.c	Wed Mar  4 15:41:36 2009
@@ -233,8 +233,7 @@
 		zone = icaltimezone_get_builtin_timezone (location);
 		icalcomp = icaltimezone_get_component (zone);
 
-
-		if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) {
+		if (!icalcomp || !(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) {
 			g_free (location);
 			return zone;
 		}

Modified: trunk/calendar/gui/dialogs/cal-prefs-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/cal-prefs-dialog.c	(original)
+++ trunk/calendar/gui/dialogs/cal-prefs-dialog.c	Wed Mar  4 15:41:36 2009
@@ -124,7 +124,7 @@
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (prefs->timezone));
 	icalcomp = icaltimezone_get_component (zone);
 
-	if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT)))
+	if (!icalcomp || !(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT)))
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, FALSE);
 	else
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, TRUE);
@@ -644,7 +644,7 @@
 	g_free (location);
 
 	icalcomp = icaltimezone_get_component (zone);
-	if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT)))
+	if (!icalcomp || !(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT)))
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, FALSE);
 	else
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, TRUE);

Modified: trunk/calendar/gui/e-cal-model.c
==============================================================================
--- trunk/calendar/gui/e-cal-model.c	(original)
+++ trunk/calendar/gui/e-cal-model.c	Wed Mar  4 15:41:36 2009
@@ -469,6 +469,7 @@
 
 	comp_data = g_ptr_array_index (priv->objects, row);
 	g_return_val_if_fail (comp_data != NULL, NULL);
+	g_return_val_if_fail (comp_data->icalcomp != NULL, NULL);
 
 	switch (col) {
 	case E_CAL_MODEL_FIELD_CATEGORIES :