Enlightenment CVS committal

Author  : lok
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_eap_editor.c 


Log Message:
Oops bad me. Handle both icons in the icon theme or with the path

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- e_eap_editor.c      27 Oct 2007 15:55:27 -0000      1.91
+++ e_eap_editor.c      28 Oct 2007 01:54:24 -0000      1.92
@@ -587,9 +587,16 @@
     * files from a dir, or icons in the current theme */
    if (cfdata->icon) 
      {
-       icon_path = efreet_icon_path_find(e_config->icon_theme, 
-                                         cfdata->icon, "scalable");
-       path = ecore_file_dir_get(icon_path);
+       if (ecore_file_exists(cfdata->icon))
+         icon_path = strdup(cfdata->icon);
+       else
+         icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon, 
"scalable");
+
+       if (icon_path)
+         {
+            path = ecore_file_dir_get(icon_path);
+            free(icon_path);
+         }
      }
 
    if (path)
@@ -606,7 +613,6 @@
                              NULL, cfdata, 1);
      }
    
-   if (icon_path) free(icon_path);
    evas_object_show(o);
    editor->icon_fsel = o;
    e_widget_min_size_get(o, &mw, &mh);



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to