Fix off-by-one error. GDate month is one-based and GtkCalendar month is

Sun Jul  4 01:29:35 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcalendar.c (gtk_calendar_drag_data_get):
	(gtk_calendar_drag_data_received): Fix off-by-one error.
	GDate month is one-based and GtkCalendar month is zero-based.
	(#145134, William Jon McCann)

diff --git a/ChangeLog b/ChangeLog
index d88bba107418ded1059b5f9d778aad75d68c2ae8..e6a76cb61afac4aa6abe7aba00b78bfdf456e81d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jul  4 01:29:35 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_drag_data_get): 
+       (gtk_calendar_drag_data_received): Fix off-by-one error.  
+       GDate month is one-based and GtkCalendar month is zero-based.  
+       (#145134, William Jon McCann)
+
 Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d88bba107418ded1059b5f9d778aad75d68c2ae8..e6a76cb61afac4aa6abe7aba00b78bfdf456e81d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Jul  4 01:29:35 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_drag_data_get): 
+       (gtk_calendar_drag_data_received): Fix off-by-one error.  
+       GDate month is one-based and GtkCalendar month is zero-based.  
+       (#145134, William Jon McCann)
+
 Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d88bba107418ded1059b5f9d778aad75d68c2ae8..e6a76cb61afac4aa6abe7aba00b78bfdf456e81d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Jul  4 01:29:35 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_drag_data_get): 
+       (gtk_calendar_drag_data_received): Fix off-by-one error.  
+       GDate month is one-based and GtkCalendar month is zero-based.  
+       (#145134, William Jon McCann)
+
 Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d88bba107418ded1059b5f9d778aad75d68c2ae8..e6a76cb61afac4aa6abe7aba00b78bfdf456e81d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Jul  4 01:29:35 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_drag_data_get): 
+       (gtk_calendar_drag_data_received): Fix off-by-one error.  
+       GDate month is one-based and GtkCalendar month is zero-based.  
+       (#145134, William Jon McCann)
+
 Sun Jul  4 01:11:07 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktreestore.c (gtk_tree_store_move): Don't crash if

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 331f3fe4bc4032a744bd312c2c6d910858b096ae..e0fdef80fdd146e23ad9beb59e8c033be8bd4b9f 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -3389,7 +3389,7 @@ gtk_calendar_drag_data_get (GtkWidget        *widget,
   gchar str[128];
   gsize len;
 
-  date = g_date_new_dmy (calendar->selected_day, calendar->month, calendar->year);
+  date = g_date_new_dmy (calendar->selected_day, calendar->month + 1, calendar->year);
   len = g_date_strftime (str, 127, "%x", date);
   gtk_selection_data_set_text (selection_data, str, len);
   
@@ -3550,7 +3550,7 @@ gtk_calendar_drag_data_received (GtkWidget        *widget,
   g_object_freeze_notify (G_OBJECT (calendar));
   if (!(calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
       && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
-    gtk_calendar_select_month (calendar, month, year);
+    gtk_calendar_select_month (calendar, month - 1, year);
   gtk_calendar_select_day (calendar, day);
   g_object_thaw_notify (G_OBJECT (calendar));  
 }