Index: gtk/gtkcalendar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcalendar.c,v
retrieving revision 1.112
diff -u -p -r1.112 gtkcalendar.c
--- gtk/gtkcalendar.c	10 Sep 2006 06:39:16 -0000	1.112
+++ gtk/gtkcalendar.c	28 Sep 2006 07:35:13 -0000
@@ -417,7 +417,7 @@ gtk_calendar_class_init (GtkCalendarClas
                                    g_param_spec_int ("year",
 						     P_("Year"),
 						     P_("The selected year"),
-						     0, G_MAXINT, 0,
+						     0, G_MAXUSHORT, 0,
 						     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_MONTH,
@@ -3327,6 +3327,8 @@ gtk_calendar_select_month (GtkCalendar *
 {
   g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
   g_return_val_if_fail (month <= 11, FALSE);
+  
+  year = CLAMP (year, 0, G_MAXUSHORT);
   
   calendar->month = month;
   calendar->year  = year;
