forked from AuroraMiddleware/gtk
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.
This commit is contained in:
parent
b6828c4312
commit
19c564ba25
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user