Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_paths.c
Log Message:
1. fn's with no params shoudl be (void) - fixed 1 file.
2. might want to destroy temporary lists instead of leaking them.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_desktop_paths.c 7 Sep 2006 13:16:21 -0000 1.22
+++ ecore_desktop_paths.c 10 Sep 2006 10:40:09 -0000 1.23
@@ -82,7 +82,7 @@
EAPI int
-ecore_desktop_paths_init()
+ecore_desktop_paths_init(void)
{
if (++init_count != 1) return init_count;
@@ -133,7 +133,7 @@
}
EAPI int
-ecore_desktop_paths_shutdown()
+ecore_desktop_paths_shutdown(void)
{
if (--init_count != 0) return init_count;
@@ -149,24 +149,24 @@
}
EAPI void
-ecore_desktop_paths_regen()
+ecore_desktop_paths_regen(void)
{
_ecore_desktop_paths_destroy();
_ecore_desktop_paths_create();
}
static void
-_ecore_desktop_paths_create()
+_ecore_desktop_paths_create(void)
{
if (!ecore_desktop_paths_desktops)
{
ecore_desktop_paths_desktops =
- _ecore_desktop_paths_get(ECORE_DESKTOP_PATHS_DESKTOPS, NULL,
"XDG_DATA_HOME", "XDG_DATA_DIRS",
- "~/.local/share:~/.kde/share",
- "/usr/local/share:/usr/share",
- "applications:applnk:applications/kde",
-
"dist/desktop-files:dist/short-menu:gnome/apps",
- "xdgdata-apps:apps");
+ _ecore_desktop_paths_get(ECORE_DESKTOP_PATHS_DESKTOPS, NULL,
"XDG_DATA_HOME", "XDG_DATA_DIRS",
+ "~/.local/share:~/.kde/share",
+ "/usr/local/share:/usr/share",
+ "applications:applnk:applications/kde",
+
"dist/desktop-files:dist/short-menu:gnome/apps",
+ "xdgdata-apps:apps");
_ecore_desktop_paths_check_and_add(ecore_desktop_paths_desktops,
"/usr/local/share/update-desktop-files/templates");
_ecore_desktop_paths_check_and_add(ecore_desktop_paths_desktops,
@@ -174,9 +174,6 @@
}
if (!ecore_desktop_paths_kde_legacy)
{
- char temp[PATH_MAX], *path;
- Ecore_List *temp_list;
-
#ifdef KDE_SUPPORT
ecore_desktop_paths_kde_legacy =
_ecore_desktop_paths_get(ECORE_DESKTOP_PATHS_KDE_LEGACY, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
@@ -192,6 +189,9 @@
#endif
if (ecore_desktop_paths_kde_legacy)
{
+ char temp[PATH_MAX], *path;
+ Ecore_List *temp_list;
+
/* Copy it, cause Ecore_List walks can not be nested. */
temp_list = ecore_list_new();
if (temp_list)
@@ -218,6 +218,7 @@
(ecore_desktop_paths_kde_legacy, temp);
}
}
+ ecore_list_destroy(temp_list);
}
}
if (!ecore_desktop_paths_icons)
@@ -265,7 +266,7 @@
}
static void
-_ecore_desktop_paths_destroy()
+_ecore_desktop_paths_destroy(void)
{
E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_xsessions);
E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_config);
@@ -277,7 +278,7 @@
}
EAPI void
-ecore_desktop_paths_extras_clear()
+ecore_desktop_paths_extras_clear(void)
{
int i;
-------------------------------------------------------------------------
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
