Be more robust when removing the current page. (#499951, Andreas Sandberg)

2008-01-07  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkassistant.c (remove_page): Be more robust when removing
        the current page.  (#499951, Andreas Sandberg)

2

svn path=/branches/gtk-2-12/; revision=19322
This commit is contained in:
Matthias Clasen
2008-01-08 03:52:22 +00:00
committed by Matthias Clasen
parent d2f20c569b
commit fe41c67383
2 changed files with 10 additions and 0 deletions

View File

@@ -1,3 +1,10 @@
2008-01-07 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
* gtk/gtkassistant.c (remove_page): Be more robust when removing
the current page. (#499951, Andreas Sandberg)
2007-01-06 Johan Dahlin <johan@gnome.org>
Merged from trunk:

View File

@@ -869,6 +869,9 @@ remove_page (GtkAssistant *assistant,
while (page_node && !GTK_WIDGET_VISIBLE (((GtkAssistantPage *) page_node->data)->page))
page_node = page_node->next;
if (page_node == element)
page_node = page_node->next;
if (page_node)
priv->current_page = page_node->data;
else