diff --git a/ChangeLog b/ChangeLog
index 5dfd837bcb..7d70c18112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkaspectratio.c: Fix the default value for the ratio
+	property.
+
 2007-12-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gkt/gtksignal.h: Fix 0<>NULL confusion in gtk_signal_connect...
@@ -7,6 +12,14 @@
 	
 	* Makefile.am: Install gail.pc. Bug #505859.
 
+2007-12-27  Mathias Hasselmann  <mathias@openismus.com>
+
+	Consider details for size-request and expose-event. (#339540)
+
+	* gtk/gtkcalendar.c: Add gtk_calendar_get_detail and
+	is_color_attribute functions. Change gtk_calendar_size_request and
+	calendar_paint_day to consider and show calender details.
+
 2007-12-27  Mathias Hasselmann  <mathias@openismus.com>
 
 	Add infrastructure for GtkCalendar details. (#339540)
@@ -226,6 +239,30 @@
 
 2007-12-27  Mathias Hasselmann  <mathias@openismus.com>
 
+	Add GTK_CALENDAR_SHOW_DETAILS display flag, which chooses if details
+	are shown within the widget, or jst as tooltip.
+
+	* gtk/gtkcalendar.c, gtk/gtkcalendar.h: Add "show-details" property
+	aka. GTK_CALENDAR_SHOW_DETAILS, and use it.
+	* tests/testcalendar.c: Test GTK_CALENDAR_SHOW_DETAILS. Reduce padding
+	in flags vbox.
+
+2007-12-27  Mathias Hasselmann  <mathias@openismus.com>
+
+	Try more decent appearance of calendar details separator. (#339540)
+
+	* gtk/gtkcalendar.c: Use different colors for drawing the separator,
+	and make it short by one pixel on each side.
+
+2007-12-17  Mathias Hasselmann  <mathias@openismus.com>
+
+	Try more decent appearance of calendar details separator. (#339540)
+
+	* gtk/gtkcalendar.c: Use different colors for drawing the separator,
+	and make it short by one pixel on each side.
+
+2007-12-17  Mathias Hasselmann  <mathias@openismus.com>
+
 	Try more decent appearance of calendar details separator. (#339540)
 
 	* gtk/gtkcalendar.c: Use different colors for drawing the separator,
@@ -281,6 +318,24 @@
 	* gtk/gtkcalendar.c: Add calendar_queue_refresh and call
 	that function instead of gtk_widget_queue_draw.
 
+2007-12-17  Mathias Hasselmann  <mathias@openismus.com>
+
+	Without explicitly set "detail-width-chars" and "detail-height-rows"
+	properties not only the widget has to be redrawn on certain
+	conditions, but also its size must be recalculated. (#339540)
+
+	* gtk/gtkcalendar.c: Add calendar_queue_refresh and call
+	that function instead of gtk_widget_queue_draw.
+
+2007-12-17  Mathias Hasselmann  <mathias@openismus.com>
+
+	Without explicitly set "detail-width-chars" and "detail-height-rows"
+	properties not only the widget has to be redrawn on certain
+	conditions, but also its size must be recalculated. (#339540)
+
+	* gtk/gtkcalendar.c: Add calendar_queue_refresh and call
+	that function instead of gtk_widget_queue_draw.
+
 2007-12-17  Mathias Hasselmann  <mathias@openismus.com>
 
 	Consider in size-request and show calender details. (#339540)
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 0caa58312c..e8f9d91807 100644
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -92,7 +92,7 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
                                    g_param_spec_float ("ratio",
                                                        P_("Ratio"),
                                                        P_("Aspect ratio if obey_child is FALSE"),
-                                                       MIN_RATIO, MAX_RATIO, 0.5,
+                                                       MIN_RATIO, MAX_RATIO, 1.0,
                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_OBEY_CHILD,