From 9035d1f8c0b03760611bbaf3c6b70f6b352f3ba6 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Wed, 22 Jun 2011 16:09:14 +0000
Subject: [PATCH] eio: fix api change.

SVN revision: 60600
---
 legacy/eio/src/lib/eio_dir.c     | 16 ++++++++++++----
 legacy/eio/src/lib/eio_monitor.c | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/legacy/eio/src/lib/eio_dir.c b/legacy/eio/src/lib/eio_dir.c
index e61e70ca93..ddeb007cb2 100644
--- a/legacy/eio/src/lib/eio_dir.c
+++ b/legacy/eio/src/lib/eio_dir.c
@@ -836,12 +836,12 @@ _eio_dir_stat_find_forward(Eio_File_Direct_Ls *async,
 
    if (filter)
      {
-        Eina_File_Direct_Info *send;
+        Eio_File_Direct_Info *send;
 
         send = eio_direct_info_malloc();
         if (!send) return EINA_FALSE;
 
-        memcpy(send, info, sizeof (Eina_File_Direct_Info));
+        memcpy(&send->info, info, sizeof (Eina_File_Direct_Info));
 
         ecore_thread_feedback(handler->thread, send);
      }
@@ -865,9 +865,17 @@ static void
 _eio_dir_stat_find_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
 {
    Eio_File_Direct_Ls *async = data;
-   Eina_File_Direct_Info *info = msg_data;
+   Eio_File_Direct_Info *info = msg_data;
 
-   async->main_cb((void*) async->ls.common.data, &async->ls.common, info);
+   async->ls.common.main.associated = info->associated;
+
+   async->main_cb((void*) async->ls.common.data, &async->ls.common, &info->info);
+
+   if (async->ls.common.main.associated)
+     {
+        eina_hash_free(async->ls.common.main.associated);
+        async->ls.common.main.associated = NULL;
+     }
 
    eio_direct_info_free(info);
 }
diff --git a/legacy/eio/src/lib/eio_monitor.c b/legacy/eio/src/lib/eio_monitor.c
index 3b486f8889..03ba3dd27a 100644
--- a/legacy/eio/src/lib/eio_monitor.c
+++ b/legacy/eio/src/lib/eio_monitor.c
@@ -59,7 +59,8 @@ _eio_monitor_error_cleanup_cb(void *user_data, __UNUSED__ void *func_data)
 {
    Eio_Monitor_Error *ev = user_data;
 
-   EINA_REFCOUNT_UNREF(ev->monitor, _eio_monitor_free);
+   EINA_REFCOUNT_UNREF(ev->monitor)
+     _eio_monitor_free(ev->monitor);
    free(ev);
 }
 
@@ -68,7 +69,8 @@ _eio_monitor_event_cleanup_cb(void *user_data, __UNUSED__ void *func_data)
 {
    Eio_Monitor_Event *ev = user_data;
 
-   EINA_REFCOUNT_UNREF(ev->monitor, _eio_monitor_free);
+   EINA_REFCOUNT_UNREF(ev->monitor)
+     _eio_monitor_free(ev->monitor);
    eina_stringshare_del(ev->filename);
    free(ev);
 }
@@ -83,7 +85,8 @@ _eio_monitor_stat_cb(void *data, __UNUSED__ Eio_File *handler, __UNUSED__ const
    if (EINA_REFCOUNT_GET(monitor) > 1)
      eio_monitor_backend_add(monitor);
 
-   EINA_REFCOUNT_UNREF(monitor, _eio_monitor_free);
+   EINA_REFCOUNT_UNREF(monitor)
+     _eio_monitor_free(monitor);
 }
 
 static void
@@ -112,7 +115,8 @@ _eio_monitor_error_cb(void *data, Eio_File *handler, int error)
    if (EINA_REFCOUNT_GET(monitor) > 1)
      _eio_monitor_error(monitor, error);
 
-   EINA_REFCOUNT_UNREF(monitor, _eio_monitor_free);
+   EINA_REFCOUNT_UNREF(monitor)
+     _eio_monitor_free(monitor);
 
    return ;
 }
@@ -205,7 +209,8 @@ eio_monitor_stringshared_add(const char *path)
 EAPI void
 eio_monitor_del(Eio_Monitor *monitor)
 {
-   EINA_REFCOUNT_UNREF(monitor, _eio_monitor_free);
+   EINA_REFCOUNT_UNREF(monitor)
+     _eio_monitor_free(monitor);
 }
 
 EAPI const char *