Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_icon_local_viewer.c filesystem.c layout_ewl_simple.c
remote_thumbnailer.c
Log Message:
* Further updates to match the new EVFS progress API
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- ewl_icon_local_viewer.c 31 Jan 2006 07:17:48 -0000 1.53
+++ ewl_icon_local_viewer.c 1 Feb 2006 08:06:02 -0000 1.54
@@ -1125,9 +1125,9 @@
if (view->progress->progress_window) {
ewl_text_text_set (EWL_TEXT (view->progress->file_from),
- progress->file_from);
+ progress->file_from->filename);
ewl_text_text_set (EWL_TEXT (view->progress->file_to),
- progress->file_to);
+ progress->file_to->filename);
ewl_progressbar_value_set (EWL_PROGRESSBAR
(view->progress->progressbar),
progress->progress);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- filesystem.c 1 Feb 2006 05:02:24 -0000 1.36
+++ filesystem.c 1 Feb 2006 08:06:02 -0000 1.37
@@ -347,9 +347,9 @@
// (char*)data->resp_command.file_command.files[0]->path,
data->progress.file_progress);
ecore_list_goto_first(data->file_list.list);
- request->file_from = strdup (
((evfs_filereference*)ecore_list_current(data->file_list.list))->path );
+ 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 = strdup (
((evfs_filereference*)ecore_list_current(data->file_list.list))->path);
+ 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)
@@ -385,8 +385,8 @@
}
free (uri);
- free (request->file_from);
- free (request->file_to);
+ entropy_generic_file_destroy (request->file_from);
+ entropy_generic_file_destroy (request->file_to);
free (request);
}
break;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- layout_ewl_simple.c 31 Jan 2006 07:17:48 -0000 1.39
+++ layout_ewl_simple.c 1 Feb 2006 08:06:02 -0000 1.40
@@ -12,6 +12,7 @@
#define HEADER_CONFIG_MAX 2048
static Ewl_Widget *win;
+static ewl_layout_count = 0;
int entropy_plugin_type_get ();
char *entropy_plugin_identify ();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/remote_thumbnailer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- remote_thumbnailer.c 1 Feb 2006 05:02:25 -0000 1.4
+++ remote_thumbnailer.c 1 Feb 2006 08:06:02 -0000 1.5
@@ -113,10 +113,8 @@
entropy_file_progress *progress = obj;
if (progress->type == TYPE_END) {
- char *copy = strdup (progress->file_from);
entropy_file_listener *listener;
char new_path[PATH_MAX];
- char *pos = strrchr (copy, '/');
entropy_thumbnail *thumb;
entropy_gui_event *gui_event;
char *md5 = NULL;
@@ -124,18 +122,15 @@
entropy_gui_component_instance *instance = NULL;
- *pos = '\0';
- pos++;
-
- printf("From: %s\n", progress->file_from);
+ //printf("From: %s/%s\n", progress->file_from->path,
progress->file_from->filename);
- md5 = md5_entropy_path_file ("smb", copy, pos);
+ md5 = md5_entropy_path_file (progress->file_from->uri_base,
progress->file_from->path, progress->file_from->filename);
instance = ecore_hash_get (file_instance_hash, md5);
//printf("Remote thumbnailer file copy finish! - %p\n", instance);
/*Actually make the thumbnail */
if (instance && (listener = entropy_core_file_cache_retrieve (md5))) {
- snprintf (new_path, PATH_MAX, "/tmp/%s", pos);
+ snprintf (new_path, PATH_MAX, "/tmp/%s",
progress->file_from->filename);
strncpy (tmp_file->filename, listener->file->filename,
FILENAME_LENGTH);
@@ -180,7 +175,6 @@
ecore_hash_remove (file_instance_hash, md5);
free (md5);
- free (copy);
}
}
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://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
