summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@imendio.com>2007-06-06 12:28:50 +0000
committerKristian Rietveld <kristian@src.gnome.org>2007-06-06 12:28:50 +0000
commit97af2e00630a0887fd56764935b8fa7847d933e1 (patch)
treeab3caa3f29012b666d171c1ba16d89bb9ae7f713
parentb67d9a7dd02160575b8a76f2d9281772aa43aaf0 (diff)
downloadgdk-pixbuf-97af2e00630a0887fd56764935b8fa7847d933e1.tar.gz
bail out if last_window is not a GdkWindow anymore. (Fixes #434021,
2007-06-06 Kristian Rietveld <kris@imendio.com> * gtk/gtktooltip.c (gtk_tooltip_show_tooltip): bail out if last_window is not a GdkWindow anymore. (Fixes #434021, several reporters). svn path=/trunk/; revision=18051
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtktooltip.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 51b1e1cb6..77225365f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-06 Kristian Rietveld <kris@imendio.com>
+
+ * gtk/gtktooltip.c (gtk_tooltip_show_tooltip): bail out if
+ last_window is not a GdkWindow anymore. (Fixes #434021, several
+ reporters).
+
2007-06-06 Brian Cameron <brian.cameron@sun.com>
* gdk/Makefile.am: Add gdkmedialib.h to EXTRA_DIST so this header
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 1df772f7d..69685d566 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -634,13 +634,13 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
{
window = tooltip->last_window;
+ if (!GDK_IS_WINDOW (window))
+ return;
+
gdk_window_get_origin (window, &x, &y);
x = tooltip->last_x - x;
y = tooltip->last_y - y;
- if (!window)
- return;
-
pointer_widget = tooltip_widget = find_widget_under_pointer (window,
&x, &y);
}