AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

reviewed by: Matthias Clasen <mclasen@redhat.com>

Browse Source 
2007-06-06  Johan Dahlin  <jdahlin@async.com.br>

    reviewed by: Matthias Clasen <mclasen@redhat.com>
    
    * 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
This commit is contained in:
Johan Dahlin 2007-06-06 14:24:31 +00:00 committed by Johan Dahlin
parent f25af7074e
commit bf5df2271f
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-06-06 Johan Dahlin <jdahlin@async.com.br>
reviewed by: Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com> 2007-06-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

6
NEWS
View File

@ -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 Overview of Changes from GTK+ 2.11.1 to 2.11.2
============================================== ==============================================

6
gtk/gtkassistant.c
View File

@ -457,6 +457,9 @@ set_assistant_buttons_state (GtkAssistant *assistant)
{ {
GtkAssistantPrivate *priv = assistant->priv; GtkAssistantPrivate *priv = assistant->priv;
if (!priv->current_page)
return;
switch (priv->current_page->type) switch (priv->current_page->type)
{ {
case GTK_ASSISTANT_PAGE_INTRO: case GTK_ASSISTANT_PAGE_INTRO:
@ -1727,7 +1730,6 @@ gtk_assistant_set_forward_page_func (GtkAssistant *assistant,
/* Page flow has possibly changed, so the /* Page flow has possibly changed, so the
buttons state might need to change too */ buttons state might need to change too */
if (priv->current_page)
set_assistant_buttons_state (assistant); set_assistant_buttons_state (assistant);
} }
@ -1882,7 +1884,6 @@ gtk_assistant_set_page_type (GtkAssistant *assistant,
/* Always set buttons state, a change in a future page /* Always set buttons state, a change in a future page
might change current page buttons */ 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"); gtk_widget_child_notify (page, "page-type");
@ -2115,7 +2116,6 @@ gtk_assistant_set_page_complete (GtkAssistant *assistant,
/* Always set buttons state, a change in a future page /* Always set buttons state, a change in a future page
might change current page buttons */ 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"); gtk_widget_child_notify (page, "complete");