AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merged from gtk-2-6:

Browse Source 
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:
Federico Mena Quintero 2005-01-18 21:45:01 +00:00 committed by Federico Mena Quintero
parent b6828c4312
commit 19c564ba25
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkdisplay.h: * gdk/gdkdisplay.h:

9
ChangeLog.pre-2-10
View File

@ -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> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkdisplay.h: * gdk/gdkdisplay.h:

9
ChangeLog.pre-2-8
View File

@ -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> 2005-01-18 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkdisplay.h: * gdk/gdkdisplay.h:

7
gtk/gtkfilechooserdefault.c
View File

@ -4392,6 +4392,13 @@ pending_op_queue (GtkFileChooserDefault *impl, PendingOp op, const GtkFilePath *
impl->pending_select_path = NULL; 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; impl->pending_op = op;
if (impl->pending_op == PENDING_OP_SELECT_PATH) if (impl->pending_op == PENDING_OP_SELECT_PATH)