Use GtkBin accessors

5 files changed, 11 insertions, 8 deletions

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index baf1a97247..dfa17bc9b7 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -1849,7 +1849,7 @@ status_window_set_text (StatusWindow *status_window,
       if (!status_window->window)
 	status_window_make_window (status_window);
       
-      label = GTK_BIN (status_window->window)->child;
+      label = gtk_bin_get_child (GTK_BIN (status_window->window));
       gtk_label_set_text (GTK_LABEL (label), text);
   
       gtk_widget_show (status_window->window);
diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 8b0a05e2ab..ec2281898f 100644
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -240,7 +240,7 @@ gail_button_is_default_press (GtkWidget *widget)
   gboolean ret = FALSE;
   const gchar *parent_type_name;
 
-  child = GTK_BIN (widget)->child;
+  child = gtk_bin_get_child (GTK_BIN (widget));
   if (GTK_IS_ARROW (child))
     {
       g_object_get (child,
diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index 217db5903a..a527a8ae0e 100644
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -500,7 +500,7 @@ gail_label_ref_relation_set (AtkObject *obj)
                         {
                           GtkWidget *temp_widget;
 
-                          temp_widget = GTK_BIN (list->data)->child;
+                          temp_widget = gtk_bin_get_child (GTK_BIN (list->data));
                           if (GTK_IS_BUTTON (temp_widget))
                             mnemonic_widget = temp_widget;
                         }
diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 6e42968fa4..a0c5fb1ad3 100644
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -520,7 +520,7 @@ gail_menu_item_get_keybinding (AtkAction *action,
                * we get here.
                */
               key = NULL;
-              child = GTK_BIN (item)->child;
+              child = gtk_bin_get_child (GTK_BIN (item));
               if (GTK_IS_ACCEL_LABEL (child))
                 {
                   GtkAccelLabel *accel_label;
diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c
index afbd5b366b..8d01105c1b 100644
--- a/modules/other/gail/gailtoplevel.c
+++ b/modules/other/gail/gailtoplevel.c
@@ -323,9 +323,10 @@ _gail_toplevel_remove_child (GailToplevel *toplevel,
 static gboolean
 is_attached_menu_window (GtkWidget *widget)
 {
-  GtkWidget *child = GTK_BIN (widget)->child;
+  GtkWidget *child;
   gboolean ret = FALSE;
 
+  child = gtk_bin_get_child (GTK_BIN (widget));
   if (GTK_IS_MENU (child))
     {
       GtkWidget *attach;
@@ -342,19 +343,21 @@ is_attached_menu_window (GtkWidget *widget)
 static gboolean
 is_combo_window (GtkWidget *widget)
 {
-  GtkWidget *child = GTK_BIN (widget)->child;
+  GtkWidget *child;
   AtkObject *obj;
   GtkAccessible *accessible;
 
+  child = gtk_bin_get_child (GTK_BIN (widget));
+
   if (!GTK_IS_EVENT_BOX (child))
     return FALSE;
 
-  child = GTK_BIN (child)->child;
+  child = gtk_bin_get_child (GTK_BIN (child));
 
   if (!GTK_IS_FRAME (child))
     return FALSE;
 
-  child = GTK_BIN (child)->child;
+  child = gtk_bin_get_child (GTK_BIN (child));
 
   if (!GTK_IS_SCROLLED_WINDOW (child))
     return FALSE;