Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
Efreet_Mime.h efreet_icon.c efreet_icon.h efreet_mime.c
Log Message:
Pass icon size as unsigned int.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/Efreet_Mime.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Efreet_Mime.h 2 Aug 2008 21:48:44 -0000 1.10
+++ Efreet_Mime.h 14 Aug 2008 20:48:40 -0000 1.11
@@ -50,7 +50,7 @@
EAPI const char *efreet_mime_fallback_type_get(const char *file);
EAPI char *efreet_mime_type_icon_get(const char *mime, const char *theme,
- const char *size);
+ unsigned int size);
/**
* @}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- efreet_icon.c 14 Aug 2008 20:02:07 -0000 1.36
+++ efreet_icon.c 14 Aug 2008 20:48:41 -0000 1.37
@@ -331,25 +331,23 @@
* @brief Retrives the path to the given icon.
*/
EAPI char *
-efreet_icon_path_find(const char *theme_name, const char *icon, const char
*size)
+efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int
size)
{
char *value = NULL;
Efreet_Icon_Theme *theme;
- unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
- real_size = atoi(size);
#ifdef SLOPPY_SPEC
{
char *tmp;
tmp = efreet_icon_remove_extension(icon);
- value = efreet_icon_find_helper(theme, tmp, real_size);
+ value = efreet_icon_find_helper(theme, tmp, size);
FREE(tmp);
}
#else
- value = efreet_icon_find_helper(theme, icon, real_size);
+ value = efreet_icon_find_helper(theme, icon, size);
#endif
/* we didn't find the icon in the theme or in the inherited directories
@@ -374,15 +372,13 @@
*/
EAPI char *
efreet_icon_list_find(const char *theme_name, Ecore_List *icons,
- const char *size)
+ unsigned int size)
{
const char *icon = NULL;
char *value = NULL;
Efreet_Icon_Theme *theme;
- unsigned int real_size;
theme = efreet_icon_find_theme_check(theme_name);
- real_size = atoi(size);
ecore_list_first_goto(icons);
#ifdef SLOPPY_SPEC
@@ -395,11 +391,11 @@
while ((icon = ecore_list_next(icons)))
ecore_list_append(tmps, efreet_icon_remove_extension(icon));
- value = efreet_icon_list_find_helper(theme, tmps, real_size);
+ value = efreet_icon_list_find_helper(theme, tmps, size);
ecore_list_destroy(tmps);
}
#else
- value = efreet_icon_list_find_helper(theme, icons, real_size);
+ value = efreet_icon_list_find_helper(theme, icons, size);
#endif
/* we didn't find the icons in the theme or in the inherited directories
@@ -429,7 +425,7 @@
* @brief Retrieves all of the information about the given icon.
*/
EAPI Efreet_Icon *
-efreet_icon_find(const char *theme_name, const char *icon, const char *size)
+efreet_icon_find(const char *theme_name, const char *icon, unsigned int size)
{
char *path;
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- efreet_icon.h 14 Aug 2008 16:59:41 -0000 1.8
+++ efreet_icon.h 14 Aug 2008 20:48:41 -0000 1.9
@@ -166,13 +166,13 @@
EAPI Efreet_Icon_Theme *efreet_icon_theme_find(const char *theme_name);
EAPI Efreet_Icon *efreet_icon_find(const char *theme_name,
const char *icon,
- const char *size);
+ unsigned int size);
EAPI char *efreet_icon_list_find(const char *theme_name,
Ecore_List *icons,
- const char *size);
+ unsigned int size);
EAPI char *efreet_icon_path_find(const char *theme_name,
const char *icon,
- const char *size);
+ unsigned int size);
EAPI void efreet_icon_free(Efreet_Icon *icon);
/**
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_mime.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- efreet_mime.c 2 Aug 2008 22:09:04 -0000 1.39
+++ efreet_mime.c 14 Aug 2008 20:48:41 -0000 1.40
@@ -175,7 +175,7 @@
* @brief Retreive the mime type icon for a file
*/
EAPI char *
-efreet_mime_type_icon_get(const char *mime, const char *theme, const char
*size)
+efreet_mime_type_icon_get(const char *mime, const char *theme, unsigned int
size)
{
char *icon = NULL;
Ecore_List *icons = NULL;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
