get the logic correct. This will fix sizing on save dialogs.

Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkfilechooserdefault.c
        (gtk_file_chooser_default_get_resizable_hints): get the logic
        correct.  This will fix sizing on save dialogs.

        (save_widgets_create): set_mnemonic_widget.

7 files changed, 50 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f45ea8b47..1587dc9237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_get_resizable_hints): get the logic
+	correct.  This will fix sizing on save dialogs.
+
+	(save_widgets_create): set_mnemonic_widget.
+
 2004-03-02  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8f45ea8b47..1587dc9237 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_get_resizable_hints): get the logic
+	correct.  This will fix sizing on save dialogs.
+
+	(save_widgets_create): set_mnemonic_widget.
+
 2004-03-02  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8f45ea8b47..1587dc9237 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_get_resizable_hints): get the logic
+	correct.  This will fix sizing on save dialogs.
+
+	(save_widgets_create): set_mnemonic_widget.
+
 2004-03-02  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8f45ea8b47..1587dc9237 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_get_resizable_hints): get the logic
+	correct.  This will fix sizing on save dialogs.
+
+	(save_widgets_create): set_mnemonic_widget.
+
 2004-03-02  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8f45ea8b47..1587dc9237 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_get_resizable_hints): get the logic
+	correct.  This will fix sizing on save dialogs.
+
+	(save_widgets_create): set_mnemonic_widget.
+
 2004-03-02  Federico Mena Quintero  <federico@ximian.com>
 
 	* gtk/gtkfilechooserdefault.c
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index de7beb07d3..188de6c191 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2076,6 +2076,7 @@ save_widgets_create (GtkFileChooserDefault *impl)
 		    1, 2, 1, 2,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL,
 		    0, 0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (impl->save_folder_label), impl->save_folder_combo);
 
   /* custom widget */
   impl->save_extra_align = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
@@ -3359,23 +3360,18 @@ gtk_file_chooser_default_get_resizable_hints (GtkFileChooserEmbed *chooser_embed
 {
   GtkFileChooserDefault *impl;
 
-  impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
+  g_return_if_fail (resize_horizontally != NULL);
+  g_return_if_fail (resize_vertically != NULL);
 
-  if (resize_horizontally)
-    *resize_horizontally = TRUE;
+  impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
 
-  if (resize_vertically)
+  if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
+      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
     {
-      *resize_vertically = TRUE;
-
-      if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
-	  impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+      if (! gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)))
 	{
-	  if (! gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)))
-	    {
-	      *resize_vertically = FALSE;
-	      *resize_horizontally = FALSE;
-	    }
+	  *resize_vertically = FALSE;
+	  *resize_horizontally = FALSE;
 	}
     }
 }
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index d40664eb4c..8ba2804adb 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -227,6 +227,7 @@ file_chooser_widget_default_size_changed (GtkWidget            *widget,
   _gtk_file_chooser_embed_get_resizable_hints (GTK_FILE_CHOOSER_EMBED (priv->widget),
 					       &resize_horizontally,
 					       &resize_vertically);
+
   /* Only store the size if we can resize in that direction. */
   if (resize_horizontally)
     priv->default_width = width;