1 |
From 4d83b2d6a2322fb0b0397da05e6367ae42786835 Mon Sep 17 00:00:00 2001 |
diff -Naur xfce4-session-4.10.0/configure.in xfce4-session-4.10.0-magellan/configure.in |
2 |
From: Jérôme Guelfucci <jeromeg@xfce.org> |
--- xfce4-session-4.10.0/configure.in 2012-04-28 20:43:29.000000000 +0000 |
3 |
Date: Wed, 07 Nov 2012 09:25:09 +0000 |
+++ xfce4-session-4.10.0-magellan/configure.in 2013-01-09 11:44:52.749711440 +0000 |
4 |
Subject: Merge branch 'master' of ssh://git.xfce.org/xfce/xfce4-session |
@@ -101,6 +101,10 @@ |
|
|
|
|
--- |
|
|
diff --git a/configure.in.in b/configure.in.in |
|
|
index 9aa4f8f..134d0f7 100644 |
|
|
--- a/configure.in.in |
|
|
+++ b/configure.in.in |
|
|
@@ -96,6 +96,10 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) |
|
5 |
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) |
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) |
6 |
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) |
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) |
7 |
|
|
8 |
+dnl Check for polkit / systemd integration |
+dnl Check for polkit / systemd integration |
9 |
+XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], |
+XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], |
10 |
+ [systemd], [Systemd support (through polit)]) |
+ [systemd], [Systemd support (through polkit)]) |
11 |
+ |
+ |
12 |
dnl Check for debugging support |
dnl Check for gnome support |
13 |
XDT_FEATURE_DEBUG([xfsm_debug_default]) |
XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22], |
14 |
|
[libgnome-keyring], |
15 |
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am |
diff -Naur xfce4-session-4.10.0/xfce4-session/Makefile.am xfce4-session-4.10.0-magellan/xfce4-session/Makefile.am |
16 |
index c015154..f748b2b 100644 |
--- xfce4-session-4.10.0/xfce4-session/Makefile.am 2012-04-28 20:43:27.000000000 +0000 |
17 |
--- a/xfce4-session/Makefile.am |
+++ xfce4-session-4.10.0-magellan/xfce4-session/Makefile.am 2013-01-09 11:47:27.895720098 +0000 |
18 |
+++ b/xfce4-session/Makefile.am |
@@ -38,8 +38,6 @@ |
|
@@ -38,8 +38,6 @@ xfce4_session_SOURCES = \ |
|
19 |
xfsm-compat-gnome.h \ |
xfsm-compat-gnome.h \ |
20 |
xfsm-compat-kde.c \ |
xfsm-compat-kde.c \ |
21 |
xfsm-compat-kde.h \ |
xfsm-compat-kde.h \ |
24 |
xfsm-dns.c \ |
xfsm-dns.c \ |
25 |
xfsm-dns.h \ |
xfsm-dns.h \ |
26 |
xfsm-error.c \ |
xfsm-error.c \ |
27 |
@@ -65,6 +63,16 @@ xfce4_session_SOURCES = \ |
@@ -65,6 +63,16 @@ |
28 |
xfsm-upower.c \ |
xfsm-upower.c \ |
29 |
xfsm-upower.h |
xfsm-upower.h |
30 |
|
|
39 |
+endif |
+endif |
40 |
+ |
+ |
41 |
xfce4_session_CFLAGS = \ |
xfce4_session_CFLAGS = \ |
42 |
|
$(GNOME_KEYRING_CFLAGS) \ |
43 |
$(LIBSM_CFLAGS) \ |
$(LIBSM_CFLAGS) \ |
44 |
$(LIBX11_CFLAGS) \ |
@@ -73,6 +81,7 @@ |
|
@@ -72,6 +80,7 @@ xfce4_session_CFLAGS = \ |
|
45 |
$(DBUS_CFLAGS) \ |
$(DBUS_CFLAGS) \ |
46 |
$(DBUS_GLIB_CFLAGS) \ |
$(DBUS_GLIB_CFLAGS) \ |
47 |
$(LIBWNCK_CFLAGS) \ |
$(LIBWNCK_CFLAGS) \ |
49 |
$(XFCONF_CFLAGS) \ |
$(XFCONF_CFLAGS) \ |
50 |
$(GMODULE_CFLAGS) \ |
$(GMODULE_CFLAGS) \ |
51 |
$(PLATFORM_CFLAGS) |
$(PLATFORM_CFLAGS) |
52 |
@@ -91,6 +100,7 @@ xfce4_session_LDADD = \ |
@@ -92,6 +101,7 @@ |
53 |
$(DBUS_LIBS) \ |
$(DBUS_LIBS) \ |
54 |
$(DBUS_GLIB_LIBS) \ |
$(DBUS_GLIB_LIBS) \ |
55 |
$(LIBWNCK_LIBS) \ |
$(LIBWNCK_LIBS) \ |
56 |
+ $(SYSTEMD_LIBS) \ |
+ $(SYSTEMD_LIBS) \ |
57 |
$(XFCONF_LIBS) \ |
$(XFCONF_LIBS) \ |
58 |
|
$(GNOME_KEYRING_LIBS) \ |
59 |
-lm |
-lm |
60 |
|
diff -Naur xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c xfce4-session-4.10.0-magellan/xfce4-session/xfsm-shutdown.c |
61 |
diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c |
--- xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c 2012-04-28 20:43:27.000000000 +0000 |
62 |
index d8757a8..4c483a7 100644 |
+++ xfce4-session-4.10.0-magellan/xfce4-session/xfsm-shutdown.c 2013-01-09 11:51:43.085733211 +0000 |
|
--- a/xfce4-session/xfsm-shutdown.c |
|
|
+++ b/xfce4-session/xfsm-shutdown.c |
|
63 |
@@ -66,10 +66,13 @@ |
@@ -66,10 +66,13 @@ |
64 |
#include <xfce4-session/xfsm-fadeout.h> |
#include <xfce4-session/xfsm-fadeout.h> |
65 |
#include <xfce4-session/xfsm-global.h> |
#include <xfce4-session/xfsm-global.h> |
76 |
|
|
77 |
static void xfsm_shutdown_finalize (GObject *object); |
static void xfsm_shutdown_finalize (GObject *object); |
78 |
static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); |
static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); |
79 |
@@ -93,7 +96,11 @@ struct _XfsmShutdown |
@@ -93,7 +96,11 @@ |
80 |
{ |
{ |
81 |
GObject __parent__; |
GObject __parent__; |
82 |
|
|
88 |
XfsmUPower *upower; |
XfsmUPower *upower; |
89 |
|
|
90 |
/* kiosk settings */ |
/* kiosk settings */ |
91 |
@@ -131,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) |
@@ -131,7 +138,11 @@ |
92 |
{ |
{ |
93 |
XfceKiosk *kiosk; |
XfceKiosk *kiosk; |
94 |
|
|
100 |
shutdown->upower = xfsm_upower_get (); |
shutdown->upower = xfsm_upower_get (); |
101 |
shutdown->helper_state = SUDO_NOT_INITIAZED; |
shutdown->helper_state = SUDO_NOT_INITIAZED; |
102 |
shutdown->helper_require_password = FALSE; |
shutdown->helper_require_password = FALSE; |
103 |
@@ -150,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object) |
@@ -150,7 +161,11 @@ |
104 |
{ |
{ |
105 |
XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); |
XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); |
106 |
|
|
112 |
g_object_unref (G_OBJECT (shutdown->upower)); |
g_object_unref (G_OBJECT (shutdown->upower)); |
113 |
|
|
114 |
/* close down helper */ |
/* close down helper */ |
115 |
@@ -641,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown, |
@@ -641,7 +656,11 @@ |
116 |
if (shutdown->helper_state == SUDO_AVAILABLE) |
if (shutdown->helper_state == SUDO_AVAILABLE) |
117 |
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); |
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); |
118 |
else |
else |
124 |
} |
} |
125 |
|
|
126 |
|
|
127 |
@@ -658,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown, |
@@ -658,7 +677,11 @@ |
128 |
if (shutdown->helper_state == SUDO_AVAILABLE) |
if (shutdown->helper_state == SUDO_AVAILABLE) |
129 |
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); |
return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); |
130 |
else |
else |
136 |
} |
} |
137 |
|
|
138 |
|
|
139 |
@@ -698,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown, |
@@ -698,7 +721,11 @@ |
140 |
return TRUE; |
return TRUE; |
141 |
} |
} |
142 |
|
|
148 |
return TRUE; |
return TRUE; |
149 |
|
|
150 |
if (xfsm_shutdown_sudo_init (shutdown, error)) |
if (xfsm_shutdown_sudo_init (shutdown, error)) |
151 |
@@ -725,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown, |
@@ -725,7 +752,11 @@ |
152 |
return TRUE; |
return TRUE; |
153 |
} |
} |
154 |
|
|
160 |
return TRUE; |
return TRUE; |
161 |
|
|
162 |
if (xfsm_shutdown_sudo_init (shutdown, error)) |
if (xfsm_shutdown_sudo_init (shutdown, error)) |
163 |
diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c |
diff -Naur xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.c |
164 |
new file mode 100644 |
--- xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c 1970-01-01 00:00:00.000000000 +0000 |
165 |
index 0000000..7bdd39d |
+++ xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.c 2013-01-09 11:53:36.296738282 +0000 |
|
--- a/dev/null |
|
|
+++ b/xfce4-session/xfsm-systemd.c |
|
166 |
@@ -0,0 +1,229 @@ |
@@ -0,0 +1,229 @@ |
167 |
+/*- |
+/*- |
168 |
+ * Copyright (C) 2012 Christian Hesse |
+ * Copyright (C) 2012 Christian Hesse |
393 |
+ SYSTEMD_POWEROFF_TEST, |
+ SYSTEMD_POWEROFF_TEST, |
394 |
+ error); |
+ error); |
395 |
+} |
+} |
396 |
diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h |
diff -Naur xfce4-session-4.10.0/xfce4-session/xfsm-systemd.h xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.h |
397 |
new file mode 100644 |
--- xfce4-session-4.10.0/xfce4-session/xfsm-systemd.h 1970-01-01 00:00:00.000000000 +0000 |
398 |
index 0000000..8223622 |
+++ xfce4-session-4.10.0-magellan/xfce4-session/xfsm-systemd.h 2013-01-09 11:53:36.296738282 +0000 |
|
--- a/dev/null |
|
|
+++ b/xfce4-session/xfsm-systemd.h |
|
399 |
@@ -0,0 +1,55 @@ |
@@ -0,0 +1,55 @@ |
400 |
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- |
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- |
401 |
+ * |
+ * |
452 |
+G_END_DECLS |
+G_END_DECLS |
453 |
+ |
+ |
454 |
+#endif /* __XFSM_SYSTEMD_H__ */ |
+#endif /* __XFSM_SYSTEMD_H__ */ |
|
-- |
|
|
cgit v0.9.0.3 |
|