# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: geoffrey.antos@gmail.com-20080808181443-\
#   q8ns8grkps0v5w28
# target_branch: ../upstream/
# testament_sha1: 971242f1e0da5085e40326213b1b3d08eeb86bca
# timestamp: 2008-08-08 11:15:48 -0700
# source_branch: .
# base_revision_id: geoffrey.antos@gmail.com-20080807194437-\
#   7w2jkmrqw857kigv
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2008-08-07 19:44:37 +0000
+++ ChangeLog	2008-08-08 18:14:43 +0000
@@ -1,3 +1,7 @@
+2008-08-08  Geoffrey Antos <dynamotwain@aim.com>
+	* libgthumb/image-viewer.c: (image_viewer_size_allocate):
+		Finally make scrollbars go away in zoom-to-fit modes.
+
 2008-08-07  Geoffrey Antos <dynamotwain@aim.com>
 	* libgthumb/image-viewer-image.c: (image_viewer_image_get_path):
 		Fix a NULL-dereference.

=== modified file 'libgthumb/image-viewer.c'
--- libgthumb/image-viewer.c	2008-08-07 18:15:24 +0000
+++ libgthumb/image-viewer.c	2008-08-08 18:14:43 +0000
@@ -983,14 +983,15 @@
 		priv->hadj->value          = floor (off_x - gdk_width / 2);
 		priv->hadj->step_increment = STEP_INCREMENT;
 		priv->hadj->page_increment = floor (gdk_width / 2);
-		priv->hadj->page_size      = gdk_width;
+		priv->hadj->page_size      = allocation->width;
 
 		priv->vadj->lower          = floor (-height / 2 - priv->frame_border);
 		priv->vadj->upper          = floor ( height / 2 + priv->frame_border);
 		priv->vadj->value          = floor ( off_y - gdk_height / 2);
 		priv->vadj->step_increment = STEP_INCREMENT;
 		priv->vadj->page_increment = floor (gdk_height / 2);
-		priv->vadj->page_size      = gdk_height;
+		priv->vadj->page_size      = allocation->height;
+
 	} else {
 		priv->hadj->lower     = 0.0;
 		priv->hadj->upper     = 1.0;

