From 0bd5c2029fe4b3c4d4268071afce36db2a77a080 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sun, 28 Sep 2003 09:50:20 +0000 Subject: The file picker dir can be NULL, check before trying to expand tilde. 2003-09-28 Marco Pesenti Gritti * 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 --- embed/mozilla/mozilla-embed-single.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'embed') 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 */ -- cgit v1.2.3