summaryrefslogtreecommitdiff
path: root/extra/xfce4-systemload-plugin
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-15 19:25:01 -0300
commitecec4d4d3ca64d7929f1f63857e82268798e066b (patch)
treedfc5421b1f5460a449502c66d612e1132ec5d49f /extra/xfce4-systemload-plugin
parenteddd84528e605047a994ee8d652ba99686a412fc (diff)
parent1ffabe284d9f5a4ac055941d9817af71be1e5b54 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/binutils-avr/PKGBUILD community/freecol/PKGBUILD community/gcc-avr/PKGBUILD community/lightspark/PKGBUILD community/lorcon-old-svn/PKGBUILD community/mdf2iso/PKGBUILD community/pylorcon/PKGBUILD community/qbittorrent/PKGBUILD community/remmina-plugins/PKGBUILD community/systemd/PKGBUILD community/texmaker/PKGBUILD extra/pyqt/PKGBUILD extra/uim/PKGBUILD extra/wesnoth/PKGBUILD libre/kdenetwork-libre/PKGBUILD multilib-testing/lib32-glibc/PKGBUILD multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch multilib-testing/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD multilib/libtool-multilib/libtool.install testing/glibc/PKGBUILD testing/shadow/PKGBUILD testing/xf86-video-savage/PKGBUILD
Diffstat (limited to 'extra/xfce4-systemload-plugin')
-rw-r--r--extra/xfce4-systemload-plugin/missing_tooltip.diff21
1 files changed, 0 insertions, 21 deletions
diff --git a/extra/xfce4-systemload-plugin/missing_tooltip.diff b/extra/xfce4-systemload-plugin/missing_tooltip.diff
deleted file mode 100644
index 96f5c1714..000000000
--- a/extra/xfce4-systemload-plugin/missing_tooltip.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- panel-plugin/systemload.c 2007-01-17 18:01:09.000000000 +0000
-+++ panel-plugin/systemload.c.new 2009-05-14 17:17:24.001076632 +0000
-@@ -315,11 +315,18 @@
- {
- int count;
- t_global_monitor *global;
-+ GtkSettings *settings;
-
- tooltips = gtk_tooltips_new ();
- g_object_ref (tooltips);
- gtk_object_sink (GTK_OBJECT (tooltips));
-
-+ /* 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", UPDATE_TIMEOUT - 10, NULL);
-+
- global = g_new(t_global_monitor, 1);
- global->plugin = plugin;
- global->timeout_id = 0;