Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
Ecore_Desktop.h ecore_desktop.c ecore_desktop_paths.c
Log Message:
* Added xsessions path search list.
* leak--
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Ecore_Desktop.h 20 Aug 2006 03:45:53 -0000 1.14
+++ Ecore_Desktop.h 29 Aug 2006 17:26:20 -0000 1.15
@@ -32,6 +32,7 @@
extern Ecore_List *ecore_desktop_paths_desktops;
extern Ecore_List *ecore_desktop_paths_icons;
extern Ecore_List *ecore_desktop_paths_kde_legacy;
+extern Ecore_List *ecore_desktop_paths_xsessions;
struct _Ecore_Desktop
{
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore_desktop.c 21 Aug 2006 18:25:16 -0000 1.13
+++ ecore_desktop.c 29 Aug 2006 17:26:20 -0000 1.14
@@ -12,6 +12,7 @@
Ecore_List *ecore_desktop_paths_desktops = NULL;
Ecore_List *ecore_desktop_paths_icons = NULL;
Ecore_List *ecore_desktop_paths_kde_legacy = NULL;
+Ecore_List *ecore_desktop_paths_xsessions = NULL;
extern int reject_count, not_over_count;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_desktop_paths.c 21 Aug 2006 17:57:08 -0000 1.12
+++ ecore_desktop_paths.c 29 Aug 2006 17:26:20 -0000 1.13
@@ -212,6 +212,13 @@
ecore_desktop_paths_config =
_ecore_desktop_paths_get(NULL, "XDG_CONFIG_HOME", "XDG_CONFIG_DIRS",
"~/.config", "/etc/xdg", "", NULL, NULL);
+ if (!ecore_desktop_paths_xsessions)
+ ecore_desktop_paths_xsessions =
+ _ecore_desktop_paths_get(NULL, "XDG_DATA_HOME", "XDG_DATA_DIRS",
+ "~/.local/share:~/.kde/share",
+ "/usr/local/share:/usr/share",
+ "xsessions", NULL,
+ NULL);
#if defined GNOME_SUPPORT || defined KDE_SUPPORT
if (exit_handler)
@@ -227,10 +234,14 @@
{
if (--init_count != 0) return init_count;
- E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_menus);
+ E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_xsessions);
+ E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_config);
E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_directories);
- E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_desktops);
+ E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_menus);
E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_icons);
+ E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_kde_legacy);
+ E_FN_DEL(ecore_list_destroy, ecore_desktop_paths_desktops);
+ E_FN_DEL(ecore_list_destroy, gnome_data);
return init_count;
}
-------------------------------------------------------------------------
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
