summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-05-09 13:30:40 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-05-09 13:30:40 -0400
commit7ebaa1ffb3ddae7c1218ecfdbff09edbe7a1ee75 (patch)
tree96c61f1e153c3f2e27847a16f6dafbccde2c18b0
parentc286fe48c06fddb8d20553ef64d1910c5826b79f (diff)
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
-rw-r--r--src/bin/e_main.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index ef68ab509..28ed4bc69 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -629,7 +629,17 @@ main(int argc, char **argv)
629 if (e_config->show_splash) 629 if (e_config->show_splash)
630 e_init_status_set(_("Setup Message Bus")); 630 e_init_status_set(_("Setup Message Bus"));
631 TS("E_Msgbus Init"); 631 TS("E_Msgbus Init");
632 if (e_msgbus_init()) 632 if (!e_msgbus_init())
633 {
634 if (!getenv("E_NO_DBUS_SESSION"))
635 {
636 e_error_message_show(_("Enlightenment cannot create a dbus session connection.\n"
637 "At best this will break many things, at worst it will hard lock your machine.\n"
638 "If you're sure you know what you're doing, export E_NO_DBUS_SESSION=1"));
639 _e_main_shutdown(-1);
640 }
641 }
642 else
633 _e_main_shutdown_push(e_msgbus_shutdown); 643 _e_main_shutdown_push(e_msgbus_shutdown);
634 TS("E_Msgbus Init Done"); 644 TS("E_Msgbus Init Done");
635 645