Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_icon.c ewl_icon_theme.c
Log Message:
- fix warnings
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_icon.c 29 Mar 2007 19:35:05 -0000 1.35
+++ ewl_icon.c 29 Mar 2007 19:59:22 -0000 1.36
@@ -9,7 +9,6 @@
#include "ewl_macros.h"
#include "ewl_private.h"
#include "ewl_debug.h"
-#include <Efreet.h>
static Ewl_Stock_Funcs stock_funcs = {
EWL_STOCK_LABEL_SET(ewl_icon_label_set),
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_icon_theme.c 29 Mar 2007 19:25:09 -0000 1.21
+++ ewl_icon_theme.c 29 Mar 2007 19:59:22 -0000 1.22
@@ -4,13 +4,14 @@
#include "ewl_macros.h"
#include "ewl_private.h"
#include "ewl_debug.h"
+#include <Efreet.h>
static int ewl_icon_theme_is_edje = 0;
static Ecore_Hash *ewl_icon_theme_cache = NULL;
static Ecore_Hash *ewl_icon_fallback_theme_cache = NULL;
static void ewl_icon_theme_cb_free(void *data);
-static char *ewl_icon_theme_icon_path_get_helper(const char *icon,
+static const char *ewl_icon_theme_icon_path_get_helper(const char *icon,
const char *size, const char *theme,
const char *key, Ecore_Hash *cache);
@@ -27,14 +28,11 @@
{
ewl_icon_theme_cache = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
ecore_hash_set_free_key(ewl_icon_theme_cache,
ewl_icon_theme_cb_free);
- ecore_hash_set_free_value(ewl_icon_theme_cache,
ewl_icon_theme_cb_free);
ewl_icon_fallback_theme_cache = ecore_hash_new(
ecore_str_hash,
ecore_str_compare);
ecore_hash_set_free_key(ewl_icon_fallback_theme_cache,
ewl_icon_theme_cb_free);
- ecore_hash_set_free_value(ewl_icon_fallback_theme_cache,
- ewl_icon_theme_cb_free);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -96,7 +94,7 @@
const char *
ewl_icon_theme_icon_path_get(const char *icon, int size)
{
- char *ret;
+ const char *ret;
const char *icon_theme;
char icon_size[16];
char key[256];
@@ -134,12 +132,12 @@
DRETURN_PTR(ret, DLEVEL_STABLE);
}
-static char *
+static const char *
ewl_icon_theme_icon_path_get_helper(const char *icon, const char *size,
const char *theme, const char *key,
Ecore_Hash *cache)
{
- char *ret;
+ const char *ret;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("icon", icon, EWL_THEME_KEY_NOMATCH);
@@ -150,7 +148,7 @@
ret = efreet_icon_path_find(theme, icon, size);
if (!ret) ret = EWL_THEME_KEY_NOMATCH;
- ecore_hash_set(cache, strdup(key), ret);
+ ecore_hash_set(cache, strdup(key), (void *)ret);
}
DRETURN_PTR(ret, DLEVEL_STABLE);;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
