Fix the calculation of week_start. (#314473, JP Rosevaar)

2005-08-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcalendar.c (gtk_calendar_init): Fix the calculation
	of week_start.  (#314473, JP Rosevaar)

diff --git a/ChangeLog b/ChangeLog
index ab515b11c64083ab1fa1dadba80e8b4fce5c49be..d972e44414b0541618cef300d61707b27dd43a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Fix the calculation
+       of week_start.  (#314473, JP Rosevaar)
+
 2005-08-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ab515b11c64083ab1fa1dadba80e8b4fce5c49be..d972e44414b0541618cef300d61707b27dd43a13 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Fix the calculation
+       of week_start.  (#314473, JP Rosevaar)
+
 2005-08-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 60dd69fe2cdbfbcaac2b5cc16f6e0e7a40b84b54..e49fe9f93069281050de02dde125f1f70705c70f 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -652,7 +652,7 @@ gtk_calendar_init (GtkCalendar *calendar)
 
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
   week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
-  priv->week_start = *((unsigned char *) week_start) % 7 - 1;
+  priv->week_start = (*((unsigned char *) week_start) - 1) % 7;
 #else
   /* Translate to calendar:week_start:0 if you want Sunday to be the
    * first day of the week to calendar:week_start:1 if you want Monday