From 9061e6ecebab12e8180653817d5252b077a319ed Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 7 Nov 2002 20:01:06 +0000 Subject: [PATCH] Back out last change, should have gone in on HEAD. Thu Nov 7 14:59:43 2002 Owen Taylor * tests/testcalendar.c: Back out last change, should have gone in on HEAD. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ tests/testcalendar.c | 17 +++++++++-------- 7 files changed, 39 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 82a1b1956f..21572efe2e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Nov 7 14:59:43 2002 Owen Taylor + + * tests/testcalendar.c: Back out last change, should have gone in + on HEAD. + Thu Nov 7 14:51:31 2002 Owen Taylor * tests/testcalendar.c (calendar_date_to_string): diff --git a/tests/testcalendar.c b/tests/testcalendar.c index 9fcdad13ee..8dec8b33cd 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -21,6 +21,7 @@ #include #include #include +#include #define DEF_PAD 10 #define DEF_PAD_SMALL 5 @@ -54,15 +55,15 @@ void calendar_date_to_string( CalendarData *data, char *buffer, gint buff_len ) { - GDate *date; - guint year, month, day; - - gtk_calendar_get_date (GTK_CALENDAR(data->window), - &year, &month, &day); - date = g_date_new_dmy (day, month, year); - g_date_strftime (buffer, buff_len-1, "%x", date); + struct tm tm; + time_t time; - g_date_free (date); + memset (&tm, 0, sizeof (tm)); + gtk_calendar_get_date (GTK_CALENDAR(data->window), + &tm.tm_year, &tm.tm_mon, &tm.tm_mday); + tm.tm_year -= TM_YEAR_BASE; + time = mktime(&tm); + strftime (buffer, buff_len-1, "%x", gmtime(&time)); } void calendar_set_signal_strings (char *sig_str,