Thu Mar 7 01:26:46 2019 UTC ()
mate-session-manager: simplify patch (NFCI)

I misconstrued a detail about systemd handling code elsewhere in the
file by over-thinking things, and introduced some redundancies here.


(gutteridge)
diff -r1.6 -r1.7 pkgsrc/x11/mate-session-manager/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/mate-session-manager/patches/patch-mate-session_gsm-systemd.c
cvs diff -r1.6 -r1.7 pkgsrc/x11/mate-session-manager/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/mate-session-manager/distinfo 2019/03/06 08:14:33 1.6
+++ pkgsrc/x11/mate-session-manager/distinfo 2019/03/07 01:26:46 1.7
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.6 2019/03/06 08:14:33 gutteridge Exp $ 1$NetBSD: distinfo,v 1.7 2019/03/07 01:26:46 gutteridge Exp $
2 2
3SHA1 (mate-session-manager-1.22.0.tar.xz) = f23b6cd78b5aa81052e10dde3e9504089a34278f 3SHA1 (mate-session-manager-1.22.0.tar.xz) = f23b6cd78b5aa81052e10dde3e9504089a34278f
4RMD160 (mate-session-manager-1.22.0.tar.xz) = 1fbd9219b1da23f0117c80d1e483b64274ec5c00 4RMD160 (mate-session-manager-1.22.0.tar.xz) = 1fbd9219b1da23f0117c80d1e483b64274ec5c00
5SHA512 (mate-session-manager-1.22.0.tar.xz) = 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a 5SHA512 (mate-session-manager-1.22.0.tar.xz) = 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
6Size (mate-session-manager-1.22.0.tar.xz) = 603016 bytes 6Size (mate-session-manager-1.22.0.tar.xz) = 603016 bytes
7SHA1 (patch-mate-session_gsm-systemd.c) = 087b0d7de9b8f23ec0876d3c1d86d12aeb92f933 7SHA1 (patch-mate-session_gsm-systemd.c) = 9399fff5f15d883c60d4f9fef433f7d435883db2
cvs diff -r1.2 -r1.3 pkgsrc/x11/mate-session-manager/patches/Attic/patch-mate-session_gsm-systemd.c (expand / switch to unified diff)

--- pkgsrc/x11/mate-session-manager/patches/Attic/patch-mate-session_gsm-systemd.c 2019/03/06 08:12:36 1.2
+++ pkgsrc/x11/mate-session-manager/patches/Attic/patch-mate-session_gsm-systemd.c 2019/03/07 01:26:46 1.3
@@ -1,53 +1,47 @@ @@ -1,53 +1,47 @@
1$NetBSD: patch-mate-session_gsm-systemd.c,v 1.2 2019/03/06 08:12:36 gutteridge Exp $ 1$NetBSD: patch-mate-session_gsm-systemd.c,v 1.3 2019/03/07 01:26:46 gutteridge Exp $
2 2
3Deal with systemd-only function calls. 3Deal with systemd-only function calls.
4 4
5--- mate-session/gsm-systemd.c.orig 2019-02-10 13:54:15.000000000 +0000 5--- mate-session/gsm-systemd.c.orig 2019-02-10 13:54:15.000000000 +0000
6+++ mate-session/gsm-systemd.c 6+++ mate-session/gsm-systemd.c
7@@ -427,15 +427,25 @@ gsm_systemd_is_last_session_for_user (Gs 7@@ -427,15 +427,19 @@ gsm_systemd_is_last_session_for_user (Gs
8 char **sessions = NULL; 8 char **sessions = NULL;
9 char *session = NULL; 9 char *session = NULL;
10 gboolean is_last_session; 10 gboolean is_last_session;
11- int ret, i; 11- int ret, i;
12+ int ret = 0, i; 12+ int ret = 1, i;
13  13
14+#ifdef HAVE_SYSTEMD 14+#ifdef HAVE_SYSTEMD
15 ret = sd_pid_get_session (getpid (), &session); 15 ret = sd_pid_get_session (getpid (), &session);
16+#endif 16+#endif
17+ 
18+ if (session == NULL) 
19+ return FALSE; 
20  17
21 if (ret != 0) { 18 if (ret != 0) {
22 return FALSE; 19 return FALSE;
23 } 20 }
24  21
25+#ifdef HAVE_SYSTEMD 22+#ifdef HAVE_SYSTEMD
26 ret = sd_uid_get_sessions (getuid (), FALSE, &sessions); 23 ret = sd_uid_get_sessions (getuid (), FALSE, &sessions);
27+#endif 24+#endif
28+ 
29+ if (sessions == NULL) 
30+ return FALSE; 
31  25
32 if (ret <= 0) { 26 if (ret <= 0) {
33 free (session); 27 free (session);
34@@ -450,7 +460,9 @@ gsm_systemd_is_last_session_for_user (Gs 28@@ -450,7 +454,9 @@ gsm_systemd_is_last_session_for_user (Gs
35 if (g_strcmp0 (sessions[i], session) == 0) 29 if (g_strcmp0 (sessions[i], session) == 0)
36 continue; 30 continue;
37  31
38+#ifdef HAVE_SYSTEMD 32+#ifdef HAVE_SYSTEMD
39 ret = sd_session_get_state (sessions[i], &state); 33 ret = sd_session_get_state (sessions[i], &state);
40+#endif 34+#endif
41  35
42 if (ret != 0) 36 if (ret != 0)
43 continue; 37 continue;
44@@ -461,7 +473,9 @@ gsm_systemd_is_last_session_for_user (Gs 38@@ -461,7 +467,9 @@ gsm_systemd_is_last_session_for_user (Gs
45 } 39 }
46 free (state); 40 free (state);
47  41
48+#ifdef HAVE_SYSTEMD 42+#ifdef HAVE_SYSTEMD
49 ret = sd_session_get_type (sessions[i], &type); 43 ret = sd_session_get_type (sessions[i], &type);
50+#endif 44+#endif
51  45
52 if (ret != 0) 46 if (ret != 0)
53 continue; 47 continue;