From 2173bc5e08b522a0b19a853899f9feb5fa70ef2e Mon Sep 17 00:00:00 2001 From: sebastid Date: Sun, 24 Sep 2006 14:29:15 +0000 Subject: [PATCH] Only delete these paths on shutdown. SVN revision: 26104 --- .../lib/ecore_desktop/ecore_desktop_paths.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c index 96f86a4366..214714886b 100644 --- a/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c +++ b/legacy/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c @@ -142,9 +142,19 @@ ecore_desktop_paths_init(void) EAPI int ecore_desktop_paths_shutdown(void) { + int i; + if (--init_count != 0) return init_count; + for (i = 0; i < ECORE_DESKTOP_PATHS_MAX; i++) + { + E_FN_DEL(ecore_list_destroy, prepend_user_paths[i]); + E_FN_DEL(ecore_list_destroy, prepend_system_paths[i]); + E_FN_DEL(ecore_list_destroy, append_user_paths[i]); + E_FN_DEL(ecore_list_destroy, append_system_paths[i]); + } + _ecore_desktop_paths_destroy(); E_FN_DEL(ecore_list_destroy, gnome_data); @@ -281,8 +291,6 @@ _ecore_desktop_paths_create(void) static void _ecore_desktop_paths_destroy(void) { - int i; - 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); @@ -290,14 +298,6 @@ _ecore_desktop_paths_destroy(void) 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); - - for (i = 0; i < ECORE_DESKTOP_PATHS_MAX; i++) - { - E_FN_DEL(ecore_list_destroy, prepend_user_paths[i]); - E_FN_DEL(ecore_list_destroy, prepend_system_paths[i]); - E_FN_DEL(ecore_list_destroy, append_user_paths[i]); - E_FN_DEL(ecore_list_destroy, append_system_paths[i]); - } } EAPI void