1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
From b076b5592579b397b7d4888eb8062e646b9a4dec Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Wed, 10 Apr 2013 17:10:09 +0400
Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
---
xfce4-session/Makefile.am | 8 +++----
xfce4-session/xfsm-shutdown.c | 42 +++++++++++++++++++++++++++-------
xfce4-session/xfsm-systemd.c | 52 +++++++++++++++++++++++++++++++++++++++++++
xfce4-session/xfsm-systemd.h | 14 ++++++++++++
4 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index 5472b33..5e2973b 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -59,9 +59,7 @@ xfce4_session_SOURCES = \
xfsm-splash-screen.c \
xfsm-splash-screen.h \
xfsm-startup.c \
- xfsm-startup.h \
- xfsm-upower.c \
- xfsm-upower.h
+ xfsm-startup.h
if HAVE_SYSTEMD
xfce4_session_SOURCES += \
@@ -70,7 +68,9 @@ xfce4_session_SOURCES += \
else
xfce4_session_SOURCES += \
xfsm-consolekit.c \
- xfsm-consolekit.h
+ xfsm-consolekit.h \
+ xfsm-upower.c \
+ xfsm-upower.h
endif
xfce4_session_CFLAGS = \
diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
index 4c483a7..8a2ba8d 100644
--- a/xfce4-session/xfsm-shutdown.c
+++ b/xfce4-session/xfsm-shutdown.c
@@ -66,12 +66,12 @@
#include <xfce4-session/xfsm-fadeout.h>
#include <xfce4-session/xfsm-global.h>
#include <xfce4-session/xfsm-legacy.h>
-#include <xfce4-session/xfsm-upower.h>
#ifdef HAVE_SYSTEMD
#include <xfce4-session/xfsm-systemd.h>
#else
#include <xfce4-session/xfsm-consolekit.h>
+#include <xfce4-session/xfsm-upower.h>
#endif
static void xfsm_shutdown_finalize (GObject *object);
@@ -100,8 +100,8 @@ struct _XfsmShutdown
XfsmSystemd *systemd;
#else
XfsmConsolekit *consolekit;
-#endif
XfsmUPower *upower;
+#endif
/* kiosk settings */
gboolean kiosk_can_shutdown;
@@ -142,8 +142,8 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
shutdown->systemd = xfsm_systemd_get ();
#else
shutdown->consolekit = xfsm_consolekit_get ();
-#endif
shutdown->upower = xfsm_upower_get ();
+#endif
shutdown->helper_state = SUDO_NOT_INITIAZED;
shutdown->helper_require_password = FALSE;
@@ -165,8 +165,8 @@ xfsm_shutdown_finalize (GObject *object)
g_object_unref (G_OBJECT (shutdown->systemd));
#else
g_object_unref (G_OBJECT (shutdown->consolekit));
-#endif
g_object_unref (G_OBJECT (shutdown->upower));
+#endif
/* close down helper */
xfsm_shutdown_sudo_free (shutdown);
@@ -692,7 +692,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown,
{
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+#ifdef HAVE_SYSTEMD
+ return xfsm_systemd_try_suspend (shutdown->systemd, error);
+#else
return xfsm_upower_try_suspend (shutdown->upower, error);
+#endif
}
@@ -703,7 +707,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown,
{
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
+#ifdef HAVE_SYSTEMD
+ return xfsm_systemd_try_hibernate (shutdown->systemd, error);
+#else
return xfsm_upower_try_hibernate (shutdown->upower, error);
+#endif
}
@@ -776,6 +784,8 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
gboolean *auth_suspend,
GError **error)
{
+ gboolean ret;
+
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
@@ -784,8 +794,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown,
return TRUE;
}
- return xfsm_upower_can_suspend (shutdown->upower, can_suspend,
- auth_suspend, error);
+#ifdef HAVE_SYSTEMD
+ ret = xfsm_systemd_can_suspend (shutdown->systemd, can_suspend, error);
+ *auth_suspend = *can_suspend;
+#else
+ ret = xfsm_upower_can_suspend (shutdown->upower, can_suspend,
+ auth_suspend, error);
+#endif
+
+ return ret;
}
@@ -796,6 +813,8 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
gboolean *auth_hibernate,
GError **error)
{
+ gboolean ret;
+
g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE);
if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL))
@@ -804,8 +823,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown,
return TRUE;
}
- return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
- auth_hibernate, error);
+#ifdef HAVE_SYSTEMD
+ ret = xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate, error);
+ *auth_hibernate = *can_hibernate;
+#else
+ ret = xfsm_upower_can_hibernate (shutdown->upower, can_hibernate,
+ auth_hibernate, error);
+#endif
+
+ return ret;
}
diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
index 7bdd39d..cfe7bf4 100644
--- a/xfce4-session/xfsm-systemd.c
+++ b/xfce4-session/xfsm-systemd.c
@@ -33,8 +33,12 @@
#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager"
#define SYSTEMD_REBOOT_ACTION "Reboot"
#define SYSTEMD_POWEROFF_ACTION "PowerOff"
+#define SYSTEMD_SUSPEND_ACTION "Suspend"
+#define SYSTEMD_HIBERNATE_ACTION "Hibernate"
#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot"
#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off"
+#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend"
+#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate"
@@ -205,6 +209,28 @@ xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
gboolean
+xfsm_systemd_try_suspend (XfsmSystemd *systemd,
+ GError **error)
+{
+ return xfsm_systemd_try_method (systemd,
+ SYSTEMD_SUSPEND_ACTION,
+ error);
+}
+
+
+
+gboolean
+xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
+ GError **error)
+{
+ return xfsm_systemd_try_method (systemd,
+ SYSTEMD_HIBERNATE_ACTION,
+ error);
+}
+
+
+
+gboolean
xfsm_systemd_can_restart (XfsmSystemd *systemd,
gboolean *can_restart,
GError **error)
@@ -227,3 +253,29 @@ xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
SYSTEMD_POWEROFF_TEST,
error);
}
+
+
+
+gboolean
+xfsm_systemd_can_suspend (XfsmSystemd *systemd,
+ gboolean *can_suspend,
+ GError **error)
+{
+ return xfsm_systemd_can_method (systemd,
+ can_suspend,
+ SYSTEMD_SUSPEND_TEST,
+ error);
+}
+
+
+
+gboolean
+xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
+ gboolean *can_hibernate,
+ GError **error)
+{
+ return xfsm_systemd_can_method (systemd,
+ can_hibernate,
+ SYSTEMD_HIBERNATE_TEST,
+ error);
+}
diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
index 8223622..6cf803f 100644
--- a/xfce4-session/xfsm-systemd.h
+++ b/xfce4-session/xfsm-systemd.h
@@ -42,6 +42,12 @@ gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd,
gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd,
GError **error);
+gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd,
+ GError **error);
+
+gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd,
+ GError **error);
+
gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd,
gboolean *can_restart,
GError **error);
@@ -50,6 +56,14 @@ gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd,
gboolean *can_shutdown,
GError **error);
+gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd,
+ gboolean *can_suspend,
+ GError **error);
+
+gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd,
+ gboolean *can_hibernate,
+ GError **error);
+
G_END_DECLS
#endif /* __XFSM_SYSTEMD_H__ */
--
1.8.1.5
|
