Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet.c efreet_private.h efreet_utils.c efreet_utils.h
Log Message:
Make util optional.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- efreet.c 25 Mar 2007 11:25:23 -0000 1.4
+++ efreet.c 9 Apr 2007 12:16:09 -0000 1.5
@@ -25,7 +25,6 @@
if (!efreet_ini_init()) return --init;
if (!efreet_desktop_init()) return --init;
if (!efreet_menu_init()) return --init;
- if (!efreet_util_init()) return --init;
return init;
}
@@ -39,7 +38,6 @@
efreet_shutdown(void)
{
if (--init) return init;
- efreet_util_shutdown();
efreet_menu_shutdown();
efreet_desktop_shutdown();
efreet_ini_shutdown();
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- efreet_private.h 26 Mar 2007 16:17:40 -0000 1.5
+++ efreet_private.h 9 Apr 2007 12:16:09 -0000 1.6
@@ -181,10 +181,6 @@
size_t efreet_array_cat(char *buffer, size_t size, const char *strs[]);
-int efreet_util_init(void);
-void efreet_util_shutdown(void);
-
-
/**
* @}
*/
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- efreet_utils.c 5 Apr 2007 21:10:50 -0000 1.28
+++ efreet_utils.c 9 Apr 2007 12:16:09 -0000 1.29
@@ -79,6 +79,8 @@
static Ecore_List *monitors = NULL;
+static int init = 0;
+
int EFREET_EVENT_DESKTOP_LIST_CHANGE = 0;
int EFREET_EVENT_DESKTOP_CHANGE = 0;
@@ -88,6 +90,8 @@
Efreet_Cache_Fill *fill;
Ecore_List *dirs;
+ if (init++) return init;
+
if (!EFREET_EVENT_DESKTOP_LIST_CHANGE)
EFREET_EVENT_DESKTOP_LIST_CHANGE = ecore_event_type_new();
if (!EFREET_EVENT_DESKTOP_CHANGE)
@@ -124,12 +128,14 @@
ecore_list_goto_first(fill->dirs);
}
idler = ecore_idler_add(efreet_util_cache_fill, fill);
- return 1;
+ return init;
}
-void
+int
efreet_util_shutdown(void)
{
+ if (--init) return init;
+
if (idler)
{
Efreet_Cache_Fill *fill;
@@ -145,6 +151,7 @@
IF_FREE_HASH(file_id_by_desktop_path);
IF_FREE_LIST(monitors);
+ return init;
}
char *
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_utils.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- efreet_utils.h 5 Apr 2007 21:10:50 -0000 1.17
+++ efreet_utils.h 9 Apr 2007 12:16:09 -0000 1.18
@@ -31,6 +31,8 @@
Efreet_Desktop *efreet_util_desktop_name_find(const char *name);
Efreet_Desktop *efreet_util_desktop_generic_name_find(const char
*generic_name);
+int efreet_util_init(void);
+int efreet_util_shutdown(void);
Ecore_List *efreet_util_desktop_name_glob_list(const char *glob);
Ecore_List *efreet_util_desktop_exec_glob_list(const char *glob);
Ecore_List *efreet_util_desktop_generic_name_glob_list(const char *glob);
-------------------------------------------------------------------------
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
