aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-embed-utils.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-09-20 19:28:53 +0800
committerChristian Persch <chpe@src.gnome.org>2003-09-20 19:28:53 +0800
commit7b653b5dce039fe86e9646e0d85aa647f3cf1dc0 (patch)
tree4ebb0c5d4b733eb37a23764bd448596b7132e086 /embed/ephy-embed-utils.c
parent299aea88b01667397396ad664fa6e9dfe2c4a4bb (diff)
downloadgsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar.gz
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar.bz2
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar.lz
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar.xz
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.tar.zst
gsoc2013-epiphany-7b653b5dce039fe86e9646e0d85aa647f3cf1dc0.zip
Fix directory selection persistence [bug #122780].
2003-09-20 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed-utils.c: (ephy_embed_utils_save): * embed/mozilla/mozilla-embed-single.cpp: * src/window-commands.c: (window_cmd_file_open): Fix directory selection persistence [bug #122780].
Diffstat (limited to 'embed/ephy-embed-utils.c')
-rw-r--r--embed/ephy-embed-utils.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
index bddab9191..21b51281f 100644
--- a/embed/ephy-embed-utils.c
+++ b/embed/ephy-embed-utils.c
@@ -59,7 +59,6 @@ ephy_embed_utils_save (GtkWidget *window,
char *retPath = NULL;
char *fileName = NULL;
char *dirName = NULL;
- char *retDir;
char *target;
const char *source;
gresult ret;
@@ -134,18 +133,28 @@ ephy_embed_utils_save (GtkWidget *window,
if (ask_dest)
{
+ char *ret_dir;
+
/* show the file picker */
ret = ephy_embed_single_show_file_picker
(single, window, title,
dirName, fileName, modeSave, &retPath,
NULL, NULL);
- }
-
-
- uri = gnome_vfs_uri_new (retPath);
- g_return_if_fail (uri != NULL);
- retDir = gnome_vfs_uri_extract_dirname (uri);
+ if (g_file_test (retPath, G_FILE_TEST_IS_DIR))
+ {
+ ret_dir = g_strdup (retPath);
+ }
+ else
+ {
+ ret_dir = g_path_get_dirname (retPath);
+ }
+
+ /* set default save dir */
+ eel_gconf_set_string (default_dir_pref, ret_dir);
+ g_free (ret_dir);
+
+ }
if (ret == G_OK)
{
@@ -171,12 +180,6 @@ ephy_embed_utils_save (GtkWidget *window,
}
- /* set default save dir */
- eel_gconf_set_string (default_dir_pref,
- retDir);
-
- g_free (retDir);
- gnome_vfs_uri_unref (uri);
g_free (retPath);
g_object_unref (G_OBJECT(persist));