discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7ebaa1ffb3ddae7c1218ecfdbff09edbe7a1ee75
commit 7ebaa1ffb3ddae7c1218ecfdbff09edbe7a1ee75
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon May 9 13:30:40 2016 -0400
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
---
src/bin/e_main.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index ef68ab5..28ed4bc 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -629,7 +629,17 @@ main(int argc, char **argv)
if (e_config->show_splash)
e_init_status_set(_("Setup Message Bus"));
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);
TS("E_Msgbus Init Done");
--
