diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2004-04-07 17:52:03 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-04-07 17:52:03 +0000 |
| commit | d903e89ece448f92a133adfc918eca8de5a15f05 (patch) | |
| tree | b019f95f90507d768f7dcf7b44b574581ae5d566 /gtk/gtkfilesystem.c | |
| parent | ac5b1b3193dfff36ecc90f2e614166aabbbeda91 (diff) | |
| download | gdk-pixbuf-d903e89ece448f92a133adfc918eca8de5a15f05.tar.gz | |
Fix #132500.
2004-04-07 Federico Mena Quintero <federico@ximian.com>
Fix #132500.
* gtk/gtkfilesystem.c (gtk_file_system_parse): Ensure that the
passed-in 'str' is not NULL.
* gtk/gtkfilesystemunix.c (expand_tilde): New helper function;
expands "~/" or "~foo/" at the beginning of a filename.
(gtk_file_system_unix_parse): Use expand_tilde() before doing
anything else.
* gtk/gtkfilechooserentry.c
(gtk_file_chooser_entry_maybe_update_directory): Take in a
force_reload argument.
(gtk_file_chooser_entry_changed): If gtk_file_system_parse()
returns an error, set the file_part_pos to -1.
(load_directory_callback): Only populate the model if the
file_part_pos is not -1.
Diffstat (limited to 'gtk/gtkfilesystem.c')
| -rw-r--r-- | gtk/gtkfilesystem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index af5f537e6..52a8b13a5 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -592,9 +592,9 @@ gtk_file_system_parse (GtkFileSystem *file_system, g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), FALSE); g_return_val_if_fail (base_path != NULL, FALSE); + g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - result = GTK_FILE_SYSTEM_GET_IFACE (file_system)->parse (file_system, base_path, str, &tmp_folder, &tmp_file_part, error); |