bgo538784 - Don't change the filename entry in CREATE_FOLDER mode

2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>

	http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change
	the filename in the name entry in CREATE_FOLDER mode when changing
	folders, so that you can enter a new subfolder name, double-click on a
	folder to change to it, and close the dialog.

	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
	the filename in the entry in CREATE_FOLDER mode, either.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
svn path=/trunk/; revision=20457

diff --git a/ChangeLog b/ChangeLog
index 849a4e7d531d330f1f97c556a721714f6594fa9e..e71de94423cd531c76b253a7529c347db98abe84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>
+
+       http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change
+       the filename in the name entry in CREATE_FOLDER mode when changing
+       folders, so that you can enter a new subfolder name, double-click on a
+       folder to change to it, and close the dialog.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the filename in the entry in CREATE_FOLDER mode, either.
+
 2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>
 
        http://bugzilla.gnome.org/show_bug.cgi?id=419737#c59 - The file

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b120a1ac7e9f83b221ff196f5279680e7382d2e9..f360bee4e11403018f993ee40f0a2e2e03812420 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6714,13 +6714,14 @@ update_chooser_entry (GtkFileChooserDefault *impl)
             g_strdup (g_file_info_get_display_name (info));
 
           if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-              impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+              impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
+             impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
            {
              /* We don't want the name to change when clicking on a folder... */
              change_entry = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);
            }
           else
-           change_entry = TRUE;                                /* ... unless we are in one of the folder modes */
+           change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */
 
           if (change_entry)
             {