| 1 |
commit: dbce85cd66bfde58d1afca30f67457631a4350f6 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 17 08:05:44 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 22:51:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbce85cd |
| 7 |
|
| 8 |
xfce-extra/xfce4-systemload-plugin: remove unused patch |
| 9 |
|
| 10 |
...xfce4-systemload-plugin-1.1.1-upower-0.99.patch | 55 ---------------------- |
| 11 |
1 file changed, 55 deletions(-) |
| 12 |
|
| 13 |
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 |
| 14 |
deleted file mode 100644 |
| 15 |
index 0aca3483f84..00000000000 |
| 16 |
--- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.1.1-upower-0.99.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,55 +0,0 @@ |
| 19 |
-http://bugzilla.xfce.org/show_bug.cgi?id=10923 |
| 20 |
- |
| 21 |
-From 1bc7f32ea8244575124420bd34d52913831a1ae1 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Eric Koegel <eric.koegel@×××××.com> |
| 23 |
-Date: Fri, 30 May 2014 19:12:02 +0300 |
| 24 |
-Subject: [PATCH] Update for Upower 0.99 |
| 25 |
- |
| 26 |
-Upower 0.99 changed from the "changed" signal to "notify" as well as |
| 27 |
-the function signature. This patch adds that while still supporting |
| 28 |
-the previous versions of upower. |
| 29 |
---- |
| 30 |
- panel-plugin/systemload.c | 13 +++++++++++-- |
| 31 |
- 1 file changed, 11 insertions(+), 2 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c |
| 34 |
-index c0572a3..30636e9 100644 |
| 35 |
---- a/panel-plugin/systemload.c |
| 36 |
-+++ b/panel-plugin/systemload.c |
| 37 |
-@@ -624,11 +624,15 @@ monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, |
| 38 |
- |
| 39 |
- #ifdef HAVE_UPOWER_GLIB |
| 40 |
- static void |
| 41 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
| 42 |
-+upower_changed_cb(UpClient *client, GParamSpec *pspec, t_global_monitor *global) |
| 43 |
-+#else /* UP_CHECK_VERSION < 0.99 */ |
| 44 |
- upower_changed_cb(UpClient *client, t_global_monitor *global) |
| 45 |
-+#endif /* UP_CHECK_VERSION */ |
| 46 |
- { |
| 47 |
- setup_timer(global); |
| 48 |
- } |
| 49 |
--#endif |
| 50 |
-+#endif /* HAVE_UPOWER_GLIB */ |
| 51 |
- |
| 52 |
- static void |
| 53 |
- entry_changed_cb(GtkEntry *entry, t_global_monitor *global) |
| 54 |
-@@ -925,10 +929,15 @@ systemload_construct (XfcePanelPlugin *plugin) |
| 55 |
- |
| 56 |
- #ifdef HAVE_UPOWER_GLIB |
| 57 |
- if (global->upower) { |
| 58 |
-+#if UP_CHECK_VERSION(0, 99, 0) |
| 59 |
-+ g_signal_connect (global->upower, "notify", |
| 60 |
-+ G_CALLBACK(upower_changed_cb), global); |
| 61 |
-+#else /* UP_CHECK_VERSION < 0.99 */ |
| 62 |
- g_signal_connect (global->upower, "changed", |
| 63 |
- G_CALLBACK(upower_changed_cb), global); |
| 64 |
-+#endif /* UP_CHECK_VERSION */ |
| 65 |
- } |
| 66 |
--#endif |
| 67 |
-+#endif /* HAVE_UPOWER_GLIB */ |
| 68 |
- |
| 69 |
- g_signal_connect (plugin, "free-data", G_CALLBACK (monitor_free), global); |
| 70 |
- |
| 71 |
--- |
| 72 |
-1.9.3 |
| 73 |
- |
Archives