diff options
| author | James M. Cape <jcape@ignore-your.tv> | 2004-11-03 10:26:18 +0000 |
|---|---|---|
| committer | James M. Cape <jcape@src.gnome.org> | 2004-11-03 10:26:18 +0000 |
| commit | 3eb76c0940cbd8da8c56f035d1a967e84f4008fd (patch) | |
| tree | 7e7ebb7e37b403d15af931f53f3bf2111af111c5 /gtk/gtkfilechooserbutton.c | |
| parent | f493d74d0a7e57a6c0768f0173e46938c2aecafd (diff) | |
| download | gtk+-3eb76c0940cbd8da8c56f035d1a967e84f4008fd.tar.gz | |
Don't mysteriously go to the parent dir when hitting "Cancel" in folder
2004-11-03 James M. Cape <jcape@ignore-your.tv>
* gtk/gtkfilechooserbutton.c (update_dialog), (dialog_response_cb):
Don't mysteriously go to the parent dir when hitting "Cancel" in
folder mode (fixes #156971).
Diffstat (limited to 'gtk/gtkfilechooserbutton.c')
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index f2b59d299d..502b061529 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -1435,17 +1435,26 @@ update_dialog (GtkFileChooserButton *button) gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog)); if (folder_part) { - full_path = gtk_file_system_make_path (fs, folder_part, file_part, NULL); - /* Entry contents don't exist. */ - if (full_path) - _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog), - full_path, NULL); + if (file_part && file_part[0] != '\0') + { + full_path = gtk_file_system_make_path (fs, folder_part, file_part, + NULL); + if (full_path) + { + _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog), + full_path, NULL); + gtk_file_path_free (full_path); + } + else + _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog), + folder_part, NULL); + } else - _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog), - folder_part, NULL); - - gtk_file_path_free (full_path); + { + _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog), + folder_part, NULL); + } } break; @@ -1571,7 +1580,9 @@ dialog_response_cb (GtkFileChooser *dialog, } else { + g_signal_handler_block (priv->dialog, priv->dialog_selection_changed_id); update_dialog (user_data); + g_signal_handler_unblock (priv->dialog, priv->dialog_selection_changed_id); } gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button), FALSE); |