We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] make system bus optional

sdl_dbus_nosystem.diff (text/plain), 1.10 KB, created by tamo on 2019-09-07 06:41:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tamo

Created: 2019-09-07 06:41:00 UTC

Size: 1.10 KB

patch

obsolete

>diff -r bfed06214c2a src/core/linux/SDL_dbus.c
>--- a/src/core/linux/SDL_dbus.c	Tue Aug 27 11:38:43 2019 +0200
>+++ b/src/core/linux/SDL_dbus.c	Sat Sep 07 15:13:08 2019 +0900
>@@ -114,17 +114,20 @@
>     if (!dbus.session_conn && LoadDBUSLibrary() != -1) {
>         DBusError err;
>         dbus.error_init(&err);
>+        /* session bus is required */
>         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);
>             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);
>+        /* system bus is optional */
>+        dbus.system_conn = dbus.bus_get_private(DBUS_BUS_SYSTEM, &err);
>+        if (!dbus.error_is_set(&err)) {
>+            dbus.connection_set_exit_on_disconnect(dbus.system_conn, 0);
>+        }
>+        dbus.error_free(&err);
>     }
> }
>

Actions: View | Diff

Attachments on bug 4795: 3957

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.