summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2014-04-29 13:45:23 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2015-01-14 14:31:09 +1000
commit2ee096821fcba42212660c72d16791fb08457efc (patch)
tree4add409a7ebd33adfa478eac2f3a4eff0cb9ac5d
parentb091c3d6bddaa7047bf37735fc4b2ce537e99819 (diff)
xfree86: make sure dbus and logind wakeup handlers are reset on regeneration
The X server implicitly unregisters all wake up handlers as part of its regeneration process on reset. This commit makes sure the handlers get resetup when that happens, so dbus and logind monitoring still function after a server reset. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/xfree86/common/xf86Init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 017dcb6bb..1494aac09 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -778,6 +778,9 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
else {
+ dbus_core_init();
+ systemd_logind_init();
+
/*
* serverGeneration != 1; some OSs have to do things here, too.
*/