enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

* Added xsessions path search list. 

* leak--


SVN revision: 25188
This commit is contained in:
David Walter Seikel 2006-08-29 17:26:20 +00:00
parent 31e1675f52
commit de2726f369
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/ecore/src/lib/ecore_desktop/Ecore_Desktop.h
View File

@ -32,6 +32,7 @@ extern Ecore_List *ecore_desktop_paths_directories;
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
{

1
legacy/ecore/src/lib/ecore_desktop/ecore_desktop.c
View File

@ -12,6 +12,7 @@ Ecore_List *ecore_desktop_paths_directories = NULL;
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;

15
legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c
View File

@ -212,6 +212,13 @@ ecore_desktop_paths_init()
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 @@ ecore_desktop_paths_shutdown()
{
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;
}