Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_paths.c
Log Message:
Only delete these paths on shutdown.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ecore_desktop_paths.c 24 Sep 2006 12:51:22 -0000 1.34
+++ ecore_desktop_paths.c 24 Sep 2006 14:29:15 -0000 1.35
@@ -142,9 +142,19 @@
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 @@
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 @@
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
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
