gtk+ r20456 - in branches/gtk-2-12: . gtk

[federico svn gnome org]

Author: federico
Date: Wed Jun 18 22:27:29 2008
New Revision: 20456
URL: http://svn.gnome.org/viewvc/gtk+?rev=20456&view=rev

Log:
bgo419737 - Don't clear filename entry in SAVE/CREATE_FOLDER modes
2008-06-18  Olle Bergkvist <olle bergkvist yahoo se>

	    Merged from trunk:

	    http://bugzilla.gnome.org/show_bug.cgi?id=419737#c59 - The file
	    chooser clears the filename entry in SAVE/CREATE_FOLDER modes when
	    it shouldn't.

	    * gtk/gtkfilechooserdefault.c (shortcuts_activate_iter): Don't
	    clear the entry for CREATE_FOLDER either; this needs the same
	    behavior as SAVE mode.
	    (update_chooser_entry): Only clear the entry in OPEN/SELECT_FOLDER
	    modes.

Signed-off-by: Federico Mena Quintero <federico novell com>


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkfilechooserdefault.c

Modified: branches/gtk-2-12/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-12/gtk/gtkfilechooserdefault.c	Wed Jun 18 22:27:29 2008
@@ -6895,7 +6895,8 @@
 
  maybe_clear_entry:
 
-  if (impl->browse_files_last_selected_name)
+  if ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+      && impl->browse_files_last_selected_name)
     {
       const char *entry_text;
       int len;
@@ -10415,7 +10416,9 @@
   gpointer col_data;
   ShortcutType shortcut_type;
 
-  if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY && impl->action != GTK_FILE_CHOOSER_ACTION_SAVE)
+  if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY
+      && !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
     _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
 
   gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), iter,