Attachment 136928 Details for Bug 104759 – [PATCH] Revert "systemd-logind: Monitor systemd-logind going away"

[patch] [PATCH] Revert "systemd-logind: Monitor systemd-logind going away"

0001-Revert-systemd-logind-Monitor-systemd-logind-going-a.patch (text/plain), 2.89 KB, created by Michael Biebl on 2018-01-24 03:47:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Biebl

Created: 2018-01-24 03:47:38 UTC

Size: 2.89 KB

patch

obsolete

>From 0cc2e35edda2cd2f6ee2923bba7feeb619e52158 Mon Sep 17 00:00:00 2001
>From: Michael Biebl <biebl@debian.org>
>Date: Wed, 24 Jan 2018 04:05:47 +0100
>Subject: [PATCH] Revert "systemd-logind: Monitor systemd-logind going away"
>
>This reverts commit dc48bd653c7e1013e2d69e3f59ae3cbc0c893473.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=104759
>---
> hw/xfree86/os-support/linux/systemd-logind.c | 35 +---------------------------
> 1 file changed, 1 insertion(+), 34 deletions(-)
>
>diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
>index 13784d15c..93428ba73 100644
>--- a/hw/xfree86/os-support/linux/systemd-logind.c
>+++ b/hw/xfree86/os-support/linux/systemd-logind.c
>@@ -313,35 +313,11 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
>     dbus_int32_t major, minor;
>     char *pause_str;
> 
>-    if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
>+    if (strcmp(dbus_message_get_path(message), info->session) != 0)
>         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
> 
>     dbus_error_init(&error);
> 
>-    if (dbus_message_is_signal(message,
>-                               "org.freedesktop.DBus", "NameOwnerChanged")) {
>-        char *name, *old_owner, *new_owner;
>-
>-        dbus_message_get_args(message, &error,
>-                              DBUS_TYPE_STRING, &name,
>-                              DBUS_TYPE_STRING, &old_owner,
>-                              DBUS_TYPE_STRING, &new_owner, DBUS_TYPE_INVALID);
>-        if (dbus_error_is_set(&error)) {
>-            LogMessage(X_ERROR, "systemd-logind: NameOwnerChanged: %s\n",
>-                       error.message);
>-            dbus_error_free(&error);
>-            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>-        }
>-
>-        if (name && strcmp(name, "org.freedesktop.login1") == 0)
>-            FatalError("systemd-logind disappeared (stopped/restarted?)\n");
>-
>-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>-    }
>-
>-    if (strcmp(dbus_message_get_path(message), info->session) != 0)
>-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>-
>     if (dbus_message_is_signal(message, "org.freedesktop.login1.Session",
>                                "PauseDevice")) {
>         if (!dbus_message_get_args(message, &error,
>@@ -499,15 +475,6 @@ connect_hook(DBusConnection *connection, void *data)
>         goto cleanup;
>     }
> 
>-    dbus_bus_add_match(connection,
>-        "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',path='/org/freedesktop/DBus'",
>-        &error);
>-    if (dbus_error_is_set(&error)) {
>-        LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
>-                   error.message);
>-        goto cleanup;
>-    }
>-
>     dbus_bus_add_match(connection,
>         "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='PauseDevice'",
>         &error);
>-- 
>2.15.1
>

Actions: View | Splinter Review

Attachments on bug 104759: 136928

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.