aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:35:57 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:35:57 +0000
commit0183b727d097b2005a56f0178065e923364c150b (patch)
tree6f9d3b0ae18b7f406a6cd2695dcbc7557fc1151f
parent3456c9dff21f5fa60e9d33338dec4b61190552d7 (diff)
downloadenlightenment-0183b727d097b2005a56f0178065e923364c150b.tar.gz
enlightenment-0183b727d097b2005a56f0178065e923364c150b.tar.xz
enlightenment-0183b727d097b2005a56f0178065e923364c150b.zip
fix path setting in import dialog
SVN revision: 83151
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_import_dialog.c6
3 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 146e8ef6b..e2f798bdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
* fixed small leak in e_import_config_dialog_show during failure case
* fixed small leak in e_import_dialog_show during failure case
* fixed small leak in illume2 policy config
+ * fixed path setting in import dialog
2013-01-22 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index cb77a525a..5f4107e8e 100644
--- a/NEWS
+++ b/NEWS
@@ -116,3 +116,4 @@ Fixes:
* fixed small leak in e_import_config_dialog_show during failure case
* fixed small leak in e_import_dialog_show during failure case
* fixed small leak in illume2 policy config
+ * fixed path setting in import dialog
diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c
index ac2255145..9b29932b2 100644
--- a/src/bin/e_import_dialog.c
+++ b/src/bin/e_import_dialog.c
@@ -165,15 +165,13 @@ e_import_dialog_show(E_Container *con, const char *dev, const char *path, Ecore_
fpath = path ? : e_config->wallpaper_import_last_path;
if (fdev)
snprintf(buf, sizeof(buf), "%s/%s",
- fdev, path);
+ fdev, fpath);
else
- snprintf(buf, sizeof(buf), "%s", path);
+ snprintf(buf, sizeof(buf), "%s", fpath);
rpath = ecore_file_realpath(buf);
if (!ecore_file_exists(rpath))
fpath = "/";
- else
- fpath = path ? : e_config->wallpaper_import_last_path;
free(rpath);
if ((!fdev) && (!fpath))