Attachment 135061 Details for Bug 103464 – move dbus init/fini calls

[patch] move dbus init/fini calls

dbus-fixup.patch (text/plain), 997 bytes, created by alexander.elbs on 2017-10-26 13:11:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alexander.elbs

Created: 2017-10-26 13:11:32 UTC

Size: 997 bytes

patch

obsolete

>diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
>index 35e12e703..017dcb6bb 100644
>--- a/hw/xfree86/common/xf86Init.c
>+++ b/hw/xfree86/common/xf86Init.c
>@@ -393,8 +393,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
> 
>     config_pre_init();
> 
>-    dbus_core_init();
>-
>     if (serverGeneration == 1) {
>         if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
>             xf86ServerName++;
>@@ -442,6 +440,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
>         if (xf86DoShowOptions)
>             DoShowOptions();
> 
>+        dbus_core_init();
>         systemd_logind_init();
> 
>         /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
>@@ -976,7 +975,6 @@ CloseInput(void)
> {
>     config_fini();
>     mieqFini();
>-    dbus_core_fini();
> }
> 
> /*
>@@ -1058,6 +1056,7 @@ ddxGiveUp(enum ExitCode error)
>         xf86CloseConsole();
> 
>     systemd_logind_fini();
>+    dbus_core_fini();
> 
>     xf86CloseLog(error);
>

Actions: View | Splinter Review

Attachments on bug 103464: 135061

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.