diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-09-28 17:50:20 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-09-28 17:50:20 +0800 |
| commit | 0bd5c2029fe4b3c4d4268071afce36db2a77a080 (patch) | |
| tree | 3e2616d45f5cf8346f2a418d3efd5b7ec687829d /embed/mozilla | |
| parent | 6d4057eecb2f6cb916984d3c81403061b010214d (diff) | |
| download | gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar.gz gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar.bz2 gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar.lz gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar.xz gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.tar.zst gsoc2013-epiphany-0bd5c2029fe4b3c4d4268071afce36db2a77a080.zip | |
The file picker dir can be NULL, check before trying to expand tilde.
2003-09-28 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/mozilla-embed-single.cpp:
The file picker dir can be NULL, check before
trying to expand tilde.
* src/bookmarks/ephy-bookmarks-editor.c:
(import_dialog_response_cb), (cmd_bookmarks_import):
Implement import from a file
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 8bbfc43c1..7e90f4065 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -1013,12 +1013,15 @@ impl_show_file_picker (EphyEmbedSingle *shell, FileFormat *file_formats, int *ret_file_format) { - gchar *expanded_directory; + char *expanded_directory = NULL; gresult result; GFilePicker *filePicker = new GFilePicker (file_formats); - expanded_directory = gnome_vfs_expand_initial_tilde (directory); + if (directory != NULL) + { + expanded_directory = gnome_vfs_expand_initial_tilde (directory); + } /* make sure the directory exists, and use the home directory * otherwise */ |