enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

screensaver blanking dbus api - also support /ScreenSaver path

This commit is contained in:
Carsten Haitzler 2022-08-09 09:19:19 +01:00
parent c93c976069
commit 88d7e3b836
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_msgbus.c
View File

@ -26,6 +26,7 @@ static const Eldbus_Service_Interface_Desc _e_core_desc = {
#define SCREENSAVER_BUS "org.freedesktop.ScreenSaver" #define SCREENSAVER_BUS "org.freedesktop.ScreenSaver"
#define SCREENSAVER_IFACE "org.freedesktop.ScreenSaver" #define SCREENSAVER_IFACE "org.freedesktop.ScreenSaver"
#define SCREENSAVER_PATH "/org/freedesktop/ScreenSaver" #define SCREENSAVER_PATH "/org/freedesktop/ScreenSaver"
#define SCREENSAVER_PATH2 "/ScreenSaver"
static void _e_msgbus_screensaver_request_name_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending); static void _e_msgbus_screensaver_request_name_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending);
static void _e_msgbus_screensaver_inhibit_free(E_Msgbus_Data_Screensaver_Inhibit *inhibit); static void _e_msgbus_screensaver_inhibit_free(E_Msgbus_Data_Screensaver_Inhibit *inhibit);
static void _e_msgbus_screensaver_owner_change_cb(void *data EINA_UNUSED, const char *bus, const char *old_id, const char *new_id); static void _e_msgbus_screensaver_owner_change_cb(void *data EINA_UNUSED, const char *bus, const char *old_id, const char *new_id);
@ -69,6 +70,8 @@ e_msgbus_init(void)
e_msgbus_data->screensaver_iface = eldbus_service_interface_register e_msgbus_data->screensaver_iface = eldbus_service_interface_register
(e_msgbus_data->conn, SCREENSAVER_PATH, &_screensaver_core_desc); (e_msgbus_data->conn, SCREENSAVER_PATH, &_screensaver_core_desc);
e_msgbus_data->screensaver_iface2 = eldbus_service_interface_register
(e_msgbus_data->conn, SCREENSAVER_PATH2, &_screensaver_core_desc);
eldbus_name_request(e_msgbus_data->conn, SCREENSAVER_BUS, 0, eldbus_name_request(e_msgbus_data->conn, SCREENSAVER_BUS, 0,
_e_msgbus_screensaver_request_name_cb, NULL); _e_msgbus_screensaver_request_name_cb, NULL);
return 1; return 1;
@ -79,6 +82,10 @@ e_msgbus_shutdown(void)
{ {
E_Msgbus_Data_Screensaver_Inhibit *inhibit; E_Msgbus_Data_Screensaver_Inhibit *inhibit;
if (e_msgbus_data->screensaver_iface2)
eldbus_service_object_unregister(e_msgbus_data->screensaver_iface2);
if (e_msgbus_data->screensaver_iface)
eldbus_service_object_unregister(e_msgbus_data->screensaver_iface);
if (e_msgbus_data->e_iface) if (e_msgbus_data->e_iface)
eldbus_service_object_unregister(e_msgbus_data->e_iface); eldbus_service_object_unregister(e_msgbus_data->e_iface);
if (e_msgbus_data->conn) if (e_msgbus_data->conn)

1
src/bin/e_msgbus.h
View File

@ -14,6 +14,7 @@ struct _E_Msgbus_Data
Eldbus_Connection *conn; Eldbus_Connection *conn;
Eldbus_Service_Interface *e_iface; Eldbus_Service_Interface *e_iface;
Eldbus_Service_Interface *screensaver_iface; Eldbus_Service_Interface *screensaver_iface;
Eldbus_Service_Interface *screensaver_iface2;
Eina_List *screensaver_inhibits; Eina_List *screensaver_inhibits;
}; };