From 0183b727d097b2005a56f0178065e923364c150b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 23 Jan 2013 10:35:57 +0000 Subject: [PATCH] fix path setting in import dialog SVN revision: 83151 --- ChangeLog | 1 + NEWS | 1 + src/bin/e_import_dialog.c | 6 ++---- 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))