Merged from gtk-2-4:

2004-11-29  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-4:

	* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
	Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions.  This
	lets us navigate thei file system more easily.
	(gtk_file_chooser_default_should_respond): If we are in
	SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
	selected.

diff --git a/ChangeLog b/ChangeLog
index de120ef2f7292408837ae59b1800bc65451abe2f..846342f8271651ebb64ad40059f0480a8537199d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-29  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
+       Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions.  This
+       lets us navigate thei file system more easily.
+       (gtk_file_chooser_default_should_respond): If we are in
+       SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
+       selected.
+
 Mon Nov 29 17:51:51 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index de120ef2f7292408837ae59b1800bc65451abe2f..846342f8271651ebb64ad40059f0480a8537199d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2004-11-29  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
+       Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions.  This
+       lets us navigate thei file system more easily.
+       (gtk_file_chooser_default_should_respond): If we are in
+       SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
+       selected.
+
 Mon Nov 29 17:51:51 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index de120ef2f7292408837ae59b1800bc65451abe2f..846342f8271651ebb64ad40059f0480a8537199d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2004-11-29  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
+       Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions.  This
+       lets us navigate thei file system more easily.
+       (gtk_file_chooser_default_should_respond): If we are in
+       SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
+       selected.
+
 Mon Nov 29 17:51:51 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index de120ef2f7292408837ae59b1800bc65451abe2f..846342f8271651ebb64ad40059f0480a8537199d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2004-11-29  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-4:
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
+       Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions.  This
+       lets us navigate thei file system more easily.
+       (gtk_file_chooser_default_should_respond): If we are in
+       SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
+       selected.
+
 Mon Nov 29 17:51:51 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index a1317483565e423fa3ed81821efa41581e70936a..60c827b1e23fd881ceb79054ad19efaac4444398 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2867,10 +2867,12 @@ trap_activate_cb (GtkWidget   *widget,
       return TRUE;
     }
 
-  if (event->keyval == GDK_Return
-      || event->keyval == GDK_ISO_Enter
-      || event->keyval == GDK_KP_Enter
-      || event->keyval == GDK_space)
+  if ((event->keyval == GDK_Return
+       || event->keyval == GDK_ISO_Enter
+       || event->keyval == GDK_KP_Enter
+       || event->keyval == GDK_space)
+      && !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+          impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
     {
       GtkWindow *window;
 
@@ -5036,17 +5038,13 @@ 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)
+      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+         || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
        {
-         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)
+           return TRUE;
        }
+
       if (num_selected == 0)
        {
          if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE