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
This commit is contained in:
Kristian Rietveld 2007-02-13 12:41:36 +00:00 committed by Kristian Rietveld
parent 8c26e76940
commit 1cad322c6d
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2007-02-13 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (gtk_tooltip_hide_tooltip): stop any
pending tooltip timeout. (Fixes #406110, Carlos Garnacho).
2007-02-10 Emmanuele Bassi <ebassi@gnome.org> 2007-02-10 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchoosermenu.c: Fix the english of the comment; * gtk/gtkrecentchoosermenu.c: Fix the english of the comment;

View File

@ -735,17 +735,20 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
static void static void
gtk_tooltip_hide_tooltip (GtkTooltip *tooltip) gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
{ {
if (!tooltip || !GTK_TOOLTIP_VISIBLE (tooltip)) if (!tooltip)
return; return;
tooltip->tooltip_widget = NULL;
if (tooltip->timeout_id) if (tooltip->timeout_id)
{ {
g_source_remove (tooltip->timeout_id); g_source_remove (tooltip->timeout_id);
tooltip->timeout_id = 0; tooltip->timeout_id = 0;
} }
if (!GTK_TOOLTIP_VISIBLE (tooltip))
return;
tooltip->tooltip_widget = NULL;
if (!tooltip->keyboard_mode_enabled) if (!tooltip->keyboard_mode_enabled)
{ {
guint timeout; guint timeout;