Enlightenment CVS committal Author : lordchaos Project : e17 Module : proto
Dir : e17/proto/entropy/src/plugins Modified Files: etk_list_viewer.c ewl_icon_local_viewer.c filesystem.c Log Message: * More interaction dialog work - now includes string reference (e.g. filename to overwrite) =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_list_viewer.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- etk_list_viewer.c 2 Mar 2006 02:44:19 -0000 1.33 +++ etk_list_viewer.c 2 Mar 2006 06:10:55 -0000 1.34 @@ -659,7 +659,7 @@ break; case ENTROPY_NOTIFY_USER_INTERACTION_YES_NO_ABORT: { - entropy_etk_user_interaction_dialog_new((long)el); + entropy_etk_user_interaction_dialog_new((entropy_file_operation*)el); } break; =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- ewl_icon_local_viewer.c 2 Mar 2006 00:57:11 -0000 1.60 +++ ewl_icon_local_viewer.c 2 Mar 2006 06:10:55 -0000 1.61 @@ -1110,7 +1110,7 @@ case ENTROPY_NOTIFY_USER_INTERACTION_YES_NO_ABORT: { printf("Yes/No/Abort to file copy?\n"); - entropy_ewl_user_interaction_dialog_new((long)ret); + entropy_ewl_user_interaction_dialog_new((entropy_file_operation*)ret); } break; =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- filesystem.c 27 Feb 2006 12:14:15 -0000 1.48 +++ filesystem.c 2 Mar 2006 06:10:55 -0000 1.49 @@ -403,6 +403,7 @@ char *uri = NULL; entropy_gui_component_instance* instance; entropy_gui_event* gui_event; + entropy_file_operation* op; printf("EVFS requested feedback on an operation!\n"); @@ -417,13 +418,20 @@ gui_event = entropy_malloc (sizeof (entropy_gui_event)); gui_event->event_type = entropy_core_gui_event_get (ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT); - gui_event->data = (long*)data->op->id; + + op = entropy_malloc(sizeof(entropy_file_operation)); + op->file = data->op->misc_str; + op->id = data->op->id; + gui_event->data = op; entropy_core_layout_notify_event (instance, gui_event, ENTROPY_EVENT_LOCAL); - printf("Requesting send of operation stat to instance %p, evfs operation ID %ld\n", instance, data->op->id); + printf("Requesting send of operation stat to instance %p, evfs operation ID %ld\n", instance, op->id); + + + free(op); } else { printf ("Could not get file copy caller for '%s'\n", uri); ------------------------------------------------------- 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