make init fail if a dbus session connection cannot be created
typically this indicates a broken session manager or someone trying to run a wayland session without using dbus-launch
This commit is contained in:
parent
c286fe48c0
commit
7ebaa1ffb3
|
@ -629,7 +629,17 @@ main(int argc, char **argv)
|
||||||
if (e_config->show_splash)
|
if (e_config->show_splash)
|
||||||
e_init_status_set(_("Setup Message Bus"));
|
e_init_status_set(_("Setup Message Bus"));
|
||||||
TS("E_Msgbus Init");
|
TS("E_Msgbus Init");
|
||||||
if (e_msgbus_init())
|
if (!e_msgbus_init())
|
||||||
|
{
|
||||||
|
if (!getenv("E_NO_DBUS_SESSION"))
|
||||||
|
{
|
||||||
|
e_error_message_show(_("Enlightenment cannot create a dbus session connection.\n"
|
||||||
|
"At best this will break many things, at worst it will hard lock your machine.\n"
|
||||||
|
"If you're sure you know what you're doing, export E_NO_DBUS_SESSION=1"));
|
||||||
|
_e_main_shutdown(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
_e_main_shutdown_push(e_msgbus_shutdown);
|
_e_main_shutdown_push(e_msgbus_shutdown);
|
||||||
TS("E_Msgbus Init Done");
|
TS("E_Msgbus Init Done");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue