Merge branch 'master' into treeview-refactor

3 files changed, 6 insertions, 6 deletions

diff --git a/modules/other/gail/gailtogglebutton.c b/modules/other/gail/gailtogglebutton.c
index b984d288bd..63f8d441bb 100644
--- a/modules/other/gail/gailtogglebutton.c
+++ b/modules/other/gail/gailtogglebutton.c
@@ -84,7 +84,7 @@ gail_toggle_button_toggled_gtk (GtkWidget       *widget)
 
   accessible = gtk_widget_get_accessible (widget);
   atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, 
-                                  toggle_button->active);
+                                  gtk_toggle_button_get_active (toggle_button));
 } 
 
 static AtkStateSet*
diff --git a/modules/other/gail/tests/testlib.c b/modules/other/gail/tests/testlib.c
index 3e254af4ec..8323e290b3 100644
--- a/modules/other/gail/tests/testlib.c
+++ b/modules/other/gail/tests/testlib.c
@@ -713,7 +713,7 @@ gchar **tests_set(gint window, int *count)
   for (i = 0; i < testcount[window]; i++)
     {
       nullparam = FALSE;
-      if (GTK_TOGGLE_BUTTON(listoftests[window][i].toggleButton)->active)
+      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (listoftests[window][i].toggleButton)))
         {
           num = listoftests[window][i].numParameters;
           for (j = 0; j < num; j++)
diff --git a/modules/other/gail/tests/testtable.c b/modules/other/gail/tests/testtable.c
index e11b403529..e1a65d2993 100644
--- a/modules/other/gail/tests/testtable.c
+++ b/modules/other/gail/tests/testtable.c
@@ -73,11 +73,11 @@ static void choicecb (GtkWidget *widget, gpointer data)
   AtkObject **ptr_to_obj = (AtkObject **)data;
   AtkObject *obj = *ptr_to_obj;
 
-  if (GTK_TOGGLE_BUTTON(tc->tb_others)->active)
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tc->tb_others)))
   {
     other_runtest(obj);
   }
-  else if (GTK_TOGGLE_BUTTON(tc->tb_ref_selection)->active)
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tc->tb_ref_selection)))
   {
     const gchar *indexstr;
     gint index;
@@ -87,7 +87,7 @@ static void choicecb (GtkWidget *widget, gpointer data)
 
     ref_selection_runtest(obj, index); 
   }
-  else if (GTK_TOGGLE_BUTTON(tc->tb_ref_at)->active)
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tc->tb_ref_at)))
   {
     const gchar *rowstr, *colstr;
     gint row, col;
@@ -99,7 +99,7 @@ static void choicecb (GtkWidget *widget, gpointer data)
  
     ref_at_runtest(obj, row, col);
   }
-  else if (GTK_TOGGLE_BUTTON(tc->tb_ref_accessible_child)->active)
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tc->tb_ref_accessible_child)))
   {
     const gchar *childstr;
     gint childno;