Merged from gtk-2-6:

2005-01-18  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
	operation to select the first file if we are in SAVE or
	CREATE_FOLDER modes.  Executing that operation would overwrite the
	contents of the save-name entry.

diff --git a/ChangeLog b/ChangeLog
index e75aff3c0cb82269852f757d44d8f06167891c28..73e02739d2c1a3ee2edfa47fa51fecaf8549a988 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+       operation to select the first file if we are in SAVE or
+       CREATE_FOLDER modes.  Executing that operation would overwrite the
+       contents of the save-name entry.
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkdisplay.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e75aff3c0cb82269852f757d44d8f06167891c28..73e02739d2c1a3ee2edfa47fa51fecaf8549a988 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+       operation to select the first file if we are in SAVE or
+       CREATE_FOLDER modes.  Executing that operation would overwrite the
+       contents of the save-name entry.
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkdisplay.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e75aff3c0cb82269852f757d44d8f06167891c28..73e02739d2c1a3ee2edfa47fa51fecaf8549a988 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-01-18  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c (pending_op_queue): Don't queue an
+       operation to select the first file if we are in SAVE or
+       CREATE_FOLDER modes.  Executing that operation would overwrite the
+       contents of the save-name entry.
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkdisplay.h: 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 28af0a36d20efa34fd1a45a5b0e63bb031307727..47c63f6d5c4bbc8a6c04286dcec67105cb666283 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4392,6 +4392,13 @@ pending_op_queue (GtkFileChooserDefault *impl, PendingOp op, const GtkFilePath *
       impl->pending_select_path = NULL;
     }
 
+  if (op == PENDING_OP_SELECT_FIRST &&
+      (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
+    {
+      impl->pending_op == PENDING_OP_NONE;
+      return;
+    }
+
   impl->pending_op = op;
 
   if (impl->pending_op == PENDING_OP_SELECT_PATH)