diff options
| author | Iain Holmes <iain@src.gnome.org> | 2001-12-17 20:20:19 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2001-12-17 20:20:19 +0800 |
| commit | bdb095ab696dc1f2bd4bd081f90ee52d7a4bb61a (patch) | |
| tree | 989e66e17c72406a28ea9acbd724693a92626e22 /my-evolution/e-summary-calendar.c | |
| parent | 4effd42a76f5b9a0b73ccdf7ab66cbb36d38ac66 (diff) | |
| download | gsoc2013-evolution-bdb095ab696dc1f2bd4bd081f90ee52d7a4bb61a.tar.gz gsoc2013-evolution-bdb095ab696dc1f2bd4bd081f90ee52d7a4bb61a.tar.zst gsoc2013-evolution-bdb095ab696dc1f2bd4bd081f90ee52d7a4bb61a.zip | |
Merging patches from 1-0-branch
svn path=/trunk/; revision=15109
Diffstat (limited to 'my-evolution/e-summary-calendar.c')
| -rw-r--r-- | my-evolution/e-summary-calendar.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/my-evolution/e-summary-calendar.c b/my-evolution/e-summary-calendar.c index 7de4e6a545..46afa0cf45 100644 --- a/my-evolution/e-summary-calendar.c +++ b/my-evolution/e-summary-calendar.c @@ -364,19 +364,17 @@ generate_html (gpointer data) for (i = 0; i < uidarray->len; i++) { ESummaryCalEvent *event; CalComponentText text; - time_t start_t; - struct tm *start_tm; + struct tm start_tm; char start_str[64], *start_str_utf, *img; event = uidarray->pdata[i]; cal_component_get_summary (event->comp, &text); - start_t = icaltime_as_timet (*event->dt.value); - start_tm = localtime (&start_t); + start_tm = icaltimetype_to_tm (event->dt.value); if (calendar->wants24hr == TRUE) { - strftime (start_str, sizeof start_str, _("%k:%M %d %B"), start_tm); + strftime (start_str, sizeof start_str, _("%k:%M %d %B"), &start_tm); } else { - strftime (start_str, sizeof start_str, _("%l:%M %d %B"), start_tm); + strftime (start_str, sizeof start_str, _("%l:%M %d %B"), &start_tm); } if (cal_component_has_alarms (event->comp)) { @@ -394,7 +392,7 @@ generate_html (gpointer data) "alt=\"\" width=\"16\" height=\"16\">   " "<font size=\"-1\"><a href=\"calendar:/%s\">%s, %s</a></font><br>", img, - event->uid, start_str_utf, text.value); + event->uid, start_str_utf, text.value ? text.value : _("No description")); g_free (start_str_utf); g_string_append (string, tmp); |