Commit 19c564ba authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

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.
parent b6828c43
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:
......
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:
......
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:
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment