|
From: Enlightenment C. <no...@cv...> - 2008-08-14 20:51:33
|
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_icon_theme.c
Log Message:
fix against efreet API breakage.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_icon_theme.c 7 May 2008 13:38:23 -0000 1.28
+++ ewl_icon_theme.c 14 Aug 2008 20:51:26 -0000 1.29
@@ -12,7 +12,7 @@
static Ecore_Hash *ewl_icon_fallback_theme_cache = NULL;
static void ewl_icon_theme_cb_free(void *data);
static const char *ewl_icon_theme_icon_path_get_helper(const char *icon,
- const char *size, const char *theme,
+ unsigned int size, const char *theme,
const char *key, Ecore_Hash *cache);
/**
@@ -99,7 +99,6 @@
{
const char *ret;
const char *icon_theme;
- char icon_size[16];
char key[256];
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -120,13 +119,12 @@
size = ewl_config_int_get(ewl_config,
EWL_CONFIG_THEME_ICON_SIZE);
- snprintf(icon_size, sizeof(icon_size), "%dx%d", size, size);
- snprintf(key, sizeof(key), "%s@%s", icon, icon_size);
- ret = ewl_icon_theme_icon_path_get_helper(icon, icon_size, icon_theme,
+ snprintf(key, sizeof(key), "%s@%d", icon, size);
+ ret = ewl_icon_theme_icon_path_get_helper(icon, size, icon_theme,
key, ewl_icon_theme_cache);
if (ret == EWL_THEME_KEY_NOMATCH)
- ret = ewl_icon_theme_icon_path_get_helper(icon, icon_size, "EWL",
+ ret = ewl_icon_theme_icon_path_get_helper(icon, size, "EWL",
key, ewl_icon_fallback_theme_cache);
if (ret == EWL_THEME_KEY_NOMATCH)
@@ -136,7 +134,7 @@
}
static const char *
-ewl_icon_theme_icon_path_get_helper(const char *icon, const char *size,
+ewl_icon_theme_icon_path_get_helper(const char *icon, unsigned int size,
const char *theme, const char *key,
Ecore_Hash *cache)
{
|