From 1cad322c6d5070ac2c1e45c8a8916c08e2e9f866 Mon Sep 17 00:00:00 2001
From: Kristian Rietveld <kris@imendio.com>
Date: Tue, 13 Feb 2007 12:41:36 +0000
Subject: [PATCH] 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
---
 ChangeLog        | 5 +++++
 gtk/gtktooltip.c | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4c42908ed..3377697d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* gtk/gtkrecentchoosermenu.c: Fix the english of the comment;
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;