gail: use const instead G_CONST_RETURN

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

diff --git a/modules/other/gail/gailnotebookpage.c b/modules/other/gail/gailnotebookpage.c
index a258d35a209f4e337247fe76512de4b4cc08357f..7c201a84351cb677ab09eba314d41cdd255442f0 100644 (file)
--- a/modules/other/gail/gailnotebookpage.c
+++ b/modules/other/gail/gailnotebookpage.c
@@ -31,7 +31,7 @@ static void                  gail_notebook_page_finalize       (GObject   *objec
 static void                  gail_notebook_page_label_map_gtk  (GtkWidget *widget,
                                                                 gpointer  data);
 
-static G_CONST_RETURN gchar* gail_notebook_page_get_name       (AtkObject *accessible);
+static const gchar* gail_notebook_page_get_name       (AtkObject *accessible);
 static AtkObject*            gail_notebook_page_get_parent     (AtkObject *accessible);
 static gint                  gail_notebook_page_get_n_children (AtkObject *accessible);
 static AtkObject*            gail_notebook_page_ref_child      (AtkObject *accessible,
@@ -172,8 +172,8 @@ gail_notebook_page_new (GtkNotebook *notebook,
   GailNotebookPage *page;
   GtkWidget *child;
   GtkWidget *label;
-  GList *list;
-  
+  GtkWidget *widget_page;
+
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
 
   child = gtk_notebook_get_nth_page (notebook, pagenum);
@@ -188,8 +188,8 @@ gail_notebook_page_new (GtkNotebook *notebook,
   page->notebook = notebook;
   g_object_add_weak_pointer (G_OBJECT (page->notebook), (gpointer *)&page->notebook);
   page->index = pagenum;
-  list = g_list_nth (notebook->children, pagenum);
-  page->page = list->data;
+  widget_page = gtk_notebook_get_nth_page (notebook, pagenum);
+  page->page = widget_page;
   page->textutil = NULL;
   
   atk_object = ATK_OBJECT (page);
@@ -295,7 +295,7 @@ gail_notebook_page_finalize (GObject *object)
   G_OBJECT_CLASS (gail_notebook_page_parent_class)->finalize (object);
 }
 
-static G_CONST_RETURN gchar*
+static const gchar*
 gail_notebook_page_get_name (AtkObject *accessible)
 {
   g_return_val_if_fail (GAIL_IS_NOTEBOOK_PAGE (accessible), NULL);