summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-02-16 04:09:15 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-02-16 04:09:15 +0000
commit3456639c39fc5cf8c575f2312dc7b7d651229e0b (patch)
tree0121bcd36b7cc303ac461b7d0fcb1ddf9b95b59f
parent34418c4e8eeae411fa2f38f41d48ae5f53c88445 (diff)
downloadgdk-pixbuf-3456639c39fc5cf8c575f2312dc7b7d651229e0b.tar.gz
Prevent a crash with hidden, reorderable tabs. (#513230, Mike Massonnet,
2008-02-15 Matthias Clasen <mclasen@redhat.com> * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent a crash with hidden, reorderable tabs. (#513230, Mike Massonnet, patch by Carlos Garnacho) svn path=/trunk/; revision=19593
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtknotebook.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eaeb429ea..07b70057b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-15 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent
+ a crash with hidden, reorderable tabs. (#513230,
+ Mike Massonnet, patch by Carlos Garnacho)
+
+2008-02-15 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkuimanager.c (gtk_ui_manager_insert_action_group):
Warn on duplicate action group names. (#501746, Christian
Persch)
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 4fde43f85..2a9d84ac3 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2753,7 +2753,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
else
page = notebook->cur_page;
- if (!page)
+ if (!page || !page->tab_label)
return;
priv->pressed_button = -1;