Use accessor functions to access GtkStatusbar

diff --git a/modules/other/gail/gailstatusbar.c b/modules/other/gail/gailstatusbar.c
index 2b7c63f8ee63a655347f22764ad801f29a8443b1..d3ebeead59f08daad06e79be646dd0aa2cdef9fe 100644 (file)
--- a/modules/other/gail/gailstatusbar.c
+++ b/modules/other/gail/gailstatusbar.c
@@ -629,5 +629,8 @@ gail_statusbar_get_character_at_offset (AtkText *text,
 static GtkWidget*
 get_label_from_statusbar (GtkWidget *statusbar)
 {
-  return GTK_STATUSBAR (statusbar)->label;
+  GtkWidget *message_area;
+
+  message_area = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar));
+  return gtk_bin_get_child (GTK_BIN (message_area));
 }

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 72269ed372f52e9fa1ea18f04e89a8e584b35055..c38c6d45ed3cdabcb880e72fa0b67cc49933d68c 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1627,7 +1627,7 @@ statusbar_popped (GtkStatusbar  *statusbar,
                  guint          context_id,
                  const gchar   *text)
 {
-  if (!statusbar->messages)
+  if (!text)
     statusbar_counter = 1;
 }