diff options
| author | Kristian Rietveld <kris@imendio.com> | 2007-02-13 12:41:36 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2007-02-13 12:41:36 +0000 |
| commit | 1cad322c6d5070ac2c1e45c8a8916c08e2e9f866 (patch) | |
| tree | 3ff56af72a5d139b037532b12005bfeaa2df63f7 /gtk/gtktooltip.c | |
| parent | 8c26e76940df506888a94ecd68a3961b3536aedf (diff) | |
| download | gtk+-1cad322c6d5070ac2c1e45c8a8916c08e2e9f866.tar.gz | |
stop any pending tooltip timeout. (Fixes #406110, Carlos Garnacho).
2007-02-13 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (gtk_tooltip_hide_tooltip): stop any
pending tooltip timeout. (Fixes #406110, Carlos Garnacho).
svn path=/trunk/; revision=17290
Diffstat (limited to 'gtk/gtktooltip.c')
| -rw-r--r-- | gtk/gtktooltip.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index fbce27ff20..47d08f5204 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -735,17 +735,20 @@ gtk_tooltip_show_tooltip (GdkDisplay *display) static void gtk_tooltip_hide_tooltip (GtkTooltip *tooltip) { - if (!tooltip || !GTK_TOOLTIP_VISIBLE (tooltip)) + if (!tooltip) return; - tooltip->tooltip_widget = NULL; - if (tooltip->timeout_id) { g_source_remove (tooltip->timeout_id); tooltip->timeout_id = 0; } + if (!GTK_TOOLTIP_VISIBLE (tooltip)) + return; + + tooltip->tooltip_widget = NULL; + if (!tooltip->keyboard_mode_enabled) { guint timeout; |