ssuominen 14/05/31 19:13:05 Added: xfce4-settings-4.11.2-upower-0.99.patch Log: Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.1 xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch?rev=1.1&content-type=text/plain Index: xfce4-settings-4.11.2-upower-0.99.patch =================================================================== http://bugzilla.xfce.org/show_bug.cgi?id=10918 >From 5247716c9105dc68a737757da5a2b260538945a9 Mon Sep 17 00:00:00 2001 From: Eric Koegel <[email protected]> Date: Wed, 28 May 2014 07:55:39 +0300 Subject: [PATCH] Update for Upower 0.99 Upower changed a singal handler. --- xfsettingsd/displays-upower.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c index bbb3028..e1fab38 100644 --- a/xfsettingsd/displays-upower.c +++ b/xfsettingsd/displays-upower.c @@ -34,9 +34,15 @@ static void xfce_displays_upower_dispose (GObject *object); + +#if UP_CHECK_VERSION(0, 99, 0) static void xfce_displays_upower_property_changed (UpClient *client, + GParamSpec *pspec, XfceDisplaysUPower *upower); - +#else +static void xfce_displays_upower_property_changed (UpClient *client, + XfceDisplaysUPower *upower); +#endif struct _XfceDisplaysUPowerClass @@ -95,10 +101,17 @@ xfce_displays_upower_init (XfceDisplaysUPower *upower) { upower->client = up_client_new (); upower->lid_is_closed = up_client_get_lid_is_closed (upower->client); +#if UP_CHECK_VERSION(0, 99, 0) + upower->handler = g_signal_connect (G_OBJECT (upower->client), + "notify", + G_CALLBACK (xfce_displays_upower_property_changed), + upower); +#else upower->handler = g_signal_connect (G_OBJECT (upower->client), "changed", G_CALLBACK (xfce_displays_upower_property_changed), upower); +#endif } @@ -122,8 +135,14 @@ xfce_displays_upower_dispose (GObject *object) static void +#if UP_CHECK_VERSION(0, 99, 0) xfce_displays_upower_property_changed (UpClient *client, + GParamSpec *pspec, XfceDisplaysUPower *upower) +#else +xfce_displays_upower_property_changed (UpClient *client, + XfceDisplaysUPower *upower) +#endif { gboolean lid_is_closed; -- 1.9.3
