|
@@ -111,8 +111,19 @@ LoadDBUSLibrary(void)
|
|
|
void
|
|
|
SDL_DBus_Init(void)
|
|
|
{
|
|
|
- if (!dbus.session_conn && LoadDBUSLibrary() != -1) {
|
|
|
+ static SDL_bool is_dbus_available = SDL_TRUE;
|
|
|
+ if (!is_dbus_available) {
|
|
|
+ return; /* don't keep trying if this fails. */
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!dbus.session_conn) {
|
|
|
DBusError err;
|
|
|
+
|
|
|
+ if (LoadDBUSLibrary() == -1) {
|
|
|
+ is_dbus_available = SDL_FALSE; /* can't load at all? Don't keep trying. */
|
|
|
+ return; /* oh well */
|
|
|
+ }
|
|
|
+
|
|
|
dbus.error_init(&err);
|
|
|
dbus.session_conn = dbus.bus_get_private(DBUS_BUS_SESSION, &err);
|
|
|
if (!dbus.error_is_set(&err)) {
|
|
@@ -121,6 +132,7 @@ SDL_DBus_Init(void)
|
|
|
if (dbus.error_is_set(&err)) {
|
|
|
dbus.error_free(&err);
|
|
|
SDL_DBus_Quit();
|
|
|
+ is_dbus_available = SDL_FALSE;
|
|
|
return; /* oh well */
|
|
|
}
|
|
|
dbus.connection_set_exit_on_disconnect(dbus.system_conn, 0);
|
|
@@ -154,15 +166,11 @@ SDL_DBus_Quit(void)
|
|
|
SDL_DBusContext *
|
|
|
SDL_DBus_GetContext(void)
|
|
|
{
|
|
|
- if(!dbus_handle || !dbus.session_conn){
|
|
|
+ if (!dbus_handle || !dbus.session_conn) {
|
|
|
SDL_DBus_Init();
|
|
|
}
|
|
|
|
|
|
- if(dbus_handle && dbus.session_conn){
|
|
|
- return &dbus;
|
|
|
- } else {
|
|
|
- return NULL;
|
|
|
- }
|
|
|
+ return (dbus_handle && dbus.session_conn) ? &dbus : NULL;
|
|
|
}
|
|
|
|
|
|
static SDL_bool
|