diff --git a/ChangeLog b/ChangeLog index 338d4d1a4b..11c3c7eac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-04-15 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (pending_select_paths_process): + Patch from Christian Neumair ; 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-12 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 338d4d1a4b..11c3c7eac7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-04-15 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (pending_select_paths_process): + Patch from Christian Neumair ; 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-12 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 338d4d1a4b..11c3c7eac7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-04-15 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (pending_select_paths_process): + Patch from Christian Neumair ; 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-12 Matthias Clasen * configure.in: Bump version diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 3cc68b9076..cec2cae25e 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4605,11 +4605,13 @@ pending_select_paths_process (GtkFileChooserDefault *impl) * 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. * - * Also, we don't select the first file if we are in SAVE or CREATE_FOLDER - * modes. Doing so would change the contents of the filename entry. + * Also, we don't select the first file if we are not in OPEN mode. Doing + * 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) - && !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)) + if (GTK_WIDGET_MAPPED (impl) && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN) browse_files_select_first_row (impl); }