aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2001-07-12 08:57:31 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2001-07-12 08:57:31 +0800
commit405cdd1ea2729f05512a3d9052a5683c34f556b1 (patch)
treeb7dcabcfab7d055107ec433039b49b8ef0845aca /calendar/cal-util
parentf78a8f4b7051429b8efb2225ced60707b4015b4f (diff)
downloadgsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar.gz
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar.bz2
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar.lz
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar.xz
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.tar.zst
gsoc2013-evolution-405cdd1ea2729f05512a3d9052a5683c34f556b1.zip
Fixes bug #4380 as well as some leftovers from the days of struct tm and
2001-07-11 Federico Mena Quintero <federico@ximian.com> Fixes bug #4380 as well as some leftovers from the days of struct tm and some uninitialized values. * gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed): Initialize the icaltimetype structures completely. (gnome_calendar_init): Do not reset priv->zone to NULL here, since it was set by gnome_calendar_update_config_settings() from setup_widgets(). * gui/calendar-model.c (set_completed): Do not set is_daylight. * gui/e-day-view.c (e_day_view_convert_grid_position_to_time): Likewise. * gui/e-week-view.c (e_week_view_set_timezone): Likewise. * cal-util/cal-recur.c (generate_instances_for_chunk): Likewise, and initialize start_tt and end_tt completely. * cal-util/timeutil.c (time_year_begin_with_zone): Likewise. (time_month_begin_with_zone): Likewise. (time_week_begin_with_zone): Likewise. (time_day_begin_with_zone): Likewise. (time_day_end_with_zone): Likewise. (time_from_isodate): Likewise. * gui/dialogs/task-page.c (task_page_fill_component): Initialize icaltime before using it. * gui/dialogs/event-page.c (event_page_fill_component): Likewise. * gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an unused icaltimetype. * gui/dialogs/task-details-page.c (task_details_page_fill_component): Initialize icaltime before using it. svn path=/trunk/; revision=11024
Diffstat (limited to 'calendar/cal-util')
-rw-r--r--calendar/cal-util/cal-recur.c4
-rw-r--r--calendar/cal-util/timeutil.c7
2 files changed, 2 insertions, 9 deletions
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index 8df567fa5c..13c9f0533f 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -1201,13 +1201,13 @@ generate_instances_for_chunk (CalComponent *comp,
g_print ("Checking occurrence: %s\n",
cal_obj_time_to_string (occ));
#endif
+ start_tt = icaltime_null_time ();
start_tt.year = occ->year;
start_tt.month = occ->month + 1;
start_tt.day = occ->day;
start_tt.hour = occ->hour;
start_tt.minute = occ->minute;
start_tt.second = occ->second;
- start_tt.is_daylight = -1;
start_time = icaltime_as_timet_with_zone (start_tt, zone);
if (start_time == -1) {
@@ -1244,13 +1244,13 @@ generate_instances_for_chunk (CalComponent *comp,
cal_obj_time_add_seconds (occ, duration_seconds);
}
+ end_tt = icaltime_null_time ();
end_tt.year = occ->year;
end_tt.month = occ->month + 1;
end_tt.day = occ->day;
end_tt.hour = occ->hour;
end_tt.minute = occ->minute;
end_tt.second = occ->second;
- end_tt.is_daylight = -1;
end_time = icaltime_as_timet_with_zone (end_tt, zone);
if (end_time == -1) {
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
index eb68376449..3a9308c1e1 100644
--- a/calendar/cal-util/timeutil.c
+++ b/calendar/cal-util/timeutil.c
@@ -279,7 +279,6 @@ time_year_begin_with_zone (time_t time, icaltimezone *zone)
tt.hour = 0;
tt.minute = 0;
tt.second = 0;
- tt.is_daylight = -1;
/* Convert back to a time_t. */
return icaltime_as_timet_with_zone (tt, zone);
@@ -304,7 +303,6 @@ time_month_begin_with_zone (time_t time, icaltimezone *zone)
tt.hour = 0;
tt.minute = 0;
tt.second = 0;
- tt.is_daylight = -1;
/* Convert back to a time_t. */
return icaltime_as_timet_with_zone (tt, zone);
@@ -337,7 +335,6 @@ time_week_begin_with_zone (time_t time, int week_start_day, icaltimezone *zone)
tt.hour = 0;
tt.minute = 0;
tt.second = 0;
- tt.is_daylight = -1;
/* Normalize it, to fix any overflow. */
tt = icaltime_normalize (tt);
@@ -364,7 +361,6 @@ time_day_begin_with_zone (time_t time, icaltimezone *zone)
tt.hour = 0;
tt.minute = 0;
tt.second = 0;
- tt.is_daylight = -1;
/* Convert back to a time_t. */
return icaltime_as_timet_with_zone (tt, zone);
@@ -389,7 +385,6 @@ time_day_end_with_zone (time_t time, icaltimezone *zone)
tt.hour = 0;
tt.minute = 0;
tt.second = 0;
- tt.is_daylight = -1;
/* Normalize it, to fix any overflow. */
tt = icaltime_normalize (tt);
@@ -559,8 +554,6 @@ time_from_isodate (const char *str)
+ digit_at (str, 14);
}
- tt.is_daylight = -1;
-
utc_zone = icaltimezone_get_utc_timezone ();
return icaltime_as_timet_with_zone (tt, utc_zone);