summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Andreoli <dave@gurumeditation.it>2012-05-13 13:24:27 +0000
committerDaniel Willmann <d.willmann@samsung.com>2013-02-15 14:26:39 +0000
commit9d2489e37057d2cd64f14d408a526fa05916a4b7 (patch)
tree1722105028a251a4fde79f9df2914a4a868c583e
parente702c422dcea3ab5e25288d732bd905971a879a8 (diff)
downloadelementary-9d2489e37057d2cd64f14d408a526fa05916a4b7.tar.gz
* backport 70965 ...and 70966 :P
SVN revision: 70967
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog3
-rw-r--r--src/lib/elc_fileselector.c6
3 files changed, 10 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index c2388428e..2ecde9b79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -55,3 +55,5 @@ Mikael Sans <sans.mikael@gmail.com>
Doyoun Kang <doyoun.kang@samsung.com>
M.V.K. Sumanth <sumanth.m@samsung.com> <mvksumanth@gmail.com>
Jérôme Pinot <ngc891@gmail.com>
+Davide Andreoli (davemds) <dave@gurumeditation.it>
+
diff --git a/ChangeLog b/ChangeLog
index 0157b4f3a..febc71c9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,3 +30,6 @@
2012-05-03 Shilpa Onkar Singh
* naviframe: Bug Fix: Wrong signal sent when title/subtitle is set in
naviframe.
+
+2012-05-13 Dave Andreoli
+ * Fileselector: honor folder_only when using EIO (backport 70965)
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 148c73d60..d6a4fabb1 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -560,13 +560,17 @@ _do_anchors(Evas_Object *obj,
#ifdef HAVE_EIO
static Eina_Bool
-_filter_cb(void *data __UNUSED__, Eio_File *handler, const Eina_File_Direct_Info *info)
+_filter_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info)
{
+ Listing_Request *lreq = data;
const char *filename;
if (info->path[info->name_start] == '.')
return EINA_FALSE;
+ if (lreq->sd->only_folder && info->type != EINA_FILE_DIR)
+ return EINA_FALSE;
+
filename = eina_stringshare_add(info->path);
eio_file_associate_direct_add(handler, "filename", filename, EINA_FREE_CB(eina_stringshare_del));