Enlightenment CVS committal

Author  : chaos
Project : e17
Module  : apps/evfs

Dir     : e17/apps/evfs/src/common


Modified Files:
        evfs_cleanup.c evfs_io.c evfs_vfolder.c 


Log Message:
More vfolder search work

===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_cleanup.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- evfs_cleanup.c      24 Aug 2007 00:49:46 -0000      1.35
+++ evfs_cleanup.c      24 Aug 2007 06:06:20 -0000      1.36
@@ -9,6 +9,9 @@
      default:
         evfs_cleanup_file_command(command);
         break;
+     case EVFS_CMD_VFOLDER_CREATE:
+       evfs_cleanup_vfolder_create(command);
+       break;
      }
 
    if (free_command == EVFS_CLEANUP_FREE_COMMAND)
@@ -37,6 +40,24 @@
           }
           evas_list_free(command->file_command->files); 
    }
+}
+
+void 
+evfs_cleanup_vfolder_create(evfs_command* command)
+{
+       Evas_List* l;
+       EvfsVfolderEntry *e;
+       if (command->entries) {
+               for (l=command->entries; l; ) {
+                       e = l->data;
+                       l=l->next;
+
+                       IF_FREE(e->name);
+                       IF_FREE(e->value);
+                       free(e);
+               }
+               evas_list_free(command->entries);
+       }
 }
 
 void
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- evfs_io.c   22 Aug 2007 10:23:16 -0000      1.84
+++ evfs_io.c   24 Aug 2007 06:06:20 -0000      1.85
@@ -30,6 +30,7 @@
 static Eet_Data_Descriptor *_EvfsEventFileMonitor_edd;
 static Eet_Data_Descriptor *_EvfsStat_edd;
 static Eet_Data_Descriptor *_EvfsEventMime_edd;
+static Eet_Data_Descriptor *_EvfsVfolderEntry_edd;
 
 #define _NEW_EDD(type) eet_data_descriptor_new(#type, sizeof(type), \
                               (void *(*)(void *))evas_list_next, \
@@ -156,6 +157,18 @@
                                  "substatus", substatus, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_EvfsOperation_edd, evfs_operation,
                                  "response", response, EET_T_INT);
+
+    /*EvfsVfolderEntry_edd*/
+    _EvfsVfolderEntry_edd = _NEW_EDD(EvfsVfolderEntry);
+    EET_DATA_DESCRIPTOR_ADD_BASIC(_EvfsVfolderEntry_edd, EvfsVfolderEntry, 
"type", type,
+                               EET_T_CHAR);
+    EET_DATA_DESCRIPTOR_ADD_BASIC(_EvfsVfolderEntry_edd, EvfsVfolderEntry, 
"name", name,
+                                   EET_T_STRING);
+    EET_DATA_DESCRIPTOR_ADD_BASIC(_EvfsVfolderEntry_edd, EvfsVfolderEntry, 
"value", value,
+                                   EET_T_STRING);
+
+                                  
+
 
    /*Command edd*/
    _EvfsCommandFile_edd = _NEW_EDD(evfs_command_file);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_vfolder.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evfs_vfolder.c      16 Aug 2007 11:31:16 -0000      1.4
+++ evfs_vfolder.c      24 Aug 2007 06:06:21 -0000      1.5
@@ -10,45 +10,10 @@
       return;
    evfs_vfolder_init = 1;
 
-   _evfs_vfolder_edd =
-      eet_data_descriptor_new("evfs_vfolder", sizeof(EvfsFilereference),
-                              (void *(*)(void *))evas_list_next,
-                              (void *(*)(void *, void *))evas_list_append,
-                              (void *(*)(void *))evas_list_data,
-                              (void *(*)(void *))evas_list_free,
-                              (void (*)
-                               (void *,
-                                int (*)(void *, const char *, void *, void *),
-                                void *))evas_hash_foreach, (void *(*)(void *,
-                                                                      const 
char
-                                                                      *,
-                                                                      void *))
-                              evas_hash_add, (void (*)(void *))evas_hash_free);
-
-   EET_DATA_DESCRIPTOR_ADD_LIST(_evfs_vfolder_edd, evfs_vfolder, "bases", 
bases,
-                                evfs_io_filereference_edd_get());
 }
 
 evfs_vfolder *
 evfs_vfolder_new()
 {
    return NEW(evfs_vfolder);
-}
-
-evfs_vfolder *
-evfs_vfolder_base_add(evfs_vfolder * folder, EvfsFilereference * file)
-{
-   evfs_vfolder *ret_folder = NULL;
-
-   if (!folder)
-     {
-        /*No current folder, we need a new one */
-        ret_folder = evfs_vfolder_new();
-     }
-   else
-     {
-        ret_folder = folder;
-     }
-
-   return ret_folder;
 }



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to