aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamon Chaplin <damon@ximian.com>2001-10-03 12:29:55 +0800
committerDamon Chaplin <damon@src.gnome.org>2001-10-03 12:29:55 +0800
commit83529b8532f36c48724626e63009683266a42a3b (patch)
tree77a13b66c19d8cda33f0ab7e3eb2f1727afc08d4
parent7b834caab7a30d368def890bbcc61c22c6262f20 (diff)
downloadgsoc2013-evolution-83529b8532f36c48724626e63009683266a42a3b.tar.gz
gsoc2013-evolution-83529b8532f36c48724626e63009683266a42a3b.tar.zst
gsoc2013-evolution-83529b8532f36c48724626e63009683266a42a3b.zip
used time_add_day/week/month _with_zone() functions rather than the old
2001-10-01 Damon Chaplin <damon@ximian.com> * e-summary-calendar.c (generate_html): used time_add_day/week/month _with_zone() functions rather than the old versions. * e-summary.c (alarm_fn): use time_day_end_with_zone (). * e-summary-tasks.c (generate_html): removed day_begin and day_end since they aren't used, and the calls to time_day_begin/end(). svn path=/trunk/; revision=13365
-rw-r--r--my-evolution/ChangeLog10
-rw-r--r--my-evolution/e-summary-calendar.c6
-rw-r--r--my-evolution/e-summary-tasks.c4
-rw-r--r--my-evolution/e-summary.c2
4 files changed, 15 insertions, 7 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 22ff88f2f1..bf98642cf9 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-01 Damon Chaplin <damon@ximian.com>
+
+ * e-summary-calendar.c (generate_html): used time_add_day/week/month
+ _with_zone() functions rather than the old versions.
+
+ * e-summary.c (alarm_fn): use time_day_end_with_zone ().
+
+ * e-summary-tasks.c (generate_html): removed day_begin and day_end
+ since they aren't used, and the calls to time_day_begin/end().
+
2001-10-02 Iain Holmes <iain@ximian.com>
* e-summary-calendar.c (uids_to_array): Handle recurrances correctly.
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c
index 8c97c9e65a..d8c913ed82 100644
--- a/my-evolution/e-summary-calendar.c
+++ b/my-evolution/e-summary-calendar.c
@@ -302,18 +302,18 @@ generate_html (gpointer data)
break;
case E_SUMMARY_CALENDAR_FIVE_DAYS:
- f = time_add_day (t, 5);
+ f = time_add_day_with_zone (t, 5, summary->tz);
end = time_day_end_with_zone (f, summary->tz);
break;
case E_SUMMARY_CALENDAR_ONE_WEEK:
- f = time_add_week (t, 1);
+ f = time_add_week_with_zone (t, 1, summary->tz);
end = time_day_end_with_zone (f, summary->tz);
break;
case E_SUMMARY_CALENDAR_ONE_MONTH:
default:
- f = time_add_month (t, 1);
+ f = time_add_month_with_zone (t, 1, summary->tz);
end = time_day_end_with_zone (f, summary->tz);
break;
}
diff --git a/my-evolution/e-summary-tasks.c b/my-evolution/e-summary-tasks.c
index 9ed5c6bc55..529af3f90e 100644
--- a/my-evolution/e-summary-tasks.c
+++ b/my-evolution/e-summary-tasks.c
@@ -215,11 +215,9 @@ generate_html (gpointer data)
GList *uids, *l;
GString *string;
char *tmp;
- time_t t, day_begin, day_end;
+ time_t t;
t = time (NULL);
- day_begin = time_day_begin (t);
- day_end = time_day_end (t);
uids = cal_client_get_uids (tasks->client, CALOBJ_TYPE_TODO);
if (summary->preferences->show_tasks == E_SUMMARY_CALENDAR_TODAYS_TASKS && uids != NULL) {
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 56ba7dd9ae..98f13aa1e7 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -449,7 +449,7 @@ alarm_fn (gpointer alarm_id,
summary = data;
t = time (NULL);
- day_end = time_day_end (t);
+ day_end = time_day_end_with_zone (t, summary->tz);
summary->priv->alarm = alarm_add (day_end, alarm_fn, summary, NULL);
e_summary_reconfigure (summary);