Commit 9bd53c86 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Federico Mena Quintero

Merged from gtk-2-6:

2005-04-15  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
	Patch from Christian Neumair <chris@gnome-de.org>; only select the
	first row if we are in OPEN mode.  The only other case we were
	letting pass through was SELECT_FOLDER, but selecting the first
	row when changing folders confuses people when folders are
	actually being selected.  Fixes #171885.
parent 72af6a55
2005-04-15 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
Patch from Christian Neumair <chris@gnome-de.org>; only select the
first row if we are in OPEN mode. The only other case we were
letting pass through was SELECT_FOLDER, but selecting the first
row when changing folders confuses people when folders are
actually being selected. Fixes #171885.
2005-04-13 Matthias Clasen <mclasen@redhat.com> 2005-04-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
......
2005-04-15 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
Patch from Christian Neumair <chris@gnome-de.org>; only select the
first row if we are in OPEN mode. The only other case we were
letting pass through was SELECT_FOLDER, but selecting the first
row when changing folders confuses people when folders are
actually being selected. Fixes #171885.
2005-04-13 Matthias Clasen <mclasen@redhat.com> 2005-04-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
......
2005-04-15 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6:
* gtk/gtkfilechooserdefault.c (pending_select_paths_process):
Patch from Christian Neumair <chris@gnome-de.org>; only select the
first row if we are in OPEN mode. The only other case we were
letting pass through was SELECT_FOLDER, but selecting the first
row when changing folders confuses people when folders are
actually being selected. Fixes #171885.
2005-04-13 Matthias Clasen <mclasen@redhat.com> 2005-04-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
......
...@@ -4805,11 +4805,13 @@ pending_select_paths_process (GtkFileChooserDefault *impl) ...@@ -4805,11 +4805,13 @@ pending_select_paths_process (GtkFileChooserDefault *impl)
* that case, the chooser's selection should be what the caller expects, * that case, the chooser's selection should be what the caller expects,
* as the user can't see that something else got selected. See bug #165264. * as the user can't see that something else got selected. See bug #165264.
* *
* Also, we don't select the first file if we are in SAVE or CREATE_FOLDER * Also, we don't select the first file if we are not in OPEN mode. Doing
* modes. Doing so would change the contents of the filename entry. * so would change the contents of the filename entry for SAVE or
* CREATE_FOLDER, which is undesired; in SELECT_FOLDER, we don't want to
* select a *different* folder from the one into which the user just
* navigated.
*/ */
if (GTK_WIDGET_MAPPED (impl) if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
browse_files_select_first_row (impl); browse_files_select_first_row (impl);
} }
......
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