enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Splash doesn't need eet or ecore-file, so remove includes. 

Fix some formatting.



SVN revision: 48904
This commit is contained in:
Christopher Michael 2010-05-16 01:59:49 +00:00
parent b731a8b693
commit 76076d4399
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/e_init_main.c
View File

@ -10,9 +10,7 @@
#include <Ecore_X.h> #include <Ecore_X.h>
#include <Ecore_Evas.h> #include <Ecore_Evas.h>
#include <Ecore_Ipc.h> #include <Ecore_Ipc.h>
#include <Ecore_File.h>
#include <Evas.h> #include <Evas.h>
#include <Eet.h>
#include <Edje.h> #include <Edje.h>
#define E_TYPEDEFS 1 #define E_TYPEDEFS 1
@ -60,7 +58,7 @@ main(int argc, char **argv)
int i; int i;
char *s; char *s;
double scale; double scale;
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
if ((i == 1) && if ((i == 1) &&
@ -81,11 +79,10 @@ main(int argc, char **argv)
else if (!verstr) verstr = argv[i]; else if (!verstr) verstr = argv[i];
else fpath = eina_list_append(fpath, argv[i]); else fpath = eina_list_append(fpath, argv[i]);
} }
ecore_init(); ecore_init();
ecore_x_init(NULL); ecore_x_init(NULL);
ecore_app_args_set(argc, (const char **)argv); ecore_app_args_set(argc, (const char **)argv);
eet_init();
evas_init(); evas_init();
ecore_evas_init(); ecore_evas_init();
edje_init(); edje_init();
@ -94,7 +91,6 @@ main(int argc, char **argv)
scale = 1.0; scale = 1.0;
if (s) scale = atof(s); if (s) scale = atof(s);
edje_scale_set(scale); edje_scale_set(scale);
ecore_file_init();
ecore_ipc_init(); ecore_ipc_init();
if (_e_ipc_init()) if (_e_ipc_init())
@ -107,22 +103,20 @@ main(int argc, char **argv)
ecore_timer_add(0.2, delayed_ok, NULL); ecore_timer_add(0.2, delayed_ok, NULL);
ecore_main_loop_begin(); ecore_main_loop_begin();
} }
if (_e_ipc_server) if (_e_ipc_server)
{ {
ecore_ipc_server_del(_e_ipc_server); ecore_ipc_server_del(_e_ipc_server);
_e_ipc_server = NULL; _e_ipc_server = NULL;
} }
ecore_ipc_shutdown(); ecore_ipc_shutdown();
ecore_file_shutdown();
ecore_evas_shutdown(); ecore_evas_shutdown();
edje_shutdown(); edje_shutdown();
evas_shutdown(); evas_shutdown();
eet_shutdown();
ecore_x_shutdown(); ecore_x_shutdown();
ecore_shutdown(); ecore_shutdown();
return 0; return 0;
} }
@ -228,13 +222,10 @@ e_init_init(void)
_e_init_configure_handler = _e_init_configure_handler =
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
_e_init_cb_window_configure, NULL); _e_init_cb_window_configure, NULL);
num = 0; num = 0;
roots = ecore_x_window_root_list(&num); roots = ecore_x_window_root_list(&num);
if ((!roots) || (num <= 0)) if ((!roots) || (num <= 0)) return 0;
{
return 0;
}
root = roots[0]; root = roots[0];
_e_init_root_win = root; _e_init_root_win = root;
@ -270,6 +261,7 @@ e_init_init(void)
if (screens) if (screens)
{ {
E_Screen *scr; E_Screen *scr;
EINA_LIST_FOREACH(screens, l, scr) EINA_LIST_FOREACH(screens, l, scr)
{ {
o = edje_object_add(_e_init_evas); o = edje_object_add(_e_init_evas);