summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /xfce-extra/xfce4-systemload-plugin/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'xfce-extra/xfce4-systemload-plugin/files')
-rw-r--r--xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch
new file mode 100644
index 000000000000..0aca3483f846
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch
@@ -0,0 +1,55 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=10923
+
+From 1bc7f32ea8244575124420bd34d52913831a1ae1 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Fri, 30 May 2014 19:12:02 +0300
+Subject: [PATCH] Update for Upower 0.99
+
+Upower 0.99 changed from the "changed" signal to "notify" as well as
+the function signature. This patch adds that while still supporting
+the previous versions of upower.
+---
+ panel-plugin/systemload.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
+index c0572a3..30636e9 100644
+--- a/panel-plugin/systemload.c
++++ b/panel-plugin/systemload.c
+@@ -624,11 +624,15 @@ monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
+
+ #ifdef HAVE_UPOWER_GLIB
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++upower_changed_cb(UpClient *client, GParamSpec *pspec, t_global_monitor *global)
++#else /* UP_CHECK_VERSION < 0.99 */
+ upower_changed_cb(UpClient *client, t_global_monitor *global)
++#endif /* UP_CHECK_VERSION */
+ {
+ setup_timer(global);
+ }
+-#endif
++#endif /* HAVE_UPOWER_GLIB */
+
+ static void
+ entry_changed_cb(GtkEntry *entry, t_global_monitor *global)
+@@ -925,10 +929,15 @@ systemload_construct (XfcePanelPlugin *plugin)
+
+ #ifdef HAVE_UPOWER_GLIB
+ if (global->upower) {
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (global->upower, "notify",
++ G_CALLBACK(upower_changed_cb), global);
++#else /* UP_CHECK_VERSION < 0.99 */
+ g_signal_connect (global->upower, "changed",
+ G_CALLBACK(upower_changed_cb), global);
++#endif /* UP_CHECK_VERSION */
+ }
+-#endif
++#endif /* HAVE_UPOWER_GLIB */
+
+ g_signal_connect (plugin, "free-data", G_CALLBACK (monitor_free), global);
+
+--
+1.9.3
+