[Pkg-xfce-commits] r3114 - in goodies/trunk/xfce4-systemload-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-04-16 21:15:43 +0000 (Thu, 16 Apr 2009)
New Revision: 3114

Added:
   goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch
Modified:
   goodies/trunk/xfce4-systemload-plugin/debian/changelog
   goodies/trunk/xfce4-systemload-plugin/debian/compat
   goodies/trunk/xfce4-systemload-plugin/debian/control
Log:
* debian/patches:
  - 02_fix-tooltip-gtk2.12 added, fix tooltips with GTK 2.16.
* debian/control:
  - move to xfce section.
  - update standards version to 3.8.1.
  - update xfce4-panel-dev build-dep to 4.6.0. 
  - update debhelper build-dep to 7.
* debian/compat bumped to 7.

Modified: goodies/trunk/xfce4-systemload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/changelog	2009-04-14 07:57:05 UTC (rev 3113)
+++ goodies/trunk/xfce4-systemload-plugin/debian/changelog	2009-04-16 21:15:43 UTC (rev 3114)
@@ -1,3 +1,16 @@
+xfce4-systemload-plugin (0.4.2-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_fix-tooltip-gtk2.12 added, fix tooltips with GTK 2.16.
+  * debian/control:
+    - move to xfce section.
+    - update standards version to 3.8.1.
+    - update xfce4-panel-dev build-dep to 4.6.0. 
+    - update debhelper build-dep to 7.
+  * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 16 Apr 2009 23:14:41 +0200
+
 xfce4-systemload-plugin (0.4.2-2) unstable; urgency=low
 
   [ Simon Huggins ]

Modified: goodies/trunk/xfce4-systemload-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/compat	2009-04-14 07:57:05 UTC (rev 3113)
+++ goodies/trunk/xfce4-systemload-plugin/debian/compat	2009-04-16 21:15:43 UTC (rev 3114)
@@ -1 +1 @@
-4
+7

Modified: goodies/trunk/xfce4-systemload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/control	2009-04-14 07:57:05 UTC (rev 3113)
+++ goodies/trunk/xfce4-systemload-plugin/debian/control	2009-04-16 21:15:43 UTC (rev 3114)
@@ -1,16 +1,18 @@
 Source: xfce4-systemload-plugin
-Section: x11
+Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, 
  Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 4.1), xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl
-Standards-Version: 3.8.0
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7), 
+ xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl
+Standards-Version: 3.8.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-systemload-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/xfce4-systemload-plugin/
 
 Package: xfce4-systemload-plugin
+Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: system load monitor plugin for the Xfce4 panel

Added: goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch	                        (rev 0)
+++ goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch	2009-04-16 21:15:43 UTC (rev 3114)
@@ -0,0 +1,23 @@
+diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
+index cc96ec4..027e8fe 100644
+--- a/panel-plugin/systemload.c
++++ b/panel-plugin/systemload.c
+@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
+ {
+     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;