E CVS: apps/evfs chaos

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : chaos
Project : e17
Module  : apps/evfs

Dir     : e17/apps/evfs/src/bin


Modified Files:
	evfs_main.c evfs_operation.c evfs_server_handle.c 


Log Message:

* Misc bugfixes
* Leak fix

===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- evfs_main.c	22 Apr 2006 03:09:18 -0000	1.44
+++ evfs_main.c	22 Apr 2006 06:50:25 -0000	1.45
@@ -392,18 +392,10 @@
 }
 
 int
-ecore_timer_enterer(__UNUSED__ void *data)
-{
-   evfs_operation_queue_run();
-	
-   return 1;
-}
-
-int
 incoming_command_cb(__UNUSED__ void *data)
 {
    int clean =0;
-	
+
    evfs_command_client *com_cli =
       ecore_list_remove_first(server->incoming_command_list);
 
@@ -418,6 +410,15 @@
 }
 
 int
+ecore_timer_enterer(__UNUSED__ void *data)
+{
+   incoming_command_cb(NULL);
+   evfs_operation_queue_run();
+	
+   return 1;
+}
+
+int
 main(int argc, char **argv)
 {
    /*Init the ipc server */
@@ -434,7 +435,7 @@
    server->clientCounter = 0;
    server->incoming_command_list = ecore_list_new();
 
-   ecore_idle_enterer_add(incoming_command_cb, NULL);
+   //ecore_idle_enterer_add(incoming_command_cb, NULL);
 
    /*Identify that we are a server*/
    evfs_object_server_is_set();
@@ -471,6 +472,7 @@
         ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, ipc_client_data,
                                 NULL);
      }
+
 
    ecore_main_loop_begin();
 
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_operation.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evfs_operation.c	9 Apr 2006 09:02:43 -0000	1.12
+++ evfs_operation.c	22 Apr 2006 06:50:25 -0000	1.13
@@ -385,7 +385,7 @@
 			ecore_list_next(op->sub_task);
 		}
 	   } else {
-		   printf("Operation is in user wait state!\n");
+		   //printf("Operation is in user wait state!\n");
 	   }
 	} else {
 		/*If task is null, operation is completed!*/
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- evfs_server_handle.c	21 Apr 2006 15:10:16 -0000	1.52
+++ evfs_server_handle.c	22 Apr 2006 06:50:25 -0000	1.53
@@ -420,6 +420,7 @@
    if (plugin && dst_plugin)
      {
 
+
         /*Check for supported options */
         if (!(EVFS_PLUGIN_FILE(plugin)->functions->evfs_file_lstat &&
               EVFS_PLUGIN_FILE(plugin)->functions->evfs_file_open &&
@@ -432,11 +433,16 @@
              return;
           }
 
+
+
         /*Get the source file size */
         (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_file_lstat) (command, &file_stat, 0);
+
         res =
            (*EVFS_PLUGIN_FILE(dst_plugin)->functions->evfs_file_lstat) (command, &dest_stat, 1);
 
+
+
         if (!S_ISDIR(file_stat.st_mode))
           {
 		  evfs_operation_copy_task_add(EVFS_OPERATION(op), 
@@ -498,6 +504,9 @@
 
           }
 
+   printf("4\n");
+
+	
         /*Only send '100%' event when we're back at the top, or we aren't recursive */
         if (command == root_command) {
            /*evfs_file_progress_event_create(client, command, root_command, 100,