From de3cf6c83d486ede68b34370e0e16d9b693277e5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 4 Oct 2005 13:42:27 +0000 Subject: [PATCH 1/1] Make it compile without HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias 2005-10-04 Tor Lillqvist * gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias Hasselmann) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkcalendar.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6c75b2518..2127c095e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-04 Tor Lillqvist + + * gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without + HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias Hasselmann) + 2005-10-04 Matthias Clasen * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6c75b2518..2127c095e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-10-04 Tor Lillqvist + + * gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without + HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias Hasselmann) + 2005-10-04 Matthias Clasen * gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index aaedee9f5..d8daeaa57 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -565,10 +565,14 @@ gtk_calendar_init (GtkCalendar *calendar) time_t tmp_time; GtkCalendarPrivate *priv; gchar *year_before; +#ifdef HAVE__NL_TIME_FIRST_WEEKDAY gchar *langinfo; gint week_1stday = 0; gint first_weekday = 1; guint week_origin; +#else + gchar *week_start; +#endif priv = calendar->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar, GTK_TYPE_CALENDAR, -- 2.43.2