Magellan Linux

Contents of /trunk/xfce4-session/patches/xfce4-session-4.10.0-systemd-drop-consolekit.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1918 - (show annotations) (download)
Sat Oct 20 12:27:45 2012 UTC (11 years, 6 months ago) by niro
File size: 1973 byte(s)
-added patch enhancements to drop consolekit
1 diff -Naur xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.c
2 --- xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c 2012-10-20 16:27:39.774983068 +0200
3 +++ xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.c 2012-10-20 16:31:12.382983069 +0200
4 @@ -45,7 +45,7 @@
5 proxy = g_new0 (SystemdProxy, 1);
6
7 proxy->authority = polkit_authority_get_sync (NULL, NULL);
8 - proxy->subject = polkit_unix_session_new_for_process_sync (getpid(), NULL, NULL);
9 + proxy->subject = polkit_unix_process_new (getpid());
10
11 return proxy;
12 }
13 @@ -100,13 +100,13 @@
14 GDBusConnection *bus;
15
16 bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
17 - g_dbus_connection_call (bus,
18 - SYSTEMD_DBUS_NAME,
19 - SYSTEMD_DBUS_PATH,
20 - SYSTEMD_DBUS_INTERFACE,
21 - method,
22 - g_variant_new ("(b)", TRUE),
23 - NULL, 0, G_MAXINT, NULL, NULL, NULL);
24 + g_dbus_connection_call_sync (bus,
25 + SYSTEMD_DBUS_NAME,
26 + SYSTEMD_DBUS_PATH,
27 + SYSTEMD_DBUS_INTERFACE,
28 + method,
29 + g_variant_new ("(b)", TRUE),
30 + NULL, 0, G_MAXINT, NULL, NULL);
31 g_object_unref (bus);
32
33 return TRUE;
34 @@ -114,10 +114,10 @@
35
36 gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
37 {
38 - return systemd_proxy_method(proxy, "Restart", error);
39 + return systemd_proxy_method(proxy, "Reboot", error);
40 }
41
42 gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
43 {
44 - return systemd_proxy_method(proxy, "Shutdown", error);
45 + return systemd_proxy_method(proxy, "PowerOff", error);
46 }