← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xfce4-systemload-plugin/vivid

« back to all changes in this revision

Viewing changes to debian/patches/02_fix-tooltip-gtk2.12.patch

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez, Evgeni Golov, Yves-Alexis Perez
  • Date: 2011-04-19 23:30:56 UTC
  • mfrom: (2.5.2 upstream)
  • mto: (1.1.11 vivid-proposed)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: james.westby@ubuntu.com-20110419233056-bn3kriiqwolmcdij
Tags: 1.0.0-1
[ Evgeni Golov ]
* Fix Vcs-* fields, they were missing 'trunk' in the path.

[ Yves-Alexis Perez ]
* New upstream release.
* debian/control:
  - remove Simon and Emanuele from uploaders, thanks to them.
  - add build-dep on libxfcegui4-dev.
  - update standards version to 3.9.2.
  - add build-dep on hardening-includes.
  - add build-dep on intltool.
  - bump xfce4-panel-dev b-dep to (>= 4.8.0).
* Switch to 3.0 (quilt) source format.
* debian/rules:
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.
* debian/watch edited to track Xfce archive reorganisation
* debian/patches:
  - 01_fix-ftbfs-kfreebsd dropped, included upstream.
  - 02_fix-tooltip-gtk2.12 dropped as well. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix-tooltip-gtk2.12.patch
1
 
diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
2
 
index cc96ec4..027e8fe 100644
3
 
--- a/panel-plugin/systemload.c
4
 
+++ b/panel-plugin/systemload.c
5
 
@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
6
 
 {
7
 
     int count;
8
 
     t_global_monitor *global;
9
 
+    GtkSettings *settings;
10
 
 
11
 
     tooltips = gtk_tooltips_new ();
12
 
     g_object_ref (tooltips);
13
 
     gtk_object_sink (GTK_OBJECT (tooltips));
14
 
     
15
 
+    /* reduce the default tooltip timeout to be smaller than the update
16
 
+     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
17
 
+    settings = gtk_settings_get_default();
18
 
+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
19
 
+      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
20
 
+
21
 
     global = g_new(t_global_monitor, 1);
22
 
     global->plugin = plugin;
23
 
     global->timeout_id = 0;