gail: use const instead G_CONST_RETURN

[~andy/gtk] / modules / other / gail / gaillabel.c

diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index 217db5903abaed2d78ae96c5521b0ac1c5069767..1961e8842121cc920494371393dec3a4cd99f38f 100644 (file)
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -42,7 +42,7 @@ static void       atk_text_interface_init          (AtkTextIface      *iface);
 
 /* atkobject.h */
 
-static G_CONST_RETURN gchar* gail_label_get_name         (AtkObject         *accessible);
+static const gchar* gail_label_get_name         (AtkObject         *accessible);
 static AtkStateSet*          gail_label_ref_state_set   (AtkObject         *accessible);
 static AtkRelationSet*       gail_label_ref_relation_set (AtkObject         *accessible);
 
@@ -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;
                         }
@@ -529,10 +529,10 @@ gail_label_ref_relation_set (AtkObject *obj)
   return relation_set;
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_label_get_name (AtkObject *accessible)
 {
-  G_CONST_RETURN gchar *name;
+  const gchar *name;
 
   g_return_val_if_fail (GAIL_IS_LABEL (accessible), NULL);