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
|
diff -u -Nr gnome-settings-daemon-3.3.91/configure.ac gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac
--- gnome-settings-daemon-3.3.91/configure.ac 2012-03-05 19:13:16.000000000 +0100
+++ gnome-settings-daemon-3.3.91-systemd-fallback/configure.ac 2012-03-10 16:20:31.417634553 +0100
@@ -298,7 +298,7 @@
[with_systemd=$enableval],
[with_systemd=no])
if test "$with_systemd" = "yes" ; then
- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
SESSION_TRACKING=systemd
else
diff -u -Nr gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c
--- gnome-settings-daemon-3.3.91/gnome-settings-daemon/gnome-settings-session.c 2012-02-01 20:33:14.000000000 +0100
+++ gnome-settings-daemon-3.3.91-systemd-fallback/gnome-settings-daemon/gnome-settings-session.c 2012-03-10 16:21:35.930442794 +0100
@@ -30,6 +30,7 @@
#include "gnome-settings-session.h"
#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
typedef struct
@@ -130,10 +131,9 @@
{
#ifdef HAVE_SYSTEMD
GSource *sd_source;
-#else
+#endif
GDBusProxy *proxy_session;
GCancellable *cancellable;
-#endif
gchar *session_id;
GnomeSettingsSessionState state;
};
@@ -237,7 +237,7 @@
return TRUE;
}
-#else /* HAVE_SYSTEMD */
+#endif /* HAVE_SYSTEMD */
static void
gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
@@ -371,35 +371,38 @@
g_object_unref (proxy_manager);
}
-#endif /* HAVE_SYSTEMD */
-
static void
gnome_settings_session_init (GnomeSettingsSession *session)
{
session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
#ifdef HAVE_SYSTEMD
- sd_pid_get_session (getpid(), &session->priv->session_id);
+ session->priv->sd_source = NULL;
- session->priv->sd_source = sd_source_new ();
- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
- g_source_attach (session->priv->sd_source, NULL);
+ if (sd_booted () > 0) {
+ sd_pid_get_session (getpid(), &session->priv->session_id);
- sessions_changed (session);
-#else
- session->priv->cancellable = g_cancellable_new ();
+ session->priv->sd_source = sd_source_new ();
+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
+ g_source_attach (session->priv->sd_source, NULL);
- /* connect to ConsoleKit */
- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- NULL,
- CONSOLEKIT_NAME,
- CONSOLEKIT_MANAGER_PATH,
- CONSOLEKIT_MANAGER_INTERFACE,
- session->priv->cancellable,
- got_manager_proxy_cb,
- session);
+ sessions_changed (session);
+ } else
#endif
+ {
+ session->priv->cancellable = g_cancellable_new ();
+
+ /* connect to ConsoleKit */
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
+ CONSOLEKIT_NAME,
+ CONSOLEKIT_MANAGER_PATH,
+ CONSOLEKIT_MANAGER_INTERFACE,
+ session->priv->cancellable,
+ got_manager_proxy_cb,
+ session);
+ }
}
static void
@@ -415,14 +418,15 @@
if (session->priv->sd_source != NULL) {
g_source_destroy (session->priv->sd_source);
g_source_unref (session->priv->sd_source);
- }
-#else
- g_cancellable_cancel (session->priv->cancellable);
-
- if (session->priv->proxy_session != NULL)
- g_object_unref (session->priv->proxy_session);
- g_object_unref (session->priv->cancellable);
+ } else
#endif
+ {
+ g_cancellable_cancel (session->priv->cancellable);
+
+ if (session->priv->proxy_session != NULL)
+ g_object_unref (session->priv->proxy_session);
+ g_object_unref (session->priv->cancellable);
+ }
G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
}
diff -u -Nr gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c
--- gnome-settings-daemon-3.3.91/plugins/power/gsd-power-manager.c 2012-03-05 18:27:43.000000000 +0100
+++ gnome-settings-daemon-3.3.91-systemd-fallback/plugins/power/gsd-power-manager.c 2012-03-10 16:20:31.417634553 +0100
@@ -2031,7 +2031,7 @@
g_object_unref (bus);
}
-#else
+#endif
static void
consolekit_stop_cb (GObject *source_object,
@@ -2081,7 +2081,6 @@
consolekit_stop_cb, NULL);
g_object_unref (proxy);
}
-#endif
static void
upower_sleep_cb (GObject *source_object,
@@ -2135,10 +2134,11 @@
* hibernate is not available and is marginally better
* than just powering down the computer mid-write */
#ifdef HAVE_SYSTEMD
- systemd_stop ();
-#else
- consolekit_stop ();
+ if (sd_booted () > 0)
+ systemd_stop ();
+ else
#endif
+ consolekit_stop ();
break;
case GSD_POWER_ACTION_BLANK:
ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
|
