Enlightenment CVS committal Author : chaos Project : e17 Module : proto
Dir : e17/proto/entropy/src Modified Files: entropy_core.c entropy_gui_event_handlers.c Log Message: * REMOVE_FILE -> event handler =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/entropy_core.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- entropy_core.c 31 Mar 2006 12:12:26 -0000 1.65 +++ entropy_core.c 31 Mar 2006 13:45:59 -0000 1.66 @@ -257,6 +257,7 @@ /*Register GUI event handlers*/ entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_FILE_CREATE, entropy_event_handler_file_create_handler); + entropy_core_gui_event_handler_add(ENTROPY_GUI_EVENT_FILE_REMOVE, entropy_event_handler_file_remove_handler); @@ -958,7 +959,7 @@ entropy_free(event); return; } else { - printf(" *** No registered handlers for this event\n"); + printf(" *** No registered handlers for this event (%s)\n", event->event_type); } @@ -1029,23 +1030,6 @@ } entropy_notify_event_destroy(ev); - - } else if (!strcmp(event->event_type,ENTROPY_GUI_EVENT_FILE_REMOVE)) { - entropy_notify_event* ev = entropy_notify_event_new(); - ev->event_type = ENTROPY_NOTIFY_FILE_REMOVE; - ev->processed = 1; - - //printf("Sending a file create event...\n"); - - ecore_list_goto_first(el); - while ( (iter = ecore_list_next(el)) ) { - if (iter->active) (*iter->plugin->gui_event_callback_p) - (ev, - iter, - event->data, /*An entropy_generic_file*/ - iter); - } - entropy_notify_event_destroy(ev); } else if (!strcmp(event->event_type,ENTROPY_GUI_EVENT_FILE_REMOVE_DIRECTORY)) { entropy_notify_event* ev = entropy_notify_event_new(); =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/entropy_gui_event_handlers.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entropy_gui_event_handlers.c 31 Mar 2006 12:12:26 -0000 1.1 +++ entropy_gui_event_handlers.c 31 Mar 2006 13:45:59 -0000 1.2 @@ -27,11 +27,11 @@ Entropy_Gui_Event_Handler* entropy_event_handler_file_create_handler() { return entropy_gui_event_handler_new( - entropy_event_handler_file_create_notify_event, + entropy_event_handler_file_create_instance_data, entropy_event_handler_instance_data_generic_cleanup); } -Entropy_Gui_Event_Handler_Instance_Data* entropy_event_handler_file_create_notify_event(entropy_gui_event* event, +Entropy_Gui_Event_Handler_Instance_Data* entropy_event_handler_file_create_instance_data(entropy_gui_event* event, entropy_gui_component_instance* requestor) { Entropy_Gui_Event_Handler_Instance_Data* data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data)); @@ -44,6 +44,30 @@ return data; } +/*----------------------*/ -/*----------------------*/ +/*File remove*/ +Entropy_Gui_Event_Handler* entropy_event_handler_file_remove_handler() +{ + return entropy_gui_event_handler_new( + entropy_event_handler_file_remove_instance_data, + entropy_event_handler_instance_data_generic_cleanup); + +} + +Entropy_Gui_Event_Handler_Instance_Data* entropy_event_handler_file_remove_instance_data(entropy_gui_event* event, + entropy_gui_component_instance* requestor) +{ + + Entropy_Gui_Event_Handler_Instance_Data* data = entropy_malloc(sizeof(Entropy_Gui_Event_Handler_Instance_Data)); + entropy_notify_event* ev = entropy_notify_event_new(); + ev->event_type = ENTROPY_NOTIFY_FILE_REMOVE; + ev->processed = 1; + ev->data = event->data; + + data->notify = ev; + + return data; +} +/*---------------------------*/ ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs