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
|
From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Mon, 8 Apr 2013 21:04:30 +0400
Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
---
configure.ac.in | 20 +++++++++++++++++
src/xfpm-power-common.h | 8 +++++++
src/xfpm-power.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/src/xfpm-power-common.h b/src/xfpm-power-common.h
index 1040aed..11eaedc 100644
--- a/src/xfpm-power-common.h
+++ b/src/xfpm-power-common.h
@@ -33,9 +33,17 @@
#define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups"
#define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups"
+#ifdef WITH_SLEEP_MANAGER_UPOWER
#define POLKIT_AUTH_SUSPEND "org.freedesktop.upower.suspend"
#define POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate"
+#else
+#define LOGIND_NAME "org.freedesktop.login1"
+#define LOGIND_PATH "/org/freedesktop/login1"
+#define LOGIND_IFACE "org.freedesktop.login1.Manager"
+#define POLKIT_AUTH_SUSPEND "org.freedesktop.login1.suspend"
+#define POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate"
+#endif
GPtrArray *xfpm_power_enumerate_devices (DBusGProxy *proxy);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index 796bef8..4a91e33 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -72,7 +72,10 @@ struct XfpmPowerPrivate
DBusGProxy *proxy;
DBusGProxy *proxy_prop;
-
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ DBusGProxy *proxy_logind;
+#endif
+
GHashTable *hash;
XfpmConsoleKit *console;
@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower *power)
}
#endif
+#ifdef WITH_SLEEP_MANAGER_UPOWER
static void
xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
{
@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
power->priv->can_hibernate = ret;
}
}
+#else
+static gboolean
+xfpm_power_can_sleep_method (XfpmPower *power, const char *method)
+{
+ GError *error = NULL;
+ char *retstr = NULL;
+ gboolean ret = FALSE;
+
+ if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error,
+ G_TYPE_INVALID,
+ G_TYPE_STRING, &retstr,
+ G_TYPE_INVALID))
+ {
+ g_warning ("Unable to check %s method: %s", method, error->message);
+ g_error_free (error);
+
+ return FALSE;
+ }
+
+ if (retstr && !strcmp (retstr, "yes"))
+ ret = TRUE;
+ g_free (retstr);
+
+ return ret;
+}
+#endif
static void
xfpm_power_check_power (XfpmPower *power, GHashTable *props)
@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *power)
props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE);
+#ifdef WITH_SLEEP_MANAGER_UPOWER
xfpm_power_check_pm (power, props);
+#else
+ power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend");
+ power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate");
+#endif
xfpm_power_check_lid (power, props);
xfpm_power_check_power (power, props);
@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
xfpm_lock_screen ();
}
+#ifdef WITH_SLEEP_MANAGER_UPOWER
dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
G_TYPE_INVALID,
G_TYPE_INVALID);
+#else
+ dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error,
+ G_TYPE_BOOLEAN, TRUE,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+#endif
if ( error )
{
@@ -1360,12 +1402,20 @@ xfpm_power_init (XfpmPower *power)
UPOWER_NAME,
UPOWER_PATH,
DBUS_INTERFACE_PROPERTIES);
+
if (power->priv->proxy_prop == NULL)
{
g_critical ("Unable to create proxy for %s", UPOWER_NAME);
goto out;
}
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus,
+ LOGIND_NAME,
+ LOGIND_PATH,
+ LOGIND_IFACE);
+#endif
+
xfpm_power_get_power_devices (power);
xfpm_power_get_properties (power);
#ifdef ENABLE_POLKIT
@@ -1467,6 +1517,11 @@ xfpm_power_finalize (GObject *object)
if ( power->priv->proxy_prop )
g_object_unref (power->priv->proxy_prop);
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ if ( power->priv->proxy_logind )
+ g_object_unref (power->priv->proxy_logind);
+#endif
+
g_hash_table_destroy (power->priv->hash);
#ifdef ENABLE_POLKIT
--
1.8.1.5
|
