diff options
author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-05-02 12:24:36 -0500 |
---|---|---|
committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-05-02 12:24:36 -0500 |
commit | bb9f2116959e29459d2fcc8fec1e6308936d6bcb (patch) | |
tree | 571f69b445415a1cfa8833fdf51291b1ab2ec1f4 /user/mate-session-manager/no-systemd.patch | |
parent | 71632df0ba3a9d5084bf4227a6c04da98fb170ba (diff) | |
download | packages-bb9f2116959e29459d2fcc8fec1e6308936d6bcb.tar.gz packages-bb9f2116959e29459d2fcc8fec1e6308936d6bcb.tar.bz2 packages-bb9f2116959e29459d2fcc8fec1e6308936d6bcb.tar.xz packages-bb9f2116959e29459d2fcc8fec1e6308936d6bcb.zip |
user/mate-session-manager: upgrade to 1.22.1
Diffstat (limited to 'user/mate-session-manager/no-systemd.patch')
-rw-r--r-- | user/mate-session-manager/no-systemd.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/user/mate-session-manager/no-systemd.patch b/user/mate-session-manager/no-systemd.patch deleted file mode 100644 index 79c19f34a..000000000 --- a/user/mate-session-manager/no-systemd.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 254a091b31517a25bc037b31daff27fbb74ac90d Mon Sep 17 00:00:00 2001 -From: Victor Kareh <vkareh@redhat.com> -Date: Wed, 6 Mar 2019 09:20:36 -0500 -Subject: [PATCH] Guard against missing systemd - ---- - mate-session/gsm-systemd.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c -index da3f23b..d03cafd 100644 ---- a/mate-session/gsm-systemd.c -+++ b/mate-session/gsm-systemd.c -@@ -429,16 +429,31 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - gboolean is_last_session; - int ret, i; - -+#ifdef HAVE_SYSTEMD - ret = sd_pid_get_session (getpid (), &session); -+#endif -+ -+ if (session == NULL) { -+ return FALSE; -+ } - - if (ret != 0) { -+ free (session); - return FALSE; - } - -+#ifdef HAVE_SYSTEMD - ret = sd_uid_get_sessions (getuid (), FALSE, &sessions); -+#endif -+ -+ if (sessions == NULL) { -+ free (session); -+ return FALSE; -+ } - - if (ret <= 0) { - free (session); -+ free (sessions); - return FALSE; - } - -@@ -450,7 +465,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - if (g_strcmp0 (sessions[i], session) == 0) - continue; - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_state (sessions[i], &state); -+#endif - - if (ret != 0) - continue; -@@ -461,7 +478,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - } - free (state); - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_type (sessions[i], &type); -+#endif - - if (ret != 0) - continue; |