2006-11-01 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

[0.14.8-1 release]

	* configure.ac:
	* debian/changelog: Updating.

	* hildon-widgets/hildon-scroll-area.c: Fixing a silly compilation
	breakage.

diff --git a/ChangeLog b/ChangeLog
index 01ffc2a..0df4bc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-01  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       [0.14.8-1 release]
+
+       * configure.ac:
+       * debian/changelog: Updating.
+
+       * hildon-widgets/hildon-scroll-area.c: Fixing a silly compilation
+       breakage.
+
 2006-10-31  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * hildon-widgets/hildon-scroll-area.c:

diff --git a/configure.ac b/configure.ac
index 1bba97d..aceb3bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-libs, 0.14.7)
+AM_INIT_AUTOMAKE(hildon-libs, 0.14.8)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

diff --git a/debian/changelog b/debian/changelog
index 2670fff..0825792 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hildon-libs (0.14.8-1) unstable; urgency=low
+
+  * Fixes: NB#39585 - Hildon_set_password dialog has auto-capitalization active
+  * Fixes: NB#41501 - Last line of text in preview dialog is not shown properly when bold and maximum font is selected
+  * Fixes: NB#20219 - Sputnik 2005 - Scrolling not smooth with HildonScrollArea
+
+ -- Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>  Wed, 01 Nov 2006 10:58:00 +0300
+
 hildon-libs (0.14.7-1) unstable; urgency=low
 
   * Fixes: #NB38598 - Information banners do not resize.

diff --git a/hildon-widgets/hildon-scroll-area.c b/hildon-widgets/hildon-scroll-area.c
index 37751b5..ff484be 100644 (file)
--- a/hildon-widgets/hildon-scroll-area.c
+++ b/hildon-widgets/hildon-scroll-area.c
@@ -184,9 +184,10 @@ static void hildon_scroll_area_child_requisition (GtkWidget *widget,
 {
   /* Limit height to fixed height */
   gint new_req = MAX (req->height, sc->fixed->allocation.height);
-  new_req = MIN (sc->outadj->page_size - adjust_factor, new_req);
   gint adjust_factor = calculate_size (sc->swouter) * 0.7;
+  
   adjust_factor = MAX (0, adjust_factor - sc->outadj->value);
+  new_req = MIN (sc->outadj->page_size - adjust_factor, new_req);
 
   gtk_widget_set_size_request (sc->fixed, -1, req->height);
   /* Request inner scrolled window at most page size */