Enlightenment CVS committal Author : chaos Project : e17 Module : proto
Dir : e17/proto/entropy/src/plugins Modified Files: etk_list_viewer.c ewl_icon_local_viewer.c ewl_list_viewer.c Log Message: * More gui_event migration. * Bug fixes to EWL layout =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- etk_list_viewer.c 28 Mar 2006 16:52:52 -0000 1.49 +++ etk_list_viewer.c 1 Apr 2006 02:36:36 -0000 1.50 @@ -724,7 +724,7 @@ case ENTROPY_NOTIFY_FILE_STAT_AVAILABLE:{ - entropy_file_stat *file_stat = (entropy_file_stat *) el; + entropy_file_stat *file_stat = (entropy_file_stat *) eevent->return_struct; gui_file* obj = ecore_hash_get (viewer->gui_hash, file_stat->file); char buffer[50]; char date_buffer[26]; =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- ewl_icon_local_viewer.c 28 Mar 2006 10:31:15 -0000 1.63 +++ ewl_icon_local_viewer.c 1 Apr 2006 02:36:37 -0000 1.64 @@ -269,6 +269,7 @@ //Stat test.. /*Send an event to the core */ if (local_file) { + entropy_core_file_cache_add_reference(local_file->file->md5); gui_event = entropy_malloc (sizeof (entropy_gui_event)); gui_event->event_type = @@ -413,7 +414,6 @@ (*del_func) (file); - entropy_core_file_cache_remove_reference (file->md5); } } @@ -776,6 +776,8 @@ gui_file *gui_object; if ((gui_object = ecore_hash_get (view->gui_hash, list_item))) { + entropy_core_file_cache_remove_reference(list_item->md5); + ewl_iconbox_icon_remove (EWL_ICONBOX (view->iconbox), EWL_ICONBOX_ICON (gui_object->icon)); } @@ -839,6 +841,8 @@ request->file = list_item; request->instance = comp; + entropy_core_file_cache_add_reference(request->file->md5); + entropy_notify_event *ev = entropy_notify_request_register (comp->core->notify, comp, ENTROPY_NOTIFY_THUMBNAIL_REQUEST, @@ -889,8 +893,13 @@ while (i < ICON_ADD_COUNT && (file = ecore_list_remove_first (el))) { - //printf("Adding '%s'\n", file->filename); + printf("Adding '%s' (%p)\n", file->filename,file); + ewl_icon_local_viewer_add_icon (proc->requestor, file, DONT_DO_MIME); + + /*Remove the pre-idle-add ref*/ + //entropy_core_file_cache_remove_reference (file->md5); + ecore_list_append (added_list, file); i++; @@ -1010,6 +1019,7 @@ ecore_list_goto_first (ret); while ((event_file = ecore_list_next (ret))) { //printf("Populating with '%s'\n", event_file->filename); + entropy_core_file_cache_add_reference (event_file->md5); ecore_list_append (proc->user_data, event_file); } @@ -1112,7 +1122,7 @@ case ENTROPY_NOTIFY_FILE_STAT_AVAILABLE:{ - entropy_file_stat *file_stat = (entropy_file_stat *) ret; + entropy_file_stat *file_stat = (entropy_file_stat *) eevent->return_struct; if (file_stat->file == NULL) { printf ("***** File stat file is null\n"); } =================================================================== RCS file: /cvs/e/e17/proto/entropy/src/plugins/ewl_list_viewer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_list_viewer.c 28 Mar 2006 10:31:15 -0000 1.12 +++ ewl_list_viewer.c 1 Apr 2006 02:36:37 -0000 1.13 @@ -920,7 +920,7 @@ case ENTROPY_NOTIFY_FILE_STAT_AVAILABLE:{ - entropy_file_stat *file_stat = (entropy_file_stat *) ret; + entropy_file_stat *file_stat = (entropy_file_stat *) eevent->return_struct; if (file_stat->file == NULL) { printf ("***** File stat file is null\n"); } ------------------------------------------------------- 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