Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src


Modified Files:
        entropy_core.c 


Log Message:
Whoa! Lots of changes:

* A more complete MIME-type engine.  You can now place 'uris' or 'paths' in 
mime-actions, e.g.: 'evfscat "%u" | mplayer -cache 8192 -" will replace "%u" 
with the fully qualified URI for the file.  This is a bit of a hack right now, 
and needs to be made more generic.
* A bug I'll pretend never happened: Due to an 'operation-order' bug in the 
incremental icon-add code, the icon-viewer would miss 1 file per cycle from the 
icon listing.  Oops
* A few core memory-leak avoidances

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_core.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- entropy_core.c      26 Nov 2005 23:53:08 -0000      1.27
+++ entropy_core.c      6 Dec 2005 09:56:10 -0000       1.28
@@ -275,10 +275,14 @@
 void entropy_core_mime_action_add(char* mime_type, char* action) {
        entropy_mime_action* action_o;
        
-       action_o = entropy_malloc(sizeof(entropy_mime_action));
-       action_o->executable = strdup(action);
-                       
-       ecore_hash_set(core_core->mime_action_hint, strdup(mime_type), 
action_o);
+       if ( ! (action_o = ecore_hash_get  (core_core->mime_action_hint, 
mime_type))) {
+                       action_o = entropy_malloc(sizeof(entropy_mime_action));
+                       action_o->executable = strdup(action);
+                       ecore_hash_set(core_core->mime_action_hint, 
strdup(mime_type), action_o);
+       } else {
+                       free(action_o->executable);
+                       action_o->executable = strdup(action);
+       }
 }
 
 void entropy_core_config_load() {
@@ -364,7 +368,6 @@
        int count;
        char key[100];
        char executable[256];
-       entropy_mime_action* action;
        char* gkey;
        int i=0;
        
@@ -401,6 +404,23 @@
 }
 
 
+/*
+ * Get the status of tooltip displays 
+ */
+int entropy_core_tooltip_status_get() {
+       int status = entropy_config_int_get("core","tooltip_show");
+       /*printf("Status of tooltip: %d\n", status);*/
+
+       if (!status) {
+               /*Key doesn't exist, set it to the 'display' value by default*/
+               entropy_config_int_set("core","tooltip_show", 2);
+               
+       }
+       
+       return status;
+}
+
+
 void entropy_core_destroy(entropy_core* core) {
        entropy_plugin* plugin;
        entropy_file_listener* listener;




-------------------------------------------------------
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://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to