summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2008-02-05 23:11:46 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2008-02-05 23:11:46 +0000
commit1b4619a1ab43051a9a3c17b507b368147e53574a (patch)
tree75efa0654e884d7d6f554e6561cf11e1edbf5d49
parent04de2d6d9e3a927bc7bdd8187dfbba4093873811 (diff)
downloadgdk-pixbuf-1b4619a1ab43051a9a3c17b507b368147e53574a.tar.gz
Fix 419737 and 499940 - Don't focus the file list when activating a shortcut
2008-02-05 Federico Mena Quintero <federico@novell.com> Don't focus the file list when shortcuts get activated. This removes a lot of ambiguity in when the file selection should change, and makes the overall code flow simpler. This fixes http://bugzilla.gnome.org/show_bug.cgi?id=419737 - file/save dialog clears the filename entry when changing directories. Also fixes http://bugzilla.gnome.org/show_bug.cgi?id=499940 - focus should not go to the file list when a shortcut is activated. * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume_mount_cb): Don't focus the file list (shortcuts_activate_get_info_cb): Likewise. Signed-off-by: Federico Mena Quintero <federico@gnu.org> svn path=/branches/gtk-2-12/; revision=19476
-rw-r--r--ChangeLog17
-rw-r--r--gtk/gtkfilechooserdefault.c7
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c93c45aec..e2ed4da00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,23 @@
2008-02-05 Federico Mena Quintero <federico@novell.com>
+ Don't focus the file list when shortcuts get activated. This
+ removes a lot of ambiguity in when the file selection should
+ change, and makes the overall code flow simpler.
+
+ This fixes http://bugzilla.gnome.org/show_bug.cgi?id=419737 -
+ file/save dialog clears the filename entry when changing
+ directories.
+
+ Also fixes http://bugzilla.gnome.org/show_bug.cgi?id=499940 -
+ focus should not go to the file list when a shortcut is activated.
+
+ * gtk/gtkfilechooserdefault.c
+ (shortcuts_activate_volume_mount_cb): Don't focus the file list
+ (shortcuts_activate_get_info_cb): Likewise.
+
+2008-02-05 Federico Mena Quintero <federico@novell.com>
+
Merged from trunk (patch by Josselin Mouette <joss@malsain.org>):
reviewed by: Federico Mena Quintero
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 46892cacb..b644c2ab0 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -10310,8 +10310,6 @@ shortcuts_activate_volume_mount_cb (GtkFileSystemHandle *handle,
if (path != NULL)
{
change_folder_and_display_error (impl, path, FALSE);
- focus_browse_tree_view_if_possible (impl);
-
gtk_file_path_free (path);
}
@@ -10394,10 +10392,7 @@ shortcuts_activate_get_info_cb (GtkFileSystemHandle *handle,
goto out;
if (!error && gtk_file_info_get_is_folder (info))
- {
- change_folder_and_display_error (data->impl, data->path, FALSE);
- focus_browse_tree_view_if_possible (data->impl);
- }
+ change_folder_and_display_error (data->impl, data->path, FALSE);
else
gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl),
data->path,