--- gtkfilechooserdialog.c.~1.14.~	Thu Feb 19 15:23:26 2004
+++ gtkfilechooserdialog.c	Thu Feb 26 11:58:42 2004
@@ -26,8 +26,8 @@
 
 #include <stdarg.h>
 
-#define NUM_LINES 40
-#define NUM_CHARS 50
+#define NUM_LINES 20
+#define NUM_CHARS 30
 
 struct _GtkFileChooserDialogPrivate
 {
@@ -239,14 +239,12 @@
   font_size = pango_font_description_get_size (widget->style->font_desc);
   font_size = PANGO_PIXELS (font_size);
 
-  width = font_size * NUM_CHARS;
-  height = font_size * NUM_LINES;
-
-  /* Use at least the requisition size... */
-
+  /* Get the requisition size (including empty bookmark and file panes)  */
   gtk_widget_size_request (widget, &req);
-  width = MAX (width, req.width);
-  height = MAX (height, req.height);
+
+  /* Our default size includes extra space for characters.  */
+  width = font_size * NUM_CHARS + req.width;
+  height = font_size * NUM_LINES + req.height;
 
   /* ... but no larger than the monitor */
 
