Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c filesystem.c remote_thumbnailer.c
Log Message:
* API rationalization
* Misc. catches
* Delete event now supports progress bar
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- etk_list_viewer.c 13 Mar 2006 00:40:23 -0000 1.43
+++ etk_list_viewer.c 14 Mar 2006 13:05:43 -0000 1.44
@@ -244,7 +244,7 @@
if (file) {
printf("Deleting '%s'...\n", file->file->filename);
- entropy_plugin_filesystem_file_remove(file->file);
+ entropy_plugin_filesystem_file_remove(file->file,
(entropy_gui_component_instance*)data);
}
}
@@ -901,7 +901,7 @@
ETK_CALLBACK(_etk_list_viewer_row_clicked), NULL);
etk_signal_connect("key_down", ETK_OBJECT(viewer->tree),
- ETK_CALLBACK(_etk_entropy_list_viewer_key_down_cb), NULL);
+ ETK_CALLBACK(_etk_entropy_list_viewer_key_down_cb), instance);
printf("Initialising ETK list viewer...%p\n", instance);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- filesystem.c 11 Mar 2006 09:18:51 -0000 1.55
+++ filesystem.c 14 Mar 2006 13:05:43 -0000 1.56
@@ -338,9 +338,14 @@
char *uri = NULL;
ecore_list_goto_first(data->file_list.list);
- request->file_from =
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
- ecore_list_next(data->file_list.list);
- request->file_to =
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
+ if (ecore_list_current(data->file_list.list)) {
+ request->file_from =
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
+ ecore_list_next(data->file_list.list);
+
+ if (ecore_list_current(data->file_list.list)) {
+ request->file_to =
evfs_filereference_to_entropy_generic_file(ecore_list_current(data->file_list.list));
+ }
+ }
request->progress = data->progress->file_progress;
if (data->progress->type == EVFS_PROGRESS_TYPE_CONTINUE)
@@ -374,8 +379,8 @@
}
free (uri);
- entropy_generic_file_destroy (request->file_from);
- entropy_generic_file_destroy (request->file_to);
+ if (request->file_from) entropy_generic_file_destroy
(request->file_from);
+ if (request->file_to) entropy_generic_file_destroy (request->file_to);
free (request);
}
break;
@@ -805,16 +810,19 @@
* Remove file function
*/
void
-entropy_filesystem_file_remove (entropy_generic_file * file)
+entropy_filesystem_file_remove (entropy_generic_file * file,
entropy_gui_component_instance* instance)
{
evfs_file_uri_path *uri_path_from;
-
+ char* original;
char *uri = entropy_core_generic_file_uri_create (file, 0);
//printf("Deleting uri '%s'\n", uri);
uri_path_from = evfs_parse_uri (uri);
+ original = evfs_filereference_to_string (uri_path_from->files[0]);
evfs_client_file_remove (con, uri_path_from->files[0]);
+ ecore_hash_set (file_copy_hash, original, instance);
+
free (uri);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/remote_thumbnailer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- remote_thumbnailer.c 1 Mar 2006 23:50:03 -0000 1.9
+++ remote_thumbnailer.c 14 Mar 2006 13:05:43 -0000 1.10
@@ -177,7 +177,7 @@
entropy_core_file_cache_remove_reference (listener->file->md5);
/*Remove the d/led image */
- entropy_plugin_filesystem_file_remove (tmp_file);
+ entropy_plugin_filesystem_file_remove (tmp_file, comp);
}
else {
printf ("Remote thumbnailer: Couldn't make thumbnail\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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
