Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/common
Modified Files:
evfs_cleanup.c evfs_event_helper.c evfs_io.c
Log Message:
* Change progress events to send a list of real file references
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_cleanup.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evfs_cleanup.c 31 Jan 2006 07:16:42 -0000 1.12
+++ evfs_cleanup.c 1 Feb 2006 05:00:43 -0000 1.13
@@ -75,7 +75,16 @@
free(event->progress->file_from);
free(event->progress->file_to);
free(event->progress);
+
+ evfs_filereference* file;
+ if (event->file_list.list) {
+ ecore_list_goto_first(event->file_list.list);
+ while ( (file =
ecore_list_remove_first(event->file_list.list))) {
+ evfs_cleanup_filereference(file);
+ }
+ ecore_list_destroy(event->file_list.list);
+ }
}
void evfs_cleanup_operation_event(evfs_event* event) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_event_helper.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evfs_event_helper.c 31 Jan 2006 07:16:42 -0000 1.18
+++ evfs_event_helper.c 1 Feb 2006 05:00:43 -0000 1.19
@@ -71,9 +71,10 @@
event->progress->file_progress = progress;
event->progress->type = type;
- event->progress->file_from =
strdup(event_command->file_command.files[0]->path);
- event->progress->file_to =
strdup(event_command->file_command.files[1]->path);
-
+ event->file_list.list = ecore_list_new();
+ ecore_list_append(event->file_list.list,
event_command->file_command.files[0]);
+ ecore_list_append(event->file_list.list,
event_command->file_command.files[1]);
+
evfs_write_event(client, root_command, event);
/*Now destroy*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- evfs_io.c 31 Jan 2006 07:16:42 -0000 1.41
+++ evfs_io.c 1 Feb 2006 05:00:43 -0000 1.42
@@ -62,6 +62,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_operation_edd, evfs_operation,
"id", id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_operation_edd, evfs_operation,
"status", status, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_operation_edd, evfs_operation,
"substatus", substatus, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_operation_edd, evfs_operation,
"response", response, EET_T_INT);
@@ -166,18 +167,42 @@
void evfs_write_progress_event(evfs_client* client, evfs_command* command,
evfs_event* event) {
int size_ret = 0;
+ evfs_filereference* ref;
+ char* data;
+
if (event->progress->type == EVFS_PROGRESS_TYPE_DONE) {
printf( "Sendign Done!\n");
}
- char* data = eet_data_descriptor_encode(_evfs_progress_event_edd,
event->progress, &size_ret);
+ data = eet_data_descriptor_encode(_evfs_progress_event_edd,
event->progress, &size_ret);
evfs_write_ecore_ipc_client_message(client->client,
ecore_ipc_message_new(EVFS_EV_REPLY,EVFS_EV_PART_PROGRESS,
client->id,0,0,data, size_ret ));
free(data);
+
+
+ /*Write "From" file*/
+ ref = ecore_list_remove_first(event->file_list.list);
+ data =eet_data_descriptor_encode(_evfs_filereference_edd, ref,
&size_ret);
+
+ evfs_write_ecore_ipc_client_message(client->client,
+ ecore_ipc_message_new(EVFS_EV_REPLY,EVFS_EV_PART_FILE_REFERENCE,
+ client->id,0,0,data, size_ret ));
+ free(data);
+
+ /*Write "to" file*/
+ ref = ecore_list_remove_first(event->file_list.list);
+ data =eet_data_descriptor_encode(_evfs_filereference_edd, ref,
&size_ret);
+
+ evfs_write_ecore_ipc_client_message(client->client,
+ ecore_ipc_message_new(EVFS_EV_REPLY,EVFS_EV_PART_FILE_REFERENCE,
+ client->id,0,0,data, size_ret ));
+ free(data);
+
+
}
void evfs_write_operation_event(evfs_client* client, evfs_event* event) {
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs