Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

linux: Make system D-Bus connection available (in addition to session).

Browse Source
This commit is contained in:
Ryan C. Gordon 2017-05-28 07:08:10 -04:00
parent e5918acf46
commit 191f578b57
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/linux/SDL_dbus.c
View File

@ -112,14 +112,15 @@ SDL_DBus_Init(void)
DBusError err; DBusError err;
dbus.error_init(&err); dbus.error_init(&err);
dbus.session_conn = dbus.bus_get_private(DBUS_BUS_SESSION, &err); dbus.session_conn = dbus.bus_get_private(DBUS_BUS_SESSION, &err);
if (!dbus.error_is_set(&err)) {
dbus.system_conn = dbus.bus_get_private(DBUS_BUS_SYSTEM, &err);
}
if (dbus.error_is_set(&err)) { if (dbus.error_is_set(&err)) {
dbus.error_free(&err); dbus.error_free(&err);
if (dbus.session_conn) { SDL_DBus_Quit();
dbus.connection_unref(dbus.session_conn);
dbus.session_conn = NULL;
}
return; /* oh well */ return; /* oh well */
} }
dbus.connection_set_exit_on_disconnect(dbus.system_conn, 0);
dbus.connection_set_exit_on_disconnect(dbus.session_conn, 0); dbus.connection_set_exit_on_disconnect(dbus.session_conn, 0);
} }
} }
@ -127,12 +128,18 @@ SDL_DBus_Init(void)
void void
SDL_DBus_Quit(void) SDL_DBus_Quit(void)
{ {
if (dbus.system_conn) {
dbus.connection_close(dbus.system_conn);
dbus.connection_unref(dbus.system_conn);
}
if (dbus.session_conn) { if (dbus.session_conn) {
dbus.connection_close(dbus.session_conn); dbus.connection_close(dbus.session_conn);
dbus.connection_unref(dbus.session_conn); dbus.connection_unref(dbus.session_conn);
dbus.shutdown();
SDL_memset(&dbus, 0, sizeof(dbus));
} }
if (dbus.shutdown) {
dbus.shutdown();
}
SDL_zero(dbus);
UnloadDBUSLibrary(); UnloadDBUSLibrary();
} }

1
src/core/linux/SDL_dbus.h
View File

@ -32,6 +32,7 @@
typedef struct SDL_DBusContext { typedef struct SDL_DBusContext {
DBusConnection *session_conn; DBusConnection *session_conn;
DBusConnection *system_conn;
DBusConnection *(*bus_get_private)(DBusBusType, DBusError *); DBusConnection *(*bus_get_private)(DBusBusType, DBusError *);
dbus_bool_t (*bus_register)(DBusConnection *, DBusError *); dbus_bool_t (*bus_register)(DBusConnection *, DBusError *);