From 3de3ff0f086a6e772e087ede608d3a61523a66d5 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Wed, 6 Jun 2007 15:00:51 +0000 Subject: [PATCH] Merge from trunk: 2007-06-06 Johan Dahlin Merge from trunk: 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=/branches/gtk-2-10/; revision=18061 --- ChangeLog | 10 ++++++++++ gtk/gtkassistant.c | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 019471239e..a16d1121cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-06-06 Johan Dahlin + + Merge from trunk: + + 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-04 Cody Russell Merge from trunk: diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index f89f40b6eb..cf3e0d4a1f 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); } /** @@ -1886,8 +1888,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"); } @@ -2125,8 +2126,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"); }