AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

bgo419737 - Don't clear filename entry in SAVE/CREATE_FOLDER modes

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

	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>

svn path=/trunk/; revision=20455
This commit is contained in:
Olle Bergkvist 2008-06-18 22:23:39 +00:00 committed by Federico Mena Quintero
parent d217ec4f90
commit 666b544ddd
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-06-18 Olle Bergkvist <olle.bergkvist@yahoo.se>
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.
2008-06-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilesystem.c (_gtk_file_system_volume_render_icon):

7
gtk/gtkfilechooserdefault.c
View File

@ -6749,7 +6749,8 @@ update_chooser_entry (GtkFileChooserDefault *impl)
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;
@ -10224,7 +10225,9 @@ shortcuts_activate_iter (GtkFileChooserDefault *impl,
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,