commit 779afcb4ab7814f0022e1fc7edb0c408c81902a5
author Ryan C. Gordon <icculus@icculus.org> Sun May 28 07:08:10 2017 -0400
committer Ryan C. Gordon <icculus@icculus.org> Sun May 28 07:08:10 2017 -0400
tree 7d44aa7b4142c1b13522d1ab49d28c6a65beca31
parent fc4b9f72092aa94a6663a400c4f7a1d97c944b95

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

src/core/linux/SDL_dbus.c

diff --git a/src/core/linux/SDL_dbus.c b/src/core/linux/SDL_dbus.c
index b435b5c..e6676f7 100644
--- a/src/core/linux/SDL_dbus.c
+++ b/src/core/linux/SDL_dbus.c
@@ -112,14 +112,15 @@
         DBusError err;
         dbus.error_init(&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)) {
             dbus.error_free(&err);
-            if (dbus.session_conn) {
-                dbus.connection_unref(dbus.session_conn);
-                dbus.session_conn = NULL;
-            }
+            SDL_DBus_Quit();
             return;  /* oh well */
         }
+        dbus.connection_set_exit_on_disconnect(dbus.system_conn, 0);
         dbus.connection_set_exit_on_disconnect(dbus.session_conn, 0);
     }
 }
@@ -127,12 +128,18 @@
 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) {
         dbus.connection_close(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();
 }
 

src/core/linux/SDL_dbus.h

diff --git a/src/core/linux/SDL_dbus.h b/src/core/linux/SDL_dbus.h
index ab9e4d6..ee568e8 100644
--- a/src/core/linux/SDL_dbus.h
+++ b/src/core/linux/SDL_dbus.h
@@ -32,6 +32,7 @@
 
 typedef struct SDL_DBusContext {
     DBusConnection *session_conn;
+    DBusConnection *system_conn;
 
     DBusConnection *(*bus_get_private)(DBusBusType, DBusError *);
     dbus_bool_t (*bus_register)(DBusConnection *, DBusError *);