E SVN: cedric trunk/eio/src/lib

[Enlightenment S. <no-...@en...>]

Log:
eio: fix api change.
  

Author:       cedric
Date:         2011-06-22 09:09:14 -0700 (Wed, 22 Jun 2011)
New Revision: 60600
Trac:         http://trac.enlightenment.org/e/changeset/60600

Modified:
  trunk/eio/src/lib/eio_dir.c trunk/eio/src/lib/eio_monitor.c 

Modified: trunk/eio/src/lib/eio_dir.c
===================================================================
--- trunk/eio/src/lib/eio_dir.c	2011-06-22 15:59:15 UTC (rev 60599)
+++ trunk/eio/src/lib/eio_dir.c	2011-06-22 16:09:14 UTC (rev 60600)
@@ -836,12 +836,12 @@
 
    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,10 +865,18 @@
 _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);
 }
 

Modified: trunk/eio/src/lib/eio_monitor.c
===================================================================
--- trunk/eio/src/lib/eio_monitor.c	2011-06-22 15:59:15 UTC (rev 60599)
+++ trunk/eio/src/lib/eio_monitor.c	2011-06-22 16:09:14 UTC (rev 60600)
@@ -59,7 +59,8 @@
 {
    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 *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 @@
    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 @@
    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 @@
 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 *