Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
Ecore_Desktop.h ecore_desktop_icon.c
Log Message:
- make some things const for ecore_desktop_icon_find
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Ecore_Desktop.h 16 Aug 2006 18:57:58 -0000 1.9
+++ Ecore_Desktop.h 17 Aug 2006 19:11:00 -0000 1.10
@@ -116,8 +116,9 @@
Ecore_Desktop *ecore_desktop_get(const char *file, const char *lang);
void ecore_desktop_destroy(Ecore_Desktop * desktop);
- char *ecore_desktop_icon_find(char *icon, char *icon_size,
- char *icon_theme);
+ const char *ecore_desktop_icon_find(const char *icon,
+ const char *icon_size,
+ const char *icon_theme);
Ecore_Desktop_Tree *ecore_desktop_menu_get(char *file);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_desktop_icon.c 17 Aug 2006 17:09:23 -0000 1.7
+++ ecore_desktop_icon.c 17 Aug 2006 19:11:00 -0000 1.8
@@ -5,8 +5,9 @@
//#define DEBUG 1
-static char *_ecore_desktop_icon_find0(char *icon, char *icon_size,
- char *icon_theme);
+static const char *_ecore_desktop_icon_find0(const char *icon,
+ const char *icon_size,
+ const char *icon_theme);
static const char *ext[] = { ".png", ".svgz", ".svg", ".xpm", "", NULL };
@@ -32,11 +33,12 @@
* @ingroup Ecore_Desktop_Icon_Group
*/
-char *
-ecore_desktop_icon_find(char *icon, char *icon_size, char *icon_theme)
+const char *
+ecore_desktop_icon_find(const char *icon, const char *icon_size, const char
*icon_theme)
{
char icn[PATH_MAX], path[PATH_MAX];
- char *dir, *home;
+ const char *dir;
+ char *home;
if (icon == NULL)
return NULL;
@@ -89,8 +91,8 @@
* @param icon_theme The icon theme to search in.
* @return The full path to the found icon.
*/
-static char *
-_ecore_desktop_icon_find0(char *icon, char *icon_size, char *icon_theme)
+static const char *
+_ecore_desktop_icon_find0(const char *icon, const char *icon_size, const char
*icon_theme)
{
/* NOTES ON OPTIMIZATIONS
*
@@ -118,7 +120,8 @@
*/
char icn[PATH_MAX], path[PATH_MAX];
- char *theme_path, *found;
+ char *theme_path;
+ const char *found;
if ((icon == NULL) || (icon[0] == '\0'))
return NULL;
@@ -174,7 +177,7 @@
int wanted_size;
int minimal_size = INT_MAX;
int i;
- char *closest = NULL;
+ const char *closest = NULL;
char *directory;
wanted_size = atoi(icon_size);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
