Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_core.c entropy_file.c
Log Message:
Big changes:
* The tar file browsing support (via evfs) is now in.
* I've left a lot of debug statements in, so expect a screenful :)
* The tar URI generation code is going to be rewritten later to be more
generic, this is just a placeholder
* If anyone finds any regressions because of this new URI code, let me know.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- entropy_core.c 27 Oct 2005 12:12:22 -0000 1.9
+++ entropy_core.c 28 Oct 2005 22:33:36 -0000 1.10
@@ -192,12 +192,16 @@
/*Show some details*/
//entropy_thumbnailer_plugin_print(core->entropy_thumbnailers);
-
-
/*Initialize the selection engine*/
entropy_core_selection_engine_init(core);
+ /*Initialize the descent hash - this should be loaded from EVFS -
FIXME*/
+ /*Descent hash init - move this to a call to EVFS*/
+ core->descent_hash = ecore_hash_new(ecore_str_hash, ecore_str_compare);
+ ecore_hash_set(core->descent_hash, "application/x-tar", "tar");
+
+
/*Initial layout initialize...*/
@@ -605,7 +609,6 @@
if
(!strcmp(event->event_type,ENTROPY_GUI_EVENT_FOLDER_CHANGE_CONTENTS)) {
- char fullpath[1024];
entropy_plugin* plugin;
entropy_notify_event *ev;
@@ -616,17 +619,16 @@
//printf("File says: %s %s\n",
((entropy_generic_file*)event->data)->path,
((entropy_generic_file*)event->data)->filename);
/*Check if we need to put a slash between the path/file*/
- if (strcmp(((entropy_generic_file*)event->data)->filename, "/")
&& strcmp(((entropy_generic_file*)event->data)->path, "/")) {
- sprintf(fullpath, "%s/%s",
((entropy_generic_file*)event->data)->path,
((entropy_generic_file*)event->data)->filename);
- } else {
- sprintf(fullpath, "%s%s",
((entropy_generic_file*)event->data)->path,
((entropy_generic_file*)event->data)->filename);
+
+ if (((entropy_file_request*)event->data)->drill_down) {
+ printf("Request for drill down\n");
}
- //printf("NOTIFY GETTING folder: %s\n", fullpath);
- request->file = event->data;
+ request->file = ((entropy_file_request*)event->data)->file;
request->requester = instance->layout_parent; /*Requester is
the layout parent - after all - one dir per layout at one time*/
request->core = instance->core;
request->file_type = FILE_ALL;
+ request->drill_down =
((entropy_file_request*)event->data)->drill_down;
/*FIXME We should get the caller's current file plugin from the
caller - i.e. the gui instance*/
@@ -649,7 +651,8 @@
/*Tell the notify engine we're ready to run*/
entropy_notify_event_commit(instance->core->notify, ev);
-
+ /*Nuke the file_request object that was passed to us*/
+ free(event->data);
} else if (!strcmp(event->event_type,ENTROPY_GUI_EVENT_FILE_CHANGE)) {
@@ -964,6 +967,12 @@
+char* entropy_core_descent_for_mime_get(entropy_core* core, char* mime) {
+ return ecore_hash_get(core->descent_hash, mime);
+}
+
+
+
void entropy_log(char* message, const int level) {
/*Levels:
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entropy_file.c 21 Oct 2005 14:32:05 -0000 1.2
+++ entropy_file.c 28 Oct 2005 22:33:36 -0000 1.3
@@ -5,6 +5,7 @@
file->thumbnail = NULL;
file->username = NULL;
file->password = NULL;
+ file->parent = NULL;
allocated_files++;
print_allocation();
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
