Do not always save session with xfce4-logout-plugin (Upstream #7915)

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 145 insertions, 9 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 9cadd77f6d77..612aa2aba386 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.150 2012/02/12 17:56:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.151 2012/02/24 11:41:33 ssuominen Exp $
+
+*xfce4-session-4.8.3-r1 (24 Feb 2012)
+
+  24 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-session-4.8.3-r1.ebuild,
+  +files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch:
+  Do not always save session with xfce4-logout-plugin (Upstream #7915)
 
 *xfce4-session-4.8.3 (12 Feb 2012)
 
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 1ee9600a108e..e04131515fb0 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch 2518 RMD160 1f2f882596b8377390483a202db038e953e953b4 SHA1 a3ec4b6d544df69738f019ef15cf7f7ff35bd85d SHA256 1730d204241bdbcb022627e653138a912f19b33bbb2d109b8fddaf9319320987
 DIST xfce4-session-4.8.2.tar.bz2 1607774 RMD160 43bbbe64a99efbd655ce5949b0402b0b4c57f5d6 SHA1 636c2983552861a959225e554898675152a4d812 SHA256 31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0
 DIST xfce4-session-4.8.3.tar.bz2 1594643 RMD160 fe0f3e7c59a0e7e7ac5a1d23cde48b0bb06290ee SHA1 8b5e525005978cffb45a921f687e57a9ade70043 SHA256 f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338
 EBUILD xfce4-session-4.8.2.ebuild 1633 RMD160 71b02cc238c60ee10fddc75e58722f0897220147 SHA1 f6f62b6aa54bcf3c9a5ae8081227ef7ce64c21b1 SHA256 dcfffb738a97d274ef1dc1bc1458540b408931dff66a0c578f8c71d26cf85681
+EBUILD xfce4-session-4.8.3-r1.ebuild 1728 RMD160 c0fc6393a2681eba42a2aab7de15802dae8896ea SHA1 351bcdce9164843d4c2018c0270c07cd251a2147 SHA256 de9207100f4d65f4a912a815417125c8af9ed3f6cfa5774af7602efe874a3031
 EBUILD xfce4-session-4.8.3.ebuild 1650 RMD160 36ad371392f550d9428c60cde94e76bd09807b56 SHA1 075ca5d06969adab115f85cc3ac59ff912ff0694 SHA256 c22798e6f2235acbe8e9c9406cc1d28919fed1275eb3b8ddfb425c8b7e3940aa
-MISC ChangeLog 19467 RMD160 7f8df3f28f5054300c8a4df79f0d30ecc1001bb7 SHA1 53bdd145d918e92f430e7063910c28a3e8609aa6 SHA256 c6238c33999b84eb70cf09f89541b2b9e6c1fb5a5c183b0f5858b757e93ac0e0
+MISC ChangeLog 19738 RMD160 e7adaa76ebbca7d26f8b50254e118707f1c4ecc5 SHA1 98efe6dbefcdd99775d68da50010bdd98a6a4fc3 SHA256 b50b8002e826e82834ab1ba544ac7c5dd6c460f6c9d12b85f45944aa6ddad71a
 MISC metadata.xml 390 RMD160 60014a1bb67add6ba335edff1c52cd9a1e39ec3f SHA1 a929c70f63bb91baa9dccb456ec26f5586fa1a4c SHA256 1d122a4418cea15fd68cb18d3c1b6db5120ac2109f228fbf6805967d9cb1431c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPN/yUAAoJEEdUh39IaPFNLT0IAIrGJ/nSvvSjvMbBwqcRVMLm
-kGSKeX0dt7uCUKLPBdPx+EynNh7VUJSVz4NlKt1g+DxpOZyUGbTVo5FoIDOzmoeF
-g4d0OId/iq5hAURu7Sy2WOidGmoEmF/j9uLICJgqSYx49CkrfLG8habYCBfeD9a6
-94Ww0L3Y8d1gqpkDRaiTKNinxAyYhQEy8iME51/tiQuKoLdjHih9dxM3DM2e4NCX
-rt7wSpa2/tpt6zvtDZZ7jGrYpL3+L7QaPd6u4c0PWdCq7GsG5g9Zc49KC4MNOHo2
-JT4mfxdhjhN4v5XW0e+DWqC0qbAl4131PYTPXG61eg+ZQKAP86NZhjvHMWTPFrw=
-=fx/l
+iQEcBAEBAgAGBQJPR3diAAoJEEdUh39IaPFNO+MH/jz5onwGRprF1nIHKe7pRmaD
+6DCHz5eSF2pQFp1ZDhrB711DwGliBtfgwVKaGPoU//45PQ0IDOz+DYRAYEEdjCgL
+cTSudoJKbcfGafPeHO6OeV2JxGNyUtF0tzfycJJY3rtKC1oWiZsP1gjObNR+089e
+xRLhResPVuhLVNj8Z3cFsJbDVWjDJzP3zmZRKOi0kdu50KW3exxtS+mlUI3biSs8
+ESXUNWPRrZaGYM2Yb1SZA4sCCbC1VuhxLOKh94ToTPFWyaFu/H5GvAarHdNdyIDO
+sstDysOJiRQjt+ZAHcABhCX3b+lf3zEa/hth6Ha2eI7pxTDBmUA2dmnopaI6g1U=
+=xjj9
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch b/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch
new file mode 100644
index 000000000000..286af4fee4fe
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.8.3-respect-save-settings-logout-plugin.patch
@@ -0,0 +1,72 @@
+From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <lionel@lefolgoc.net>
+Date: Thu, 25 Aug 2011 14:22:24 +0200
+Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
+
+Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
+logout panel plugin as well.
+---
+ panel-plugin/Makefile.am          |    2 ++
+ panel-plugin/xfsm-logout-plugin.c |   14 +++++++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 0675e2e..fd0609b 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
+ libxfsm_logout_plugin_la_CFLAGS = \
+ 	$(LIBX11_CFLAGS) \
+ 	$(LIBXFCE4PANEL_CFLAGS) \
++	$(XFCONF_CFLAGS) \
+ 	$(LIBXFCE4UTIL_CFLAGS) \
+ 	$(LIBXFCE4UI_CFLAGS) \
+ 	$(GTK_CFLAGS) \
+@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
+ libxfsm_logout_plugin_la_LIBADD = \
+ 	$(LIBX11_LIBS) \
+ 	$(LIBXFCE4PANEL_LIBS) \
++	$(XFCONF_LIBS) \
+ 	$(LIBXFCE4UTIL_LIBS) \
+ 	$(LIBXFCE4UI_LIBS) \
+ 	$(GTK_LIBS) \
+diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
+index b8e25ab..12dec0f 100644
+--- a/panel-plugin/xfsm-logout-plugin.c
++++ b/panel-plugin/xfsm-logout-plugin.c
+@@ -43,6 +43,7 @@
+ 
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4ui/libxfce4ui.h>
++#include <xfconf/xfconf.h>
+ #include <libxfce4panel/libxfce4panel.h>
+ 
+ #include "xfsm-logout-plugin-ui.h"
+@@ -207,12 +208,23 @@ static void
+ xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
+                                             XfsmShutdownType type)
+ {
++    GError *error = NULL;
++    XfconfChannel *channel;
+     gint resp = GTK_RESPONSE_ACCEPT;
+ 
+     g_return_if_fail(logout_plugin != NULL);
+     g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
+ 
+-    logout_plugin->allow_save = TRUE;
++    if (G_UNLIKELY (!xfconf_init (&error))) {
++        g_warning ("Unable to contact settings server: %s", error->message);
++        g_error_free (error);
++        logout_plugin->allow_save = TRUE;
++    }
++    else {
++        channel = xfconf_channel_get ("xfce4-session");
++        logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
++        xfconf_shutdown ();
++    }
+ 
+     if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
+         GtkWidget *dialog, *topvbox, *hbox, *image, *label;
+-- 
+1.7.2.5
+
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild
new file mode 100644
index 000000000000..ea28e162a5d6
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.3-r1.ebuild,v 1.1 2012/02/24 11:41:33 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="Xfce's session manager"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-session/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit debug gnome gnome-keyring policykit udev +xfce_plugins_logout"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
+	x11-apps/iceauth
+	x11-libs/libSM
+	>=x11-libs/libwnck-2.22:1
+	x11-libs/libX11
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/xfconf-4.8
+	>=xfce-base/xfce-utils-4.8
+	gnome? ( gnome-base/gconf:2 )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
+	policykit? ( >=sys-auth/polkit-0.102 )
+	udev? ( sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-respect-save-settings-logout-plugin.patch )
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-static
+		$(use_enable xfce_plugins_logout panel-plugin)
+		$(use_enable gnome)
+		$(use_enable gnome-keyring libgnome-keyring)
+		$(xfconf_use_debug)
+		--disable-hal
+		$(use_enable udev upower)
+		$(use_enable consolekit)
+		$(use_enable policykit polkit)
+		)
+
+	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
+}