summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2010-03-23 14:45:07 +0100
committerJavier Jardón <jjardon@gnome.org>2010-07-19 15:28:03 +0200
commit1af1362a369bb79deaeec8d5bf580c97df6c0c87 (patch)
tree22eaf0bb13ce278fc8e8f26eee54765dfdaaa7cf /gtk
parent6330ea9e43edd3025d3281f5779e6352eb7f2308 (diff)
downloadgtk+-1af1362a369bb79deaeec8d5bf580c97df6c0c87.tar.gz
gtknotebook: Fix critical warnings on scroll events
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=604391
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtknotebook.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index d2a987623e..65b7ee0c95 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2550,7 +2550,8 @@ gtk_notebook_scroll (GtkWidget *widget,
for (i = 0; i < 2; i++)
{
if (event_widget == priv->action_widget[i] ||
- gtk_widget_is_ancestor (event_widget, priv->action_widget[i]))
+ (priv->action_widget[i] &&
+ gtk_widget_is_ancestor (event_widget, priv->action_widget[i])))
return FALSE;
}