Use the current day, as well as the current month and year.

Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcalendar.c (gtk_calendar_init): Use the current
	day, as well as the current month and year.

diff --git a/ChangeLog b/ChangeLog
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 23a0947cb5b79cb86523bd34d73c276ae940f9a4..b8f4b4d3e127490c58746394dd2878e4eeb0f48a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcalendar.c (gtk_calendar_init): Use the current
+       day, as well as the current month and year.
+
 Thu Sep 20 15:10:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): Automatically set

diff --git a/docs/Changes-2.0.txt b/docs/Changes-2.0.txt
index be699e877b2ae3b0ae0376626fb28d961f438c39..adf01fb2999965a493f3c0c58d7b5d9995c75a31 100644 (file)
--- a/docs/Changes-2.0.txt
+++ b/docs/Changes-2.0.txt
@@ -491,3 +491,6 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
       ancestor with a colormap set on it explicitely, or if that
       fails, the default colormap.
 
+* The default selected day for GtkCalendar is now the current day in the
+  month, not the first day in the month. The current month and year
+  were already used.

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index bd4cb35f571498d3a188a135123eaedc7f62af28..0f31cb3504b98fa6ff4ad10d023f49bf1fbab696 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -447,7 +447,7 @@ gtk_calendar_init (GtkCalendar *calendar)
   for (i=0;i<31;i++)
     calendar->marked_date[i] = FALSE;
   calendar->num_marked_dates = 0;
-  calendar->selected_day = 1;
+  calendar->selected_day = tm->tm_mday;
   
   calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING | 
                              GTK_CALENDAR_SHOW_DAY_NAMES );