Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_icon_theme.c
Log Message:
Update for changes in efreet.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_icon_theme.c 25 Jul 2007 17:01:00 -0000 1.23
+++ ewl_icon_theme.c 26 Jul 2007 11:34:09 -0000 1.24
@@ -28,11 +28,14 @@
{
ewl_icon_theme_cache = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
ecore_hash_free_key_cb_set(ewl_icon_theme_cache,
ewl_icon_theme_cb_free);
+ ecore_hash_free_value_cb_set(ewl_icon_theme_cache, free);
ewl_icon_fallback_theme_cache = ecore_hash_new(
ecore_str_hash,
ecore_str_compare);
ecore_hash_free_key_cb_set(ewl_icon_fallback_theme_cache,
ewl_icon_theme_cb_free);
+ ecore_hash_free_value_cb_set(ewl_icon_fallback_theme_cache,
+ free);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -79,7 +82,7 @@
ewl_icon_theme_cache = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
ecore_hash_free_key_cb_set(ewl_icon_theme_cache,
ewl_icon_theme_cb_free);
- ecore_hash_free_value_cb_set(ewl_icon_theme_cache,
ewl_icon_theme_cb_free);
+ ecore_hash_free_value_cb_set(ewl_icon_theme_cache, free);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -137,7 +140,7 @@
const char *theme, const char *key,
Ecore_Hash *cache)
{
- const char *ret;
+ char *ret;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("icon", icon, EWL_THEME_KEY_NOMATCH);
@@ -145,10 +148,10 @@
ret = ecore_hash_get(cache, key);
if (!ret)
{
+ /* XXX: How to store NOMATCH in the cache? The cache is strings
which must be free'd */
ret = efreet_icon_path_find(theme, icon, size);
if (!ret) ret = EWL_THEME_KEY_NOMATCH;
-
- ecore_hash_set(cache, strdup(key), (void *)ret);
+ else ecore_hash_set(cache, strdup(key), (void *)ret);
}
DRETURN_PTR(ret, DLEVEL_STABLE);;
-------------------------------------------------------------------------
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
