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 the way progress events work
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_cleanup.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evfs_cleanup.c 15 Dec 2005 07:09:35 -0000 1.9
+++ evfs_cleanup.c 20 Dec 2005 21:55:02 -0000 1.10
@@ -62,6 +62,13 @@
free(event->data.bytes);
}
+void evfs_cleanup_progress_event(evfs_event* event) {
+ free(event->progress->file_from);
+ free(event->progress->file_to);
+ free(event->progress);
+
+}
+
void evfs_cleanup_event(evfs_event* event) {
evfs_cleanup_command(&event->resp_command,
EVFS_CLEANUP_PRESERVE_COMMAND);
@@ -75,6 +82,9 @@
case EVFS_EV_FILE_READ:
evfs_cleanup_file_read_event(event);
break;
+ case EVFS_EV_FILE_PROGRESS:
+ evfs_cleanup_progress_event(event);
+ break;
}
free(event);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_event_helper.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evfs_event_helper.c 6 Dec 2005 06:16:58 -0000 1.14
+++ evfs_event_helper.c 20 Dec 2005 21:55:02 -0000 1.15
@@ -61,15 +61,25 @@
}
-void evfs_file_progress_event_create(evfs_client* client, evfs_command*
command, double progress, evfs_progress_type type) {
+void evfs_file_progress_event_create(evfs_client* client, evfs_command*
event_command, evfs_command* root_command, double progress, evfs_progress_type
type) {
/*Create a reply event for a file mon event, send it , destroy event*/
evfs_event* event = NEW(evfs_event);
event->type = EVFS_EV_FILE_PROGRESS;
- event->progress.file_progress = progress;
- event->progress.type = type;
- evfs_write_event(client, command, event);
+ event->progress = NEW(evfs_event_progress);
+ 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);
+
+
+
+
+ evfs_write_event(client, root_command, event);
+
+ printf("%s : %s\n", event->progress->file_from,
event->progress->file_to);
/*Now destroy*/
evfs_cleanup_event(event);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- evfs_io.c 6 Dec 2005 06:16:58 -0000 1.33
+++ evfs_io.c 20 Dec 2005 21:55:02 -0000 1.34
@@ -42,6 +42,8 @@
(void (*) (void *))evas_hash_free);
EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_progress_event_edd,
evfs_event_progress, "progress", file_progress, EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_progress_event_edd,
evfs_event_progress, "file_from",file_from, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_progress_event_edd,
evfs_event_progress, "file_to",file_to, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_evfs_progress_event_edd,
evfs_event_progress, "type", type, EET_T_INT);
@@ -143,9 +145,9 @@
}
-void evfs_write_progress_event(evfs_client* client, evfs_event* event) {
+void evfs_write_progress_event(evfs_client* client, evfs_command* command,
evfs_event* event) {
int size_ret = 0;
- char* data = eet_data_descriptor_encode(_evfs_progress_event_edd,
&event->progress, &size_ret);
+ char* 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,
@@ -174,7 +176,7 @@
break;
case EVFS_EV_DIR_LIST: evfs_write_list_event(client,event);
break;
- case EVFS_EV_FILE_PROGRESS:
evfs_write_progress_event(client,event);
+ case EVFS_EV_FILE_PROGRESS:
evfs_write_progress_event(client,command, event);
break;
case EVFS_EV_FILE_OPEN: printf ("Open event send\n"); break;
/*File open has no additional info - fd is in filereference */
@@ -218,9 +220,9 @@
case EVFS_EV_PART_PROGRESS: {
evfs_event_progress* pg =
eet_data_descriptor_decode(_evfs_progress_event_edd, msg->data, msg->len);
- memcpy(&event->progress, pg,
sizeof(evfs_event_progress));
- free(pg);
+ event->progress = pg;
+ printf("%s:%s\n", pg->file_from, pg->file_to);
}
break;
-------------------------------------------------------
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://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
