Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

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

    Merge from trunk:

    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=/branches/gtk-2-10/; revision=18061
This commit is contained in:
Johan Dahlin
2007-06-06 15:00:51 +00:00
committed by Johan Dahlin
parent 0655665d42
commit 3de3ff0f08
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2007-06-06 Johan Dahlin <jdahlin@async.com.br>
Merge from trunk:
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-04 Cody Russell <bratsche@gnome.org>
Merge from trunk:

12
gtk/gtkassistant.c
View File

@@ -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");
}