+++ /dev/null
-Taken from:
-http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606
-
---- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000 2013-04-12 22:02:19.000000000 +0100
-+++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c 2013-11-05 11:00:34.038965063 +0000
-@@ -244,10 +244,11 @@
- return function_result;
- }
-
--static void
--logind_call_function (const gchar *function, gboolean value, GError **error)
-+static char *
-+logind_call_function (const gchar *function)
- {
- GVariant *result;
-+ GError *err = NULL;
-
- if (!logind_proxy)
- {
-@@ -258,20 +259,28 @@
- "/org/freedesktop/login1",
- "org.freedesktop.login1.Manager",
- NULL,
-- error);
-+ &err);
-+ if (err != NULL)
-+ g_error_free(err);
- if (!logind_proxy)
-- return;
-+ return NULL;
- }
-
- result = g_dbus_proxy_call_sync (logind_proxy,
- function,
-- g_variant_new ("(b)", value),
-+ g_variant_new ("(b)", TRUE),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
-- error);
-- g_variant_unref (result);
-- return;
-+ &err);
-+ if (result)
-+ g_variant_unref (result);
-+ if (err != NULL) {
-+ char *r = strdup(err->message);
-+ g_error_free(err);
-+ return r;
-+ }
-+ return NULL;
- }
-
- gboolean
-@@ -280,10 +289,10 @@
- return logind_query ("CanPowerOff", FALSE, NULL);
- }
-
--void
--dbus_logind_PowerOff (GError **error)
-+char *
-+dbus_logind_PowerOff (void)
- {
-- logind_call_function ("PowerOff", TRUE, error);
-+ return logind_call_function ("PowerOff");
- }
-
- gboolean
-@@ -292,10 +301,10 @@
- return logind_query ("CanReboot", FALSE, NULL);
- }
-
--void
--dbus_logind_Reboot (GError **error)
-+char *
-+dbus_logind_Reboot (void)
- {
-- logind_call_function ("Reboot", TRUE, error);
-+ return logind_call_function ("Reboot");
- }
-
- gboolean
-@@ -304,10 +313,10 @@
- return logind_query ("CanSuspend", FALSE, NULL);
- }
-
--void
--dbus_logind_Suspend (GError **error)
-+char *
-+dbus_logind_Suspend (void)
- {
-- logind_call_function ("Suspend", TRUE, error);
-+ return logind_call_function ("Suspend");
- }
-
- gboolean
-@@ -316,10 +325,10 @@
- return logind_query ("CanHibernate", FALSE, NULL);
- }
-
--void
--dbus_logind_Hibernate (GError **error)
-+char *
-+dbus_logind_Hibernate (void)
- {
-- logind_call_function ("Hibernate", TRUE, error);
-+ return logind_call_function ("Hibernate");
- }
-
- /*** ConsoleKit mechanism ***/
-
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.14"
-VALA_MAX_API_VERSION="0.22"
-
-inherit vala autotools eutils
-
-DESCRIPTION="LXDE session manager (lite version)"
-HOMEPAGE="http://lxde.sf.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
-SLOT="0"
-# upower USE flag is enabled by default in the desktop profile
-IUSE="nls upower"
-
-COMMON_DEPEND="dev-libs/glib:2
- dev-libs/libgee:0
- dev-libs/dbus-glib
- lxde-base/lxde-common
- sys-auth/polkit
- x11-libs/gtk+:2
- x11-libs/libX11
- sys-apps/dbus"
-RDEPEND="${COMMON_DEPEND}
- !lxde-base/lxsession-edit
- sys-apps/lsb-release
- upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
- $(vala_depend)
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog README"
-
-src_prepare() {
- # bug #488082
- epatch "${FILESDIR}"/${P}-makefile.patch
-
- # bug #497100
- epatch "${FILESDIR}"/${P}-configure.patch
-
- # bug #496880
- epatch "${FILESDIR}"/${P}-fix-logind-dbus-calls.patch
-
- eautoreconf
-}
-
-src_configure() {
- # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
- econf \
- $(use_enable nls)
-}