diff options
Diffstat (limited to 'source/xfce/xfce4-systemload-plugin')
| -rw-r--r-- | source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff | 51 | ||||
| -rwxr-xr-x | source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild | 4 |
2 files changed, 1 insertions, 54 deletions
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff deleted file mode 100644 index 2cdd26f8..00000000 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- ./panel-plugin/systemload.c.orig 2017-02-09 13:22:46.000000000 -0600 -+++ ./panel-plugin/systemload.c 2018-04-15 14:28:15.729304272 -0500 -@@ -55,6 +55,8 @@ - static gchar *DEFAULT_COLOR[] = { "#0000c0", "#00c000", "#f0f000" }; - static gchar *DEFAULT_COMMAND_TEXT = "xfce4-taskmanager"; - -+/* HOVER_TIMEOUT is a fixed constant in gtk+-3; this must match - Aargh */ -+#define HOVER_TIMEOUT 500 - #define UPDATE_TIMEOUT 250 - #define UPDATE_TIMEOUT_SECONDS 1 - -@@ -107,6 +109,7 @@ - guint timeout, timeout_seconds; - gboolean use_timeout_seconds; - guint timeout_id; -+ guint tooltip_timeout; - t_command command; - t_monitor *monitor[3]; - t_uptime_monitor *uptime; -@@ -174,6 +177,9 @@ - global->monitor[count]->value_read / 100.0); - } - } -+/* don't write tooltip too often */ -+ if((global->tooltip_timeout += global->timeout) <= HOVER_TIMEOUT) return TRUE; -+ global->tooltip_timeout = 0; - if (global->monitor[0]->options.enabled) - { - g_snprintf(caption, sizeof(caption), _("System Load: %ld%%"), -@@ -338,6 +344,7 @@ - #endif - global->plugin = plugin; - global->timeout = UPDATE_TIMEOUT; -+ global->tooltip_timeout = 0; - global->timeout_seconds = UPDATE_TIMEOUT_SECONDS; - global->use_timeout_seconds = TRUE; - global->timeout_id = 0; -@@ -435,13 +442,6 @@ - } - #endif - global->timeout_id = g_timeout_add(global->timeout, (GSourceFunc)update_monitors, global); -- /* reduce the default tooltip timeout to be smaller than the update interval otherwise -- * we won't see tooltips on GTK 2.16 or newer */ -- settings = gtk_settings_get_default(); -- if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout")) -- g_object_set(settings, "gtk-tooltip-timeout", -- global->timeout - 10, NULL); -- - } - - static void diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild index c174e0e0..01cfbbe9 100755 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-systemload-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -78,8 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/xfce4-systemload-plugin.HOVER_TIMEOUT.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |