diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-12-03 03:42:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-12-03 03:42:48 +0000 |
| commit | be60805ef6f41ddbd69f1b3b4ac1052d7b05ca3b (patch) | |
| tree | 3e480b821227b1f0969c7a6179999f44206d609f | |
| parent | f9d9bae64e1eba9e902da8486ffa4e9fc678876f (diff) | |
| download | gdk-pixbuf-be60805ef6f41ddbd69f1b3b4ac1052d7b05ca3b.tar.gz | |
Reinstate the previous behavior for clicking Ok after activating a
2004-12-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after
activating a bookmark or path bar button in folder
modes. (#160044, Dennis Cranston)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 13 |
5 files changed, 33 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a92d1c980..26458ec94 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a92d1c980..26458ec94 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a92d1c980..26458ec94 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 7fb605e24..489b9d46c 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5119,11 +5119,16 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed) selection_check (impl, &num_selected, &all_files, &all_folders); - if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) + if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { - if (num_selected > 0) - return TRUE; + if (num_selected != 1) + return TRUE; /* zero means current folder; more than one means use the whole selection */ + else if (current_focus != impl->browse_files_tree_view) + { + /* a single folder is selected and a button was clicked */ + switch_to_selected_folder (impl); + return TRUE; + } } if (num_selected == 0) |