[EGIT] [core/enlightenment] master 01/02: reenable restart/shutdown dbus methods under x11

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=e01b594fbdb345634695836a293fd9d4ef78ff4e

commit e01b594fbdb345634695836a293fd9d4ef78ff4e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Nov 24 11:49:15 2015 -0500

    reenable restart/shutdown dbus methods under x11
---
 src/bin/e_msgbus.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 16f7944..6cc7025 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -110,8 +110,10 @@ static Eldbus_Message *
 _e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                           const Eldbus_Message *msg)
 {
-   ERR("DBus restart API disabled for security reasons");
-//   e_sys_action_do(E_SYS_RESTART, NULL);
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+     ERR("DBus restart API disabled for security reasons");
+   else
+     e_sys_action_do(E_SYS_RESTART, NULL);
    return eldbus_message_method_return_new(msg);
 }
 
@@ -119,7 +121,9 @@ static Eldbus_Message *
 _e_msgbus_core_shutdown_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
                            const Eldbus_Message *msg)
 {
-   ERR("DBus shutdown API disabled for security reasons");
-//   e_sys_action_do(E_SYS_EXIT, NULL);
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+     ERR("DBus shutdown API disabled for security reasons");
+   else
+     e_sys_action_do(E_SYS_EXIT, NULL);
    return eldbus_message_method_return_new(msg);
 }

--