jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4ba2359ce983ca0ccacd506d5b634aac25a1b116
commit 4ba2359ce983ca0ccacd506d5b634aac25a1b116 Author: Jérémy Zurcher <[email protected]> Date: Tue Jul 29 10:26:14 2014 +0200 add dbus method org.enlightenment.wm.Core.Version returns VERSION as in config.h call: enlightenment_remote -version --- data/tools/enlightenment_remote | 11 +++++++++++ src/bin/e_msgbus.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/data/tools/enlightenment_remote b/data/tools/enlightenment_remote index 45295bb..ae0f390 100644 --- a/data/tools/enlightenment_remote +++ b/data/tools/enlightenment_remote @@ -16,6 +16,7 @@ OPTIONS: --h This help --help-new Info about this tool + -version Show Enlightenment Version -restart Restart Enlightenment -exit Exit Enlightenment @@ -220,6 +221,13 @@ er_lock(){ } #------------------------------------------------------------------------------- +# E Version +#------------------------------------------------------------------------------- +er_version(){ + ERGS org.enlightenment.wm.Core.Version +} + +#------------------------------------------------------------------------------- # E Restart #------------------------------------------------------------------------------- er_restart(){ @@ -436,6 +444,9 @@ case "$1" in --help-new) show_help_new_tool ;; + -version) + er_version + ;; -restart) er_restart ;; diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c index 1d3f4eb..aaa54fb 100644 --- a/src/bin/e_msgbus.c +++ b/src/bin/e_msgbus.c @@ -4,6 +4,8 @@ static void _e_msgbus_request_name_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending); +static Eldbus_Message *_e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface, + const Eldbus_Message *msg); static Eldbus_Message *_e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg); static Eldbus_Message *_e_msgbus_core_shutdown_cb(const Eldbus_Service_Interface *iface, @@ -48,6 +50,7 @@ E_MSGBUS_WIN_ACTION_CB_PROTO(unmaximize); static E_Msgbus_Data *_e_msgbus_data = NULL; static const Eldbus_Method core_methods[] = { + { "Version", NULL, ELDBUS_ARGS({"s", "version"}), _e_msgbus_core_version_cb }, { "Restart", NULL, NULL, _e_msgbus_core_restart_cb }, { "Shutdown", NULL, NULL, _e_msgbus_core_shutdown_cb }, { } @@ -183,6 +186,16 @@ _e_msgbus_request_name_cb(void *data __UNUSED__, const Eldbus_Message *msg, /* Core Handlers */ static Eldbus_Message * +_e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface __UNUSED__, + const Eldbus_Message *msg) +{ + Eldbus_Message *reply = eldbus_message_method_return_new(msg); + EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL); + eldbus_message_arguments_append(reply, "s", VERSION); + return reply; +} + +static Eldbus_Message * _e_msgbus_core_restart_cb(const Eldbus_Service_Interface *iface __UNUSED__, const Eldbus_Message *msg) { --
