forked from enlightenment/enlightenment
parent
ab9ec17cac
commit
1094849a20
|
@ -242,7 +242,8 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
|
|||
|
||||
edje_object_part_text_set(o, "title", title);
|
||||
|
||||
snprintf(format, sizeof(format), "source='%s' font='%s' size=%d wrap=word",
|
||||
snprintf(format, sizeof(format),
|
||||
"source='%s' font='%s' size=%d wrap=word",
|
||||
e_path_find(path_themes, "default.eet"),
|
||||
"fonts/Edje Vera", 10);
|
||||
text = evas_object_textblock_add(e);
|
||||
|
|
|
@ -56,23 +56,18 @@ e_init_init(void)
|
|||
E_Screen *scr;
|
||||
|
||||
scr = l->data;
|
||||
o = edje_object_add(_e_init_evas);
|
||||
/* first screen */
|
||||
if (l == screens)
|
||||
{
|
||||
o = edje_object_add(_e_init_evas);
|
||||
edje_object_file_set(o,
|
||||
/* FIXME: "init.eet" needs to come from config */
|
||||
e_path_find(path_init, "init.eet"),
|
||||
"init/splash");
|
||||
evas_object_move(o, scr->x, scr->y);
|
||||
evas_object_resize(o, scr->w, scr->h);
|
||||
evas_object_show(o);
|
||||
_e_init_object = o;
|
||||
}
|
||||
/* other screens */
|
||||
else
|
||||
{
|
||||
o = edje_object_add(_e_init_evas);
|
||||
edje_object_file_set(o,
|
||||
/* FIXME: "init.eet" needs to come from config */
|
||||
e_path_find(path_init, "init.eet"),
|
||||
|
@ -81,7 +76,6 @@ e_init_init(void)
|
|||
evas_object_resize(o, scr->w, scr->h);
|
||||
evas_object_show(o);
|
||||
}
|
||||
}
|
||||
|
||||
free(roots);
|
||||
return 1;
|
||||
|
|
|
@ -154,6 +154,13 @@ main(int argc, char **argv)
|
|||
_e_main_shutdown(-1);
|
||||
}
|
||||
_e_main_shutdown_push(_e_main_x_shutdown);
|
||||
if (!e_xinerama_init())
|
||||
{
|
||||
e_error_message_show("Enlightenment cannot setup xinerama wrapping.\n"
|
||||
"This should not happen.");
|
||||
_e_main_shutdown(-1);
|
||||
}
|
||||
_e_main_shutdown_push(e_xinerama_shutdown);
|
||||
|
||||
ecore_x_grab();
|
||||
|
||||
|
@ -490,7 +497,6 @@ _e_main_screens_init(void)
|
|||
Ecore_X_Window *roots;
|
||||
int num, i;
|
||||
|
||||
if (!e_xinerama_init()) return 0;
|
||||
if (!e_atoms_init()) return 0;
|
||||
if (!e_manager_init()) return 0;
|
||||
if (!e_container_init()) return 0;
|
||||
|
@ -554,7 +560,6 @@ _e_main_screens_shutdown(void)
|
|||
e_container_shutdown();
|
||||
e_manager_shutdown();
|
||||
e_atoms_shutdown();
|
||||
e_xinerama_shutdown();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue