diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | gtk/gtkcalendar.c | 4 |
5 files changed, 36 insertions, 6 deletions
@@ -1,7 +1,13 @@ +2005-01-14 Matthias Clasen <mclasen@redhat.com> + + * configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it + is an enum value, not a define. Pointed out by Tommi Komulainen. + * gtk/gtkcalendar.c (gtk_calendar_init): Adapt. + 2005-01-13 Matthias Clasen <mclasen@redhat.com> * configure.in: Check for nl_langinfo() - * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's + * gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's available to determine first day of week (#163842, Vincent Untz) * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fc7d681298..a0dd228c03 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,13 @@ +2005-01-14 Matthias Clasen <mclasen@redhat.com> + + * configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it + is an enum value, not a define. Pointed out by Tommi Komulainen. + * gtk/gtkcalendar.c (gtk_calendar_init): Adapt. + 2005-01-13 Matthias Clasen <mclasen@redhat.com> * configure.in: Check for nl_langinfo() - * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's + * gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's available to determine first day of week (#163842, Vincent Untz) * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fc7d681298..a0dd228c03 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,13 @@ +2005-01-14 Matthias Clasen <mclasen@redhat.com> + + * configure.in: Check for _NL_TIME_FIRST_WEEKDAY too, since it + is an enum value, not a define. Pointed out by Tommi Komulainen. + * gtk/gtkcalendar.c (gtk_calendar_init): Adapt. + 2005-01-13 Matthias Clasen <mclasen@redhat.com> * configure.in: Check for nl_langinfo() - * gtk/gtkcalendar.c: (gtk_calendar_init): Use nl_langinfo() when it's + * gtk/gtkcalendar.c (gtk_calendar_init): Use nl_langinfo() when it's available to determine first day of week (#163842, Vincent Untz) * gtk/gtkuimanager.c (gtk_ui_manager_get_widget): Add hints about diff --git a/configure.in b/configure.in index b6f047e6a7..3c79376266 100644 --- a/configure.in +++ b/configure.in @@ -396,7 +396,19 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) -AC_CHECK_FUNCS(lstat mkstemp flockfile nl_langinfo) +AC_CHECK_FUNCS(lstat mkstemp flockfile) + +# _NL_TIME_FIRST_WEEKDAY is an enum and not a define +AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY]) +AC_TRY_LINK([#include <langinfo.h>], [ +char c; +c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); +], gtk_ok=yes, gtk_ok=no) +AC_MSG_RESULT($gtk_ok) +if test "$gtk_ok" = "yes"; then + AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1], + [Define if _NL_TIME_FIRST_WEEKDAY is available]) +fi # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable AC_MSG_CHECKING(for sigsetjmp) diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 0f45c04041..e4ddf18b4e 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif -#ifdef HAVE_NL_LANGINFO +#ifdef HAVE__NL_TIME_FIRST_WEEKDAY #include <langinfo.h> #endif #include <string.h> @@ -706,7 +706,7 @@ gtk_calendar_init (GtkCalendar *calendar) else if (strcmp (year_before, "calendar:MY") != 0) g_warning ("Whoever translated calendar:MY did so wrongly.\n"); -#if defined (HAVE_NL_LANGINFO) && defined (_NL_TIME_FIRST_WEEKDAY) +#ifdef HAVE__NL_TIME_FIRST_WEEKDAY week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY); private_data->week_start = *((unsigned char *) week_start) % 7; #else |