Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.4702
diff -u -r1.4702 ChangeLog
--- ChangeLog	10 Dec 2003 23:45:37 -0000	1.4702
+++ ChangeLog	11 Dec 2003 20:09:29 -0000
@@ -1,3 +1,18 @@
+2003-12-11  Jan Arne Petersen  <jpetersen@uni-bonn.de>
+
+	* gtk/gtkfilechooserdefault.c: (create_folder_tree),
+	(create_shortcuts_tree), (create_file_list): Set the minimum height
+	of the lists (and trees) to 180 pixels (#129020).
+
+	(gtk_file_chooser_default_constructor): Change GtkHPaned parameter.
+	Correct the gutter position and disable shrink for the bookmark and
+	the file list (#129020).
+
+	* tests/testfilechooser.c (main): Remove the
+	gtk_window_set_default_size call so that the real default size of the
+	GtkFileChooser can be tested. Replace gtk_widget_show_all with
+	gtk_widget_show because it should work now.
+
 Thu Dec 11 00:35:12 2003  Matthias Clasen  <maclas@gmx.de>
 
 	Changes to allow "no input" windows (#64613):
Index: tests/testfilechooser.c
===================================================================
RCS file: /cvs/gnome/gtk+/tests/testfilechooser.c,v
retrieving revision 1.14
diff -u -r1.14 testfilechooser.c
--- tests/testfilechooser.c	10 Dec 2003 20:49:44 -0000	1.14
+++ tests/testfilechooser.c	11 Dec 2003 20:09:29 -0000
@@ -381,9 +381,7 @@
 					    NULL);
 
   /* Done with the dialog */
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
-  /* show_all() to reveal bugs in composite widget handling */
-  gtk_widget_show_all (dialog);
+  gtk_widget_show (dialog);
 
   /* Extra controls for manipulating the test environment
    */
Index: gtk/gtkfilechooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
retrieving revision 1.46
diff -u -r1.46 gtkfilechooserdefault.c
--- gtk/gtkfilechooserdefault.c	10 Dec 2003 20:49:44 -0000	1.46
+++ gtk/gtkfilechooserdefault.c	11 Dec 2003 20:10:16 -0000
@@ -158,6 +158,12 @@
 /* FIXME: maybe this should correspond to the font size in the tree views... */
 #define ICON_SIZE 20
 
+/* Default list size requests */
+/* FIXME: in the future there should be a better way than hardcode the size in pixels. */
+#define SHORTCUTS_TREE_HEIGHT 180
+#define FILE_LIST_HEIGHT 180
+#define FOLDER_TREE_HEIGHT 180
+
 static void gtk_file_chooser_default_class_init   (GtkFileChooserDefaultClass *class);
 static void gtk_file_chooser_default_iface_init   (GtkFileChooserIface        *iface);
 static void gtk_file_chooser_default_init         (GtkFileChooserDefault      *impl);
@@ -843,6 +849,7 @@
 		    G_CALLBACK (tree_selection_changed), impl);
 
   gtk_container_add (GTK_CONTAINER (impl->tree_scrollwin), impl->tree);
+  gtk_widget_set_size_request (impl->tree, -1, FOLDER_TREE_HEIGHT);
   gtk_widget_show (impl->tree);
 
   /* Model */
@@ -1118,6 +1125,7 @@
 		    G_CALLBACK (shortcuts_drag_data_received_cb), impl);
 
   gtk_container_add (GTK_CONTAINER (impl->shortcuts_scrollwin), impl->shortcuts_tree);
+  gtk_widget_set_size_request (impl->shortcuts_tree, -1, SHORTCUTS_TREE_HEIGHT);
   gtk_widget_show (impl->shortcuts_tree);
 
   /* Model */
@@ -1214,6 +1222,7 @@
   gtk_container_add (GTK_CONTAINER (impl->list_scrollwin), impl->list);
   g_signal_connect (impl->list, "row_activated",
 		    G_CALLBACK (list_row_activated), impl);
+  gtk_widget_set_size_request (impl->list, -1, FILE_LIST_HEIGHT);
   gtk_widget_show (impl->list);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->list));
@@ -1348,13 +1357,12 @@
 		    0, 1,                   1, 2,
 		    GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
 		    0,                      0);
-  gtk_paned_set_position (GTK_PANED (hpaned), 200); /* FIXME: this sucks */
   gtk_widget_show (hpaned);
 
   /* Shortcuts list */
 
   vbox = gtk_vbox_new (FALSE, 12);
-  gtk_paned_add1 (GTK_PANED (hpaned), vbox);
+  gtk_paned_pack1 (GTK_PANED (hpaned), vbox, FALSE, FALSE);
   gtk_widget_show (vbox);
 
   widget = create_shortcuts_tree (impl);
@@ -1371,7 +1379,7 @@
   /* Folder tree */
 
   vbox = gtk_vbox_new (FALSE, 12);
-  gtk_paned_add2 (GTK_PANED (hpaned), vbox);
+  gtk_paned_pack2 (GTK_PANED (hpaned), vbox, TRUE, FALSE);
   gtk_widget_show (vbox);
 
   hbox = gtk_hbox_new (FALSE, 12);
