init popups before desklock, or the hash will not exist.

SVN revision: 48516
This commit is contained in:
Gustavo Sverzut Barbieri 2010-05-01 19:21:07 +00:00
parent f7ec145316
commit 42a2c6ae0b
1 changed files with 10 additions and 9 deletions

View File

@ -764,6 +764,16 @@ main(int argc, char **argv)
}
_e_main_shutdown_push(e_desklock_shutdown);
e_init_status_set(_("Setup Popups"));
TS("popup");
/* init popup system */
if (!e_popup_init())
{
e_error_message_show(_("Enlightenment cannot set up its popup system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_popup_shutdown);
if (locked && ((!e_config->show_splash) && (!after_restart)))
e_desklock_show();
@ -959,15 +969,6 @@ main(int argc, char **argv)
}
_e_main_shutdown_push(e_bindings_shutdown);
e_init_status_set(_("Setup Popups"));
TS("popup");
/* init popup system */
if (!e_popup_init())
{
e_error_message_show(_("Enlightenment cannot set up its popup system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_popup_shutdown);
e_init_status_set(_("Setup Shelves"));
TS("shelves");