jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msgbus - tidy up code a bit preparing to expand

This commit is contained in:
Carsten Haitzler 2022-06-02 10:02:17 +01:00
parent c6612a7d8a
commit 5e793df529
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/e_msgbus.c
View File

@ -40,36 +40,33 @@ e_msgbus_init(void)
WRN("Cannot get ELDBUS_CONNECTION_TYPE_SESSION"); WRN("Cannot get ELDBUS_CONNECTION_TYPE_SESSION");
return 0; return 0;
} }
_e_msgbus_data->e_iface = eldbus_service_interface_register
_e_msgbus_data->iface = eldbus_service_interface_register
(_e_msgbus_data->conn, E_PATH, &core_desc); (_e_msgbus_data->conn, E_PATH, &core_desc);
eldbus_name_request(_e_msgbus_data->conn, eldbus_name_request(_e_msgbus_data->conn, E_BUS, 0,
E_BUS, 0, _e_msgbus_request_name_cb, NULL); _e_msgbus_request_name_cb, NULL);
return 1; return 1;
} }
EINTERN int EINTERN int
e_msgbus_shutdown(void) e_msgbus_shutdown(void)
{ {
if (_e_msgbus_data->iface) if (_e_msgbus_data->e_iface)
eldbus_service_object_unregister(_e_msgbus_data->iface); eldbus_service_object_unregister(_e_msgbus_data->e_iface);
if (_e_msgbus_data->conn) if (_e_msgbus_data->conn)
{ {
eldbus_name_release(_e_msgbus_data->conn, eldbus_name_release(_e_msgbus_data->conn, E_BUS, NULL, NULL);
E_BUS, NULL, NULL);
eldbus_connection_unref(_e_msgbus_data->conn); eldbus_connection_unref(_e_msgbus_data->conn);
} }
eldbus_shutdown(); eldbus_shutdown();
E_FREE(_e_msgbus_data); E_FREE(_e_msgbus_data);
_e_msgbus_data = NULL;
return 1; return 1;
} }
E_API Eldbus_Service_Interface * E_API Eldbus_Service_Interface *
e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc) e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc)
{ {
if (!_e_msgbus_data->iface) return NULL; if (!_e_msgbus_data->e_iface) return NULL;
return eldbus_service_interface_register(_e_msgbus_data->conn, E_PATH, desc); return eldbus_service_interface_register(_e_msgbus_data->conn, E_PATH, desc);
} }
@ -84,13 +81,11 @@ _e_msgbus_request_name_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
ERR("Could not request bus name"); ERR("Could not request bus name");
return; return;
} }
if (!eldbus_message_arguments_get(msg, "u", &flag)) if (!eldbus_message_arguments_get(msg, "u", &flag))
{ {
ERR("Could not get arguments on on_name_request"); ERR("Could not get arguments on on_name_request");
return; return;
} }
if (!(flag & ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER)) if (!(flag & ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER))
WRN("Name already in use\n"); WRN("Name already in use\n");
} }
@ -101,6 +96,7 @@ _e_msgbus_core_version_cb(const Eldbus_Service_Interface *iface EINA_UNUSED,
const Eldbus_Message *msg) const Eldbus_Message *msg)
{ {
Eldbus_Message *reply = eldbus_message_method_return_new(msg); Eldbus_Message *reply = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(reply, NULL);
eldbus_message_arguments_append(reply, "s", VERSION); eldbus_message_arguments_append(reply, "s", VERSION);
return reply; return reply;

2
src/bin/e_msgbus.h
View File

@ -10,7 +10,7 @@ typedef struct _E_Msgbus_Data E_Msgbus_Data;
struct _E_Msgbus_Data struct _E_Msgbus_Data
{ {
Eldbus_Connection *conn; Eldbus_Connection *conn;
Eldbus_Service_Interface *iface; Eldbus_Service_Interface *iface;
}; };