From bf5df2271fe09f88013e702c9ef84c956fbd8a07 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Wed, 6 Jun 2007 14:24:31 +0000 Subject: [PATCH] reviewed by: Matthias Clasen 2007-06-06 Johan Dahlin reviewed by: Matthias Clasen * gtk/gtkassistant.c (gtk_assistant_update_buttons_state): Check if the wizard is empty before trying to access the first page. (#444310, Johan Dahlin) svn path=/trunk/; revision=18060 --- ChangeLog | 8 ++++++++ NEWS | 6 ++++++ gtk/gtkassistant.c | 12 ++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab06a4d480..5ce6ab34bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-06 Johan Dahlin + + reviewed by: Matthias Clasen + + * gtk/gtkassistant.c (gtk_assistant_update_buttons_state): + Check if the wizard is empty before trying to access the first page. + (#444310, Johan Dahlin) + 2007-06-06 Matthias Clasen * configure.in: Bump version diff --git a/NEWS b/NEWS index 33f1dde8d5..ae9110752d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Overview of Changes from GTK+ 2.11.2 to 2.11.3 +============================================== + +* Bugs fixed: + 444310 update_buttons_state on a bare assistant causes gtk+ to crash + Overview of Changes from GTK+ 2.11.1 to 2.11.2 ============================================== diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 6b4dea7398..9339aa8f8b 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -457,6 +457,9 @@ set_assistant_buttons_state (GtkAssistant *assistant) { GtkAssistantPrivate *priv = assistant->priv; + if (!priv->current_page) + return; + switch (priv->current_page->type) { case GTK_ASSISTANT_PAGE_INTRO: @@ -1727,8 +1730,7 @@ gtk_assistant_set_forward_page_func (GtkAssistant *assistant, /* Page flow has possibly changed, so the buttons state might need to change too */ - if (priv->current_page) - set_assistant_buttons_state (assistant); + set_assistant_buttons_state (assistant); } /** @@ -1882,8 +1884,7 @@ gtk_assistant_set_page_type (GtkAssistant *assistant, /* Always set buttons state, a change in a future page might change current page buttons */ - if (priv->current_page) - set_assistant_buttons_state (assistant); + set_assistant_buttons_state (assistant); gtk_widget_child_notify (page, "page-type"); } @@ -2115,8 +2116,7 @@ gtk_assistant_set_page_complete (GtkAssistant *assistant, /* Always set buttons state, a change in a future page might change current page buttons */ - if (priv->current_page) - set_assistant_buttons_state (assistant); + set_assistant_buttons_state (assistant); gtk_widget_child_notify (page, "complete"); }