aboutsummaryrefslogtreecommitdiff
path: root/src/datetime-service.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/datetime-service.c')
-rw-r--r--src/datetime-service.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 458457a..13dc057 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -548,7 +548,6 @@ update_appointment_menu_items (gpointer user_data)
time_t t1, t2;
gchar *ad;
GList *l;
- //GList *allobjects = NULL;
GSList *g;
GError *gerror = NULL;
gint i;
@@ -560,7 +559,11 @@ update_appointment_menu_items (gpointer user_data)
else
time(&t1);
- t2 = t1 + (time_t) (7 * 24 * 60 * 60); /* 7 days ahead of now, we actually need number_of_days_in_this_month */
+ /* TODO: 7 days ahead of now, we actually need number_of_days_in_this_month
+ * so we call "mark-day" for all remaining days in this month
+ * N.B. Ideally we want any/all dates which are later than today to be marked.
+ */
+ t2 = t1 + (time_t) (7 * 24 * 60 * 60);
// TODO Remove all highlights from the calendar widget
@@ -619,7 +622,8 @@ update_appointment_menu_items (gpointer user_data)
}
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
- // Sometimes these give negative numbers, sometimes large numbers which look like timestampss
+ // Sometimes these give negative numbers, sometimes large numbers which look like timestamps
+ // is there a buffer overwrite causing it?
if (width <= 0) width = 12;
if (height <= 0) height = 12;
if (width > 30) width = 12;
@@ -687,19 +691,19 @@ update_appointment_menu_items (gpointer user_data)
if (apt_output == SETTINGS_TIME_12_HOUR) {
if ((mday == dmday) && (mon == dmon) && (year == dyear))
- strftime(right, 20, DEFAULT_TIME_12_FORMAT, due);
+ strftime(right, 20, _(DEFAULT_TIME_12_FORMAT), due);
else
- strftime(right, 20, DEFAULT_TIME_12_FORMAT_WITH_DAY, due);
+ strftime(right, 20, _(DEFAULT_TIME_12_FORMAT_WITH_DAY), due);
} else if (apt_output == SETTINGS_TIME_24_HOUR) {
if ((mday == dmday) && (mon == dmon) && (year == dyear))
- strftime(right, 20, DEFAULT_TIME_24_FORMAT, due);
+ strftime(right, 20, _(DEFAULT_TIME_24_FORMAT), due);
else
- strftime(right, 20, DEFAULT_TIME_24_FORMAT_WITH_DAY, due);
+ strftime(right, 20, _(DEFAULT_TIME_24_FORMAT_WITH_DAY), due);
} else {
if ((mday == dmday) && (mon == dmon) && (year == dyear))
- strftime(right, 20, DEFAULT_TIME_FORMAT, due);
+ strftime(right, 20, _(DEFAULT_TIME_FORMAT), due);
else
- strftime(right, 20, DEFAULT_TIME_FORMAT_WITH_DAY, due);
+ strftime(right, 20, _(DEFAULT_TIME_FORMAT_WITH_DAY), due);
}
g_debug("Appointment time: %s, for date %s", right, asctime(due));