| 1 |
ssuominen 14/05/31 19:13:05 |
| 2 |
|
| 3 |
Added: xfce4-settings-4.11.2-upower-0.99.patch |
| 4 |
Log: |
| 5 |
Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 xfce-base/xfce4-settings/files/xfce4-settings-4.11.2-upower-0.99.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: xfce4-settings-4.11.2-upower-0.99.patch |
| 16 |
=================================================================== |
| 17 |
http://bugzilla.xfce.org/show_bug.cgi?id=10918 |
| 18 |
|
| 19 |
From 5247716c9105dc68a737757da5a2b260538945a9 Mon Sep 17 00:00:00 2001 |
| 20 |
From: Eric Koegel <eric.koegel@×××××.com> |
| 21 |
Date: Wed, 28 May 2014 07:55:39 +0300 |
| 22 |
Subject: [PATCH] Update for Upower 0.99 |
| 23 |
|
| 24 |
Upower changed a singal handler. |
| 25 |
--- |
| 26 |
xfsettingsd/displays-upower.c | 21 ++++++++++++++++++++- |
| 27 |
1 file changed, 20 insertions(+), 1 deletion(-) |
| 28 |
|
| 29 |
diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c |
| 30 |
index bbb3028..e1fab38 100644 |
| 31 |
--- a/xfsettingsd/displays-upower.c |
| 32 |
+++ b/xfsettingsd/displays-upower.c |
| 33 |
@@ -34,9 +34,15 @@ |
| 34 |
|
| 35 |
|
| 36 |
static void xfce_displays_upower_dispose (GObject *object); |
| 37 |
+ |
| 38 |
+#if UP_CHECK_VERSION(0, 99, 0) |
| 39 |
static void xfce_displays_upower_property_changed (UpClient *client, |
| 40 |
+ GParamSpec *pspec, |
| 41 |
XfceDisplaysUPower *upower); |
| 42 |
- |
| 43 |
+#else |
| 44 |
+static void xfce_displays_upower_property_changed (UpClient *client, |
| 45 |
+ XfceDisplaysUPower *upower); |
| 46 |
+#endif |
| 47 |
|
| 48 |
|
| 49 |
struct _XfceDisplaysUPowerClass |
| 50 |
@@ -95,10 +101,17 @@ xfce_displays_upower_init (XfceDisplaysUPower *upower) |
| 51 |
{ |
| 52 |
upower->client = up_client_new (); |
| 53 |
upower->lid_is_closed = up_client_get_lid_is_closed (upower->client); |
| 54 |
+#if UP_CHECK_VERSION(0, 99, 0) |
| 55 |
+ upower->handler = g_signal_connect (G_OBJECT (upower->client), |
| 56 |
+ "notify", |
| 57 |
+ G_CALLBACK (xfce_displays_upower_property_changed), |
| 58 |
+ upower); |
| 59 |
+#else |
| 60 |
upower->handler = g_signal_connect (G_OBJECT (upower->client), |
| 61 |
"changed", |
| 62 |
G_CALLBACK (xfce_displays_upower_property_changed), |
| 63 |
upower); |
| 64 |
+#endif |
| 65 |
} |
| 66 |
|
| 67 |
|
| 68 |
@@ -122,8 +135,14 @@ xfce_displays_upower_dispose (GObject *object) |
| 69 |
|
| 70 |
|
| 71 |
static void |
| 72 |
+#if UP_CHECK_VERSION(0, 99, 0) |
| 73 |
xfce_displays_upower_property_changed (UpClient *client, |
| 74 |
+ GParamSpec *pspec, |
| 75 |
XfceDisplaysUPower *upower) |
| 76 |
+#else |
| 77 |
+xfce_displays_upower_property_changed (UpClient *client, |
| 78 |
+ XfceDisplaysUPower *upower) |
| 79 |
+#endif |
| 80 |
{ |
| 81 |
gboolean lid_is_closed; |
| 82 |
|
| 83 |
-- |
| 84 |
1.9.3 |
Archives