[gtk+/gtk-3-0] gtk: Use const instead G_CONST_RETURN



commit 92f8639f7e23c31a85ad1f3b69f8ca401d2ea534
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Jun 6 19:13:44 2011 +0100

    gtk: Use const instead G_CONST_RETURN
    
    [Alexandre Rostovtsev <tetromino gmail com>: backport to 3.0.12]

 gtk/gtkaboutdialog.c        |   24 ++++++++++++------------
 gtk/gtkaboutdialog.h        |   24 ++++++++++++------------
 gtk/gtkaction.c             |   14 +++++++-------
 gtk/gtkaction.h             |   14 +++++++-------
 gtk/gtkactiongroup.c        |    4 ++--
 gtk/gtkactiongroup.h        |    4 ++--
 gtk/gtkassistant.c          |    2 +-
 gtk/gtkassistant.h          |    2 +-
 gtk/gtkbutton.c             |    2 +-
 gtk/gtkbutton.h             |    2 +-
 gtk/gtkcellarea.c           |    2 +-
 gtk/gtkcellarea.h           |    4 ++--
 gtk/gtkcolorbutton.c        |    2 +-
 gtk/gtkcolorbutton.h        |    2 +-
 gtk/gtkcombobox.c           |    2 +-
 gtk/gtkcombobox.h           |    4 ++--
 gtk/gtkentry.c              |    4 ++--
 gtk/gtkentry.h              |    8 ++++----
 gtk/gtkentrybuffer.c        |    2 +-
 gtk/gtkentrybuffer.h        |    2 +-
 gtk/gtkexpander.c           |    2 +-
 gtk/gtkexpander.h           |    2 +-
 gtk/gtkfilechooserbutton.c  |    2 +-
 gtk/gtkfilechooserbutton.h  |    2 +-
 gtk/gtkfilefilter.c         |    2 +-
 gtk/gtkfilefilter.h         |    2 +-
 gtk/gtkfontbutton.c         |    4 ++--
 gtk/gtkfontbutton.h         |    4 ++--
 gtk/gtkfontsel.c            |    4 ++--
 gtk/gtkfontsel.h            |    2 +-
 gtk/gtkframe.c              |    2 +-
 gtk/gtkframe.h              |    6 +++---
 gtk/gtkiconfactory.c        |    6 +++---
 gtk/gtkiconfactory.h        |    8 ++++----
 gtk/gtkicontheme.c          |    4 ++--
 gtk/gtkicontheme.h          |    4 ++--
 gtk/gtkimage.c              |    6 +++---
 gtk/gtkimage.h              |    6 +++---
 gtk/gtkimagemenuitem.c      |    4 ++--
 gtk/gtklabel.c              |    6 +++---
 gtk/gtklabel.h              |    6 +++---
 gtk/gtklinkbutton.c         |    2 +-
 gtk/gtklinkbutton.h         |    2 +-
 gtk/gtkmenu.c               |    2 +-
 gtk/gtkmenu.h               |    6 +++---
 gtk/gtkmenuitem.c           |    8 ++++----
 gtk/gtkmenuitem.h           |    8 ++++----
 gtk/gtknotebook.c           |    4 ++--
 gtk/gtknotebook.h           |   18 +++++++++---------
 gtk/gtkpapersize.c          |    8 ++++----
 gtk/gtkpapersize.h          |    8 ++++----
 gtk/gtkprinter.c            |   10 +++++-----
 gtk/gtkprinter.h            |   10 +++++-----
 gtk/gtkprintjob.c           |    2 +-
 gtk/gtkprintjob.h           |    2 +-
 gtk/gtkprintoperation.c     |    2 +-
 gtk/gtkprintoperation.h     |    2 +-
 gtk/gtkprintsettings.c      |   12 ++++++------
 gtk/gtkprintsettings.h      |   14 +++++++-------
 gtk/gtkprogressbar.c        |    2 +-
 gtk/gtkprogressbar.h        |    6 +++---
 gtk/gtkrecentfilter.c       |    2 +-
 gtk/gtkrecentfilter.h       |    2 +-
 gtk/gtkrecentmanager.c      |    8 ++++----
 gtk/gtkrecentmanager.h      |    8 ++++----
 gtk/gtksearchenginebeagle.c |    2 +-
 gtk/gtkstatusicon.c         |    6 +++---
 gtk/gtkstatusicon.h         |    6 +++---
 gtk/gtkstylecontext.c       |    2 +-
 gtk/gtkstylecontext.h       |    2 +-
 gtk/gtktextmark.h           |    2 +-
 gtk/gtkthemingengine.c      |    2 +-
 gtk/gtkthemingengine.h      |    2 +-
 gtk/gtktoolbutton.c         |    6 +++---
 gtk/gtktoolbutton.h         |    6 +++---
 gtk/gtktoolitemgroup.c      |    2 +-
 gtk/gtktoolitemgroup.h      |    2 +-
 gtk/gtktoolpalette.c        |    4 ++--
 gtk/gtktoolpalette.h        |    4 ++--
 gtk/gtktreeviewcolumn.c     |    2 +-
 gtk/gtktreeviewcolumn.h     |    2 +-
 gtk/gtkwidget.c             |    2 +-
 gtk/gtkwidget.h             |    2 +-
 gtk/gtkwidgetpath.c         |    2 +-
 gtk/gtkwidgetpath.h         |    2 +-
 gtk/gtkwindow.c             |    4 ++--
 gtk/gtkwindow.h             |   10 ++++------
 87 files changed, 214 insertions(+), 216 deletions(-)
---
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index f9335c0..0342304 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1025,7 +1025,7 @@ gtk_about_dialog_show (GtkWidget *widget)
  *
  * Since: 2.12
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_program_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1105,7 +1105,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_version (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1153,7 +1153,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_copyright (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1212,7 +1212,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_comments (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1269,7 +1269,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_license (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1380,7 +1380,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_website (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1432,7 +1432,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_website_label (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1486,7 +1486,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_authors (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1541,7 +1541,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog  *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_documenters (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1596,7 +1596,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 gtk_about_dialog_get_artists (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
@@ -1650,7 +1650,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
 {
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
@@ -1806,7 +1806,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about,
  *
  * Since: 2.6
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 42eba58..68c24d7 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -112,19 +112,19 @@ GtkWidget             *gtk_about_dialog_new                    (void);
 void                   gtk_show_about_dialog                   (GtkWindow       *parent,
                                                                 const gchar     *first_property_name,
                                                                 ...) G_GNUC_NULL_TERMINATED;
-G_CONST_RETURN gchar  *gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_program_name       (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_program_name       (GtkAboutDialog  *about,
                                                                 const gchar     *name);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_version            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_version            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_version            (GtkAboutDialog  *about,
                                                                 const gchar     *version);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_copyright          (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_copyright          (GtkAboutDialog  *about,
                                                                 const gchar     *copyright);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_comments           (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_comments           (GtkAboutDialog  *about,
                                                                 const gchar     *comments);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_license            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_license            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_license            (GtkAboutDialog  *about,
                                                                 const gchar     *license);
 void                   gtk_about_dialog_set_license_type       (GtkAboutDialog  *about,
@@ -135,28 +135,28 @@ gboolean               gtk_about_dialog_get_wrap_license       (GtkAboutDialog
 void                   gtk_about_dialog_set_wrap_license       (GtkAboutDialog  *about,
                                                                 gboolean         wrap_license);
 
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website            (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_website            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website            (GtkAboutDialog  *about,
                                                                 const gchar     *website);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_website_label      (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_website_label      (GtkAboutDialog  *about,
                                                                 const gchar     *website_label);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_authors            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_authors            (GtkAboutDialog  *about,
                                                                 const gchar    **authors);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_documenters        (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_documenters        (GtkAboutDialog  *about,
                                                                 const gchar    **documenters);
-G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
+const gchar* const *   gtk_about_dialog_get_artists            (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_artists            (GtkAboutDialog  *about,
                                                                 const gchar    **artists);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_translator_credits (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_translator_credits (GtkAboutDialog  *about,
                                                                 const gchar     *translator_credits);
 GdkPixbuf             *gtk_about_dialog_get_logo               (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_logo               (GtkAboutDialog  *about,
                                                                 GdkPixbuf       *logo);
-G_CONST_RETURN gchar  *gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
+const gchar *          gtk_about_dialog_get_logo_icon_name     (GtkAboutDialog  *about);
 void                   gtk_about_dialog_set_logo_icon_name     (GtkAboutDialog  *about,
                                                                 const gchar     *icon_name);
 
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 45a93a0..b1e4957 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -995,7 +995,7 @@ gtk_action_get_proxies (GtkAction *action)
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_get_name (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1292,7 +1292,7 @@ gtk_action_set_label (GtkAction	  *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_label (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1338,7 +1338,7 @@ gtk_action_set_short_label (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_short_label (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1470,7 +1470,7 @@ gtk_action_set_tooltip (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_tooltip (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1528,7 +1528,7 @@ gtk_action_set_stock_id (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_stock_id (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1570,7 +1570,7 @@ gtk_action_set_icon_name (GtkAction   *action,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_action_get_icon_name (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
@@ -1687,7 +1687,7 @@ gtk_action_set_accel_path (GtkAction   *action,
  *   if none is set. The returned string is owned by GTK+ 
  *   and must not be freed or modified.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_get_accel_path (GtkAction *action)
 {
   g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index c1212f2..f60173e 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -90,7 +90,7 @@ GtkAction   *gtk_action_new                    (const gchar *name,
 						const gchar *label,
 						const gchar *tooltip,
 						const gchar *stock_id);
-G_CONST_RETURN gchar* gtk_action_get_name      (GtkAction     *action);
+const gchar* gtk_action_get_name               (GtkAction     *action);
 gboolean     gtk_action_is_sensitive           (GtkAction     *action);
 gboolean     gtk_action_get_sensitive          (GtkAction     *action);
 void         gtk_action_set_sensitive          (GtkAction     *action,
@@ -108,7 +108,7 @@ GtkWidget *  gtk_action_create_menu            (GtkAction     *action);
 GSList *     gtk_action_get_proxies            (GtkAction     *action);
 void         gtk_action_connect_accelerator    (GtkAction     *action);
 void         gtk_action_disconnect_accelerator (GtkAction     *action);
-G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction     *action);
+const gchar *gtk_action_get_accel_path         (GtkAction     *action);
 GClosure    *gtk_action_get_accel_closure      (GtkAction     *action);
 void         gtk_action_block_activate         (GtkAction     *action);
 void         gtk_action_unblock_activate       (GtkAction     *action);
@@ -133,22 +133,22 @@ void         _gtk_action_sync_menu_visible     (GtkAction     *action,
 
 void                  gtk_action_set_label              (GtkAction   *action,
                                                          const gchar *label);
-G_CONST_RETURN gchar *gtk_action_get_label              (GtkAction   *action);
+const gchar *         gtk_action_get_label              (GtkAction   *action);
 void                  gtk_action_set_short_label        (GtkAction   *action,
                                                          const gchar *short_label);
-G_CONST_RETURN gchar *gtk_action_get_short_label        (GtkAction   *action);
+const gchar *         gtk_action_get_short_label        (GtkAction   *action);
 void                  gtk_action_set_tooltip            (GtkAction   *action,
                                                          const gchar *tooltip);
-G_CONST_RETURN gchar *gtk_action_get_tooltip            (GtkAction   *action);
+const gchar *         gtk_action_get_tooltip            (GtkAction   *action);
 void                  gtk_action_set_stock_id           (GtkAction   *action,
                                                          const gchar *stock_id);
-G_CONST_RETURN gchar *gtk_action_get_stock_id           (GtkAction   *action);
+const gchar *         gtk_action_get_stock_id           (GtkAction   *action);
 void                  gtk_action_set_gicon              (GtkAction   *action,
                                                          GIcon       *icon);
 GIcon                *gtk_action_get_gicon              (GtkAction   *action);
 void                  gtk_action_set_icon_name          (GtkAction   *action,
                                                          const gchar *icon_name);
-G_CONST_RETURN gchar *gtk_action_get_icon_name          (GtkAction   *action);
+const gchar *         gtk_action_get_icon_name          (GtkAction   *action);
 void                  gtk_action_set_visible_horizontal (GtkAction   *action,
                                                          gboolean     visible_horizontal);
 gboolean              gtk_action_get_visible_horizontal (GtkAction   *action);
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index a3d1f5b..cb16e44 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -645,7 +645,7 @@ gtk_action_group_real_get_action (GtkActionGroup *self,
  * 
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_get_name (GtkActionGroup *action_group)
 {
   GtkActionGroupPrivate *private;
@@ -1442,7 +1442,7 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
  *
  * Since: 2.6
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_translate_string (GtkActionGroup *action_group,
 				   const gchar    *string)
 {
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 33fa000..aae24a8 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -160,7 +160,7 @@ struct _GtkRadioActionEntry
 
 GType           gtk_action_group_get_type                (void) G_GNUC_CONST;
 GtkActionGroup *gtk_action_group_new                     (const gchar                *name);
-G_CONST_RETURN gchar *gtk_action_group_get_name          (GtkActionGroup             *action_group);
+const gchar    *gtk_action_group_get_name                (GtkActionGroup             *action_group);
 gboolean        gtk_action_group_get_sensitive           (GtkActionGroup             *action_group);
 void            gtk_action_group_set_sensitive           (GtkActionGroup             *action_group,
 							  gboolean                    sensitive);
@@ -214,7 +214,7 @@ void            gtk_action_group_set_translate_func      (GtkActionGroup
 							  GDestroyNotify              notify);
 void            gtk_action_group_set_translation_domain  (GtkActionGroup             *action_group,
 							  const gchar                *domain);
-G_CONST_RETURN gchar *gtk_action_group_translate_string  (GtkActionGroup             *action_group,
+const gchar *   gtk_action_group_translate_string        (GtkActionGroup             *action_group,
   	                                                  const gchar                *string);
 
 /* Protected for use by GtkAction */
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 17ecf46..eec62ea 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -2089,7 +2089,7 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_assistant_get_page_title (GtkAssistant *assistant,
                               GtkWidget    *page)
 {
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 62f9ead..114df50 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -151,7 +151,7 @@ GtkAssistantPageType  gtk_assistant_get_page_type         (GtkAssistant
 void                  gtk_assistant_set_page_title        (GtkAssistant         *assistant,
 							   GtkWidget            *page,
 							   const gchar          *title);
-G_CONST_RETURN gchar *gtk_assistant_get_page_title        (GtkAssistant         *assistant,
+const gchar *         gtk_assistant_get_page_title        (GtkAssistant         *assistant,
 							   GtkWidget            *page);
 void                  gtk_assistant_set_page_header_image (GtkAssistant         *assistant,
 							   GtkWidget            *page,
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 9c5e7ab..4291875 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -2041,7 +2041,7 @@ gtk_button_set_label (GtkButton   *button,
  * Return value: The text of the label widget. This string is owned
  * by the widget and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_button_get_label (GtkButton *button)
 {
   g_return_val_if_fail (GTK_IS_BUTTON (button), NULL);
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 2ad602e..881a87b 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -96,7 +96,7 @@ void                  gtk_button_set_relief         (GtkButton      *button,
 GtkReliefStyle        gtk_button_get_relief         (GtkButton      *button);
 void                  gtk_button_set_label          (GtkButton      *button,
 						     const gchar    *label);
-G_CONST_RETURN gchar *gtk_button_get_label          (GtkButton      *button);
+const gchar *         gtk_button_get_label          (GtkButton      *button);
 void                  gtk_button_set_use_underline  (GtkButton      *button,
 						     gboolean        use_underline);
 gboolean              gtk_button_get_use_underline  (GtkButton      *button);
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 0af3c53..099c4e5 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -2376,7 +2376,7 @@ gtk_cell_area_apply_attributes (GtkCellArea  *area,
  *
  * Since: 3.0
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_cell_area_get_current_path_string (GtkCellArea *area)
 {
   GtkCellAreaPrivate *priv;
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index e206605..7ae49a4 100644
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -353,7 +353,7 @@ void                  gtk_cell_area_get_preferred_width_for_height (GtkCellArea
                                                                     gint                height,
                                                                     gint               *minimum_width,
                                                                     gint               *natural_width);
-G_CONST_RETURN gchar *gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
+const gchar *         gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
 
 
 /* Attributes */
@@ -432,7 +432,7 @@ void                  gtk_cell_area_remove_focus_sibling           (GtkCellArea
 gboolean              gtk_cell_area_is_focus_sibling               (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer,
                                                                     GtkCellRenderer      *sibling);
-G_CONST_RETURN GList *gtk_cell_area_get_focus_siblings             (GtkCellArea          *area,
+const GList *         gtk_cell_area_get_focus_siblings             (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
 GtkCellRenderer      *gtk_cell_area_get_focus_from_sibling         (GtkCellArea          *area,
                                                                     GtkCellRenderer      *renderer);
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 784abf3..20cd856 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -897,7 +897,7 @@ gtk_color_button_set_title (GtkColorButton *color_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_color_button_get_title (GtkColorButton *color_button)
 {
   g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), NULL);
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 98e7e8c..7e1aae1 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -93,7 +93,7 @@ void       gtk_color_button_get_rgba       (GtkColorButton *color_button,
                                             GdkRGBA        *rgba);
 void       gtk_color_button_set_title      (GtkColorButton *color_button,
                                             const gchar    *title);
-G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
+const gchar *gtk_color_button_get_title    (GtkColorButton *color_button);
 
 
 G_END_DECLS
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 98d3e0c..be820e3 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4846,7 +4846,7 @@ gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_combo_box_get_title (GtkComboBox *combo_box)
 {
   g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 124a9bf..2b277c6 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -88,8 +88,8 @@ gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
 void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
                                                     gboolean     add_tearoffs);
 
-G_CONST_RETURN gchar *gtk_combo_box_get_title      (GtkComboBox *combo_box);
-void                  gtk_combo_box_set_title      (GtkComboBox *combo_box,
+const gchar * gtk_combo_box_get_title              (GtkComboBox *combo_box);
+void          gtk_combo_box_set_title              (GtkComboBox *combo_box,
                                                     const gchar *title);
 
 gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 68c1658..9ecb655 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7105,7 +7105,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  *      storage in the widget and must not be freed, modified or
  *      stored.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_entry_get_text (GtkEntry *entry)
 {
   g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
@@ -7370,7 +7370,7 @@ gtk_entry_set_inner_border (GtkEntry        *entry,
  *
  * Since: 2.10
  **/
-G_CONST_RETURN GtkBorder *
+const GtkBorder *
 gtk_entry_get_inner_border (GtkEntry *entry)
 {
   g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 3bd37d3..1acca59 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -149,9 +149,9 @@ void       gtk_entry_set_has_frame              (GtkEntry      *entry,
                                                  gboolean       setting);
 gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
 
-void       gtk_entry_set_inner_border                (GtkEntry        *entry,
-                                                      const GtkBorder *border);
-G_CONST_RETURN GtkBorder* gtk_entry_get_inner_border (GtkEntry        *entry);
+void             gtk_entry_set_inner_border     (GtkEntry        *entry,
+                                                 const GtkBorder *border);
+const GtkBorder* gtk_entry_get_inner_border     (GtkEntry        *entry);
 
 void       gtk_entry_set_overwrite_mode         (GtkEntry      *entry,
                                                  gboolean       overwrite);
@@ -176,7 +176,7 @@ gint       gtk_entry_get_width_chars            (GtkEntry      *entry);
 void       gtk_entry_set_text                   (GtkEntry      *entry,
                                                  const gchar   *text);
 /* returns a reference to the text */
-G_CONST_RETURN gchar* gtk_entry_get_text        (GtkEntry      *entry);
+const gchar* gtk_entry_get_text        (GtkEntry      *entry);
 
 PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
 void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c
index 179a720..0829d56 100644
--- a/gtk/gtkentrybuffer.c
+++ b/gtk/gtkentrybuffer.c
@@ -519,7 +519,7 @@ gtk_entry_buffer_get_bytes (GtkEntryBuffer *buffer)
  *
  * Since: 2.18
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_entry_buffer_get_text (GtkEntryBuffer *buffer)
 {
   GtkEntryBufferClass *klass;
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 00e24c3..2378c68 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -101,7 +101,7 @@ gsize                     gtk_entry_buffer_get_bytes              (GtkEntryBuffe
 
 guint                     gtk_entry_buffer_get_length             (GtkEntryBuffer  *buffer);
 
-G_CONST_RETURN gchar*     gtk_entry_buffer_get_text               (GtkEntryBuffer  *buffer);
+const gchar*              gtk_entry_buffer_get_text               (GtkEntryBuffer  *buffer);
 
 void                      gtk_entry_buffer_set_text               (GtkEntryBuffer  *buffer,
                                                                    const gchar     *chars,
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 0370c12..b75bbc2 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1797,7 +1797,7 @@ gtk_expander_set_label (GtkExpander *expander,
  *
  * Since: 2.4
  */
-G_CONST_RETURN char *
+const char *
 gtk_expander_get_label (GtkExpander *expander)
 {
   GtkExpanderPrivate *priv;
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 993cf2b..7fbf282 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -82,7 +82,7 @@ gint                  gtk_expander_get_spacing       (GtkExpander *expander);
 
 void                  gtk_expander_set_label         (GtkExpander *expander,
 						      const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label         (GtkExpander *expander);
+const gchar *         gtk_expander_get_label         (GtkExpander *expander);
 
 void                  gtk_expander_set_use_underline (GtkExpander *expander,
 						      gboolean     use_underline);
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 43da440..53248f0 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2773,7 +2773,7 @@ gtk_file_chooser_button_set_title (GtkFileChooserButton *button,
  * 
  * Since: 2.6
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_file_chooser_button_get_title (GtkFileChooserButton *button)
 {
   g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), NULL);
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index e469ef7..fbf6fd2 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -68,7 +68,7 @@ GType                 gtk_file_chooser_button_get_type         (void) G_GNUC_CON
 GtkWidget *           gtk_file_chooser_button_new              (const gchar          *title,
 								GtkFileChooserAction  action);
 GtkWidget *           gtk_file_chooser_button_new_with_dialog  (GtkWidget            *dialog);
-G_CONST_RETURN gchar *gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
+const gchar *         gtk_file_chooser_button_get_title        (GtkFileChooserButton *button);
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
 								const gchar          *title);
 gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 5754979..4fdc624 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -404,7 +404,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_file_filter_get_name (GtkFileFilter *filter)
 {
   g_return_val_if_fail (GTK_IS_FILE_FILTER (filter), NULL);
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index 02e2775..c723199 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -96,7 +96,7 @@ GType gtk_file_filter_get_type (void) G_GNUC_CONST;
 GtkFileFilter *       gtk_file_filter_new      (void);
 void                  gtk_file_filter_set_name (GtkFileFilter *filter,
 						const gchar   *name);
-G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter);
+const gchar *         gtk_file_filter_get_name (GtkFileFilter *filter);
 
 void gtk_file_filter_add_mime_type      (GtkFileFilter      *filter,
 					 const gchar        *mime_type);
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 1f6c7b1..fc4797c 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -427,7 +427,7 @@ gtk_font_button_set_title (GtkFontButton *font_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_button_get_title (GtkFontButton *font_button)
 {
   g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL);
@@ -639,7 +639,7 @@ gtk_font_button_set_show_size (GtkFontButton *font_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_font_button_get_font_name (GtkFontButton *font_button)
 {
   g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL);
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index bc64767..79d6045 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -75,7 +75,7 @@ GType                 gtk_font_button_get_type       (void) G_GNUC_CONST;
 GtkWidget            *gtk_font_button_new            (void);
 GtkWidget            *gtk_font_button_new_with_font  (const gchar   *fontname);
 
-G_CONST_RETURN gchar *gtk_font_button_get_title      (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_title      (GtkFontButton *font_button);
 void                  gtk_font_button_set_title      (GtkFontButton *font_button,
                                                       const gchar   *title);
 gboolean              gtk_font_button_get_use_font   (GtkFontButton *font_button);
@@ -84,7 +84,7 @@ void                  gtk_font_button_set_use_font   (GtkFontButton *font_button
 gboolean              gtk_font_button_get_use_size   (GtkFontButton *font_button);
 void                  gtk_font_button_set_use_size   (GtkFontButton *font_button,
                                                       gboolean       use_size);
-G_CONST_RETURN gchar* gtk_font_button_get_font_name  (GtkFontButton *font_button);
+const gchar *         gtk_font_button_get_font_name  (GtkFontButton *font_button);
 gboolean              gtk_font_button_set_font_name  (GtkFontButton *font_button,
                                                       const gchar   *fontname);
 gboolean              gtk_font_button_get_show_style (GtkFontButton *font_button);
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a88fbbe..1de2580 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1540,7 +1540,7 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
  *     This string is owned by the widget and should not be 
  *     modified or freed 
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_selection_get_preview_text (GtkFontSelection *fontsel)
 {
   GtkFontSelectionPrivate *priv;
@@ -1823,7 +1823,7 @@ gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd,
  *     This string is owned by the widget and should not be 
  *     modified or freed 
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd)
 {
   GtkFontSelectionDialogPrivate *priv;
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index e481b6f..a9d5be9 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -161,7 +161,7 @@ gboolean   gtk_font_selection_dialog_set_font_name     (GtkFontSelectionDialog *
 
 /* This returns the text in the preview entry. You should copy the returned
    text if you need it. */
-G_CONST_RETURN gchar* 
+const gchar*
           gtk_font_selection_dialog_get_preview_text   (GtkFontSelectionDialog *fsd);
 
 /* This sets the text in the preview entry. It will be copied by the entry,
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 059aea1..7e89b7b 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -393,7 +393,7 @@ gtk_frame_set_label (GtkFrame *frame,
  *               a #GtkLabel. This string is owned by GTK+ and
  *               must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_frame_get_label (GtkFrame *frame)
 {
   GtkFramePrivate *priv;
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index d8485f1..04b0600 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -74,9 +74,9 @@ struct _GtkFrameClass
 GType      gtk_frame_get_type         (void) G_GNUC_CONST;
 GtkWidget* gtk_frame_new              (const gchar   *label);
 
-void                  gtk_frame_set_label (GtkFrame    *frame,
-					   const gchar *label);
-G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame    *frame);
+void          gtk_frame_set_label (GtkFrame    *frame,
+                                   const gchar *label);
+const gchar * gtk_frame_get_label (GtkFrame    *frame);
 
 void       gtk_frame_set_label_widget (GtkFrame      *frame,
 				       GtkWidget     *label_widget);
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 4e16bfb..4c0ca4e 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1070,7 +1070,7 @@ gtk_icon_size_from_name (const gchar *name)
  * Gets the canonical name of the given icon size. The returned string
  * is statically allocated and should not be freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_size_get_name (GtkIconSize  size)
 {
   if (size >= icon_sizes_used)
@@ -2109,7 +2109,7 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source,
  * Return value: (type filename): image filename. This string must not
  * be modified or freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_source_get_filename (const GtkIconSource *source)
 {
   g_return_val_if_fail (source != NULL, NULL);
@@ -2130,7 +2130,7 @@ gtk_icon_source_get_filename (const GtkIconSource *source)
  *
  * Return value: icon name. This string must not be modified or freed.
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_icon_source_get_icon_name (const GtkIconSource *source)
 {
   g_return_val_if_fail (source != NULL, NULL);
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 1faf7b7..17b0c92 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -109,7 +109,7 @@ GtkIconSize           gtk_icon_size_register       (const gchar *name,
 void                  gtk_icon_size_register_alias (const gchar *alias,
                                                     GtkIconSize  target);
 GtkIconSize           gtk_icon_size_from_name      (const gchar *name);
-G_CONST_RETURN gchar* gtk_icon_size_get_name       (GtkIconSize  size);
+const gchar*          gtk_icon_size_get_name       (GtkIconSize  size);
 
 /* Icon sets */
 
@@ -153,9 +153,9 @@ void           gtk_icon_source_set_icon_name            (GtkIconSource       *so
 void           gtk_icon_source_set_pixbuf               (GtkIconSource       *source,
                                                          GdkPixbuf           *pixbuf);
 
-G_CONST_RETURN gchar* gtk_icon_source_get_filename  (const GtkIconSource *source);
-G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source);
-GdkPixbuf*            gtk_icon_source_get_pixbuf    (const GtkIconSource *source);
+const gchar *    gtk_icon_source_get_filename             (const GtkIconSource *source);
+const gchar *    gtk_icon_source_get_icon_name            (const GtkIconSource *source);
+GdkPixbuf*       gtk_icon_source_get_pixbuf               (const GtkIconSource *source);
 
 void             gtk_icon_source_set_direction_wildcarded (GtkIconSource       *source,
                                                            gboolean             setting);
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 7a0a557..132378f 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2688,7 +2688,7 @@ gtk_icon_info_get_base_size (GtkIconInfo *icon_info)
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 {
   g_return_val_if_fail (icon_info != NULL, NULL);
@@ -3564,7 +3564,7 @@ gtk_icon_info_get_attach_points (GtkIconInfo *icon_info,
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_icon_info_get_display_name (GtkIconInfo *icon_info)
 {
   g_return_val_if_fail (icon_info != NULL, NULL);
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 607bdf0..bbb54d9 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -174,7 +174,7 @@ GtkIconInfo *         gtk_icon_info_new_for_pixbuf     (GtkIconTheme  *icon_them
                                                         GdkPixbuf     *pixbuf);
 
 gint                  gtk_icon_info_get_base_size      (GtkIconInfo   *icon_info);
-G_CONST_RETURN gchar *gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
+const gchar *         gtk_icon_info_get_filename       (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_get_builtin_pixbuf (GtkIconInfo   *icon_info);
 GdkPixbuf *           gtk_icon_info_load_icon          (GtkIconInfo   *icon_info,
 							GError       **error);
@@ -204,7 +204,7 @@ gboolean              gtk_icon_info_get_embedded_rect (GtkIconInfo    *icon_info
 gboolean              gtk_icon_info_get_attach_points (GtkIconInfo    *icon_info,
 						       GdkPoint      **points,
 						       gint           *n_points);
-G_CONST_RETURN gchar *gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
+const gchar *         gtk_icon_info_get_display_name  (GtkIconInfo    *icon_info);
 
 /* Non-public methods */
 void _gtk_icon_theme_check_reload                     (GdkDisplay *display);
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 25d4173..42ca90e 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1259,9 +1259,9 @@ gtk_image_get_animation (GtkImage *image)
  * Since: 2.6
  **/
 void
-gtk_image_get_icon_name  (GtkImage              *image,
-			  G_CONST_RETURN gchar **icon_name,
-			  GtkIconSize           *size)
+gtk_image_get_icon_name  (GtkImage     *image,
+			  const gchar **icon_name,
+			  GtkIconSize  *size)
 {
   GtkImagePrivate *priv;
 
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index bdd74e7..ec8d243 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -154,9 +154,9 @@ void       gtk_image_get_icon_set (GtkImage         *image,
                                    GtkIconSet      **icon_set,
                                    GtkIconSize      *size);
 GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
-void       gtk_image_get_icon_name (GtkImage              *image,
-				    G_CONST_RETURN gchar **icon_name,
-				    GtkIconSize           *size);
+void       gtk_image_get_icon_name (GtkImage     *image,
+				    const gchar **icon_name,
+				    GtkIconSize  *size);
 void       gtk_image_get_gicon     (GtkImage              *image,
 				    GIcon                **gicon,
 				    GtkIconSize           *size);
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 6d3a2d7..33abea9 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -82,7 +82,7 @@ static void gtk_image_menu_item_toggle_size_request  (GtkMenuItem      *menu_ite
                                                       gint             *requisition);
 static void gtk_image_menu_item_set_label            (GtkMenuItem      *menu_item,
                                                       const gchar      *label);
-static G_CONST_RETURN gchar *gtk_image_menu_item_get_label (GtkMenuItem *menu_item);
+static const gchar * gtk_image_menu_item_get_label   (GtkMenuItem *menu_item);
 
 static void gtk_image_menu_item_forall               (GtkContainer    *container,
                                                       gboolean         include_internals,
@@ -413,7 +413,7 @@ gtk_image_menu_item_set_label (GtkMenuItem      *menu_item,
     }
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_image_menu_item_get_label (GtkMenuItem *menu_item)
 {
   GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv;
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 4f90252..707f477 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2082,7 +2082,7 @@ gtk_label_set_label (GtkLabel    *label,
  * Return value: the text of the label widget. This string is
  *   owned by the widget and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_label (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
@@ -2547,7 +2547,7 @@ gtk_label_set_markup_with_mnemonic (GtkLabel    *label,
  * Return value: the text in the label widget. This is the internal
  *   string used by the label, and must not be modified.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_text (GtkLabel *label)
 {
   g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
@@ -6469,7 +6469,7 @@ gtk_label_get_current_link (GtkLabel *label)
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_label_get_current_uri (GtkLabel *label)
 {
   GtkLabelLink *link;
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 9085005..f22c84d 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -93,13 +93,13 @@ GtkWidget*            gtk_label_new               (const gchar   *str);
 GtkWidget*            gtk_label_new_with_mnemonic (const gchar   *str);
 void                  gtk_label_set_text          (GtkLabel      *label,
 						   const gchar   *str);
-G_CONST_RETURN gchar* gtk_label_get_text          (GtkLabel      *label);
+const gchar*          gtk_label_get_text          (GtkLabel      *label);
 void                  gtk_label_set_attributes    (GtkLabel      *label,
 						   PangoAttrList *attrs);
 PangoAttrList        *gtk_label_get_attributes    (GtkLabel      *label);
 void                  gtk_label_set_label         (GtkLabel      *label,
 						   const gchar   *str);
-G_CONST_RETURN gchar *gtk_label_get_label         (GtkLabel      *label);
+const gchar *         gtk_label_get_label         (GtkLabel      *label);
 void                  gtk_label_set_markup        (GtkLabel      *label,
 						   const gchar   *str);
 void                  gtk_label_set_use_markup    (GtkLabel      *label,
@@ -159,7 +159,7 @@ void         gtk_label_set_single_line_mode  (GtkLabel *label,
                                               gboolean single_line_mode);
 gboolean     gtk_label_get_single_line_mode  (GtkLabel *label);
 
-G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label);
+const gchar *gtk_label_get_current_uri (GtkLabel *label);
 void         gtk_label_set_track_visited_links  (GtkLabel *label,
                                                  gboolean  track_links);
 gboolean     gtk_label_get_track_visited_links  (GtkLabel *label);
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 261a0e8..91b6fcb 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -762,7 +762,7 @@ gtk_link_button_set_uri (GtkLinkButton *link_button,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_link_button_get_uri (GtkLinkButton *link_button)
 {
   g_return_val_if_fail (GTK_IS_LINK_BUTTON (link_button), NULL);
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 06e3616..1f74477 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -87,7 +87,7 @@ GtkWidget *           gtk_link_button_new               (const gchar   *uri);
 GtkWidget *           gtk_link_button_new_with_label    (const gchar   *uri,
 						         const gchar   *label);
 
-G_CONST_RETURN gchar *gtk_link_button_get_uri           (GtkLinkButton *link_button);
+const gchar *         gtk_link_button_get_uri           (GtkLinkButton *link_button);
 void                  gtk_link_button_set_uri           (GtkLinkButton *link_button,
 						         const gchar   *uri);
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9ed6423..1dfc518 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2406,7 +2406,7 @@ gtk_menu_set_title (GtkMenu     *menu,
  *     has no title set on it. This string is owned by GTK+
  *     and should not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_get_title (GtkMenu *menu)
 {
   g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 5f49dfb..fb5e197 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -182,9 +182,9 @@ gboolean   gtk_menu_get_tearoff_state     (GtkMenu             *menu);
 /* This sets the window manager title for the window that
  * appears when a menu is torn off
  */
-void       gtk_menu_set_title             (GtkMenu             *menu,
-					   const gchar         *title);
-G_CONST_RETURN gchar *gtk_menu_get_title  (GtkMenu             *menu);
+void          gtk_menu_set_title          (GtkMenu             *menu,
+                                           const gchar         *title);
+const gchar * gtk_menu_get_title          (GtkMenu             *menu);
 
 void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 9381317..b54fa8a 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -122,7 +122,7 @@ static gboolean gtk_menu_item_can_activate_accel (GtkWidget *widget,
 
 static void gtk_real_menu_item_set_label (GtkMenuItem     *menu_item,
                                           const gchar     *label);
-static G_CONST_RETURN gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item);
+static const gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item);
 
 static void gtk_menu_item_get_preferred_width            (GtkWidget           *widget,
                                                           gint                *minimum_size,
@@ -1796,7 +1796,7 @@ gtk_real_menu_item_set_label (GtkMenuItem *menu_item,
     }
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gtk_real_menu_item_get_label (GtkMenuItem *menu_item)
 {
   GtkWidget *child;
@@ -2421,7 +2421,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
  *
  * Since: 2.14
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_item_get_accel_path (GtkMenuItem *menu_item)
 {
   g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
@@ -2504,7 +2504,7 @@ gtk_menu_item_set_label (GtkMenuItem *menu_item,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_menu_item_get_label (GtkMenuItem *menu_item)
 {
   g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 6c8dee4..82f15a4 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -76,7 +76,7 @@ struct _GtkMenuItemClass
                                  gint         allocation);
   void (* set_label)            (GtkMenuItem *menu_item,
                                  const gchar *label);
-  G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item);
+  const gchar * (* get_label)   (GtkMenuItem *menu_item);
 
   void (* select)               (GtkMenuItem *menu_item);
   void (* deselect)             (GtkMenuItem *menu_item);
@@ -109,11 +109,11 @@ void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
 gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
 void       gtk_menu_item_set_accel_path       (GtkMenuItem         *menu_item,
                                                const gchar         *accel_path);
-G_CONST_RETURN gchar* gtk_menu_item_get_accel_path (GtkMenuItem    *menu_item);
+const gchar * gtk_menu_item_get_accel_path    (GtkMenuItem    *menu_item);
 
-void       gtk_menu_item_set_label            (GtkMenuItem         *menu_item,
+void          gtk_menu_item_set_label         (GtkMenuItem         *menu_item,
                                                const gchar         *label);
-G_CONST_RETURN gchar *gtk_menu_item_get_label (GtkMenuItem         *menu_item);
+const gchar * gtk_menu_item_get_label         (GtkMenuItem         *menu_item);
 
 void       gtk_menu_item_set_use_underline    (GtkMenuItem         *menu_item,
                                                gboolean             setting);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e03ed51..5981e58 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7516,7 +7516,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
  *     tab label widget is not a #GtkLabel. The string is owned
  *     by the widget and must not be freed.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
                                  GtkWidget   *child)
 {
@@ -7653,7 +7653,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
  *     menu label, or the menu label widget is not a #GtkLabel.
  *     The string is owned by the widget and must not be freed.
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
                                   GtkWidget *child)
 {
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index d69d4f0..9fe962e 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -212,20 +212,20 @@ GtkWidget * gtk_notebook_get_tab_label    (GtkNotebook *notebook,
 void gtk_notebook_set_tab_label           (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   GtkWidget   *tab_label);
-void gtk_notebook_set_tab_label_text      (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *tab_text);
-G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
-						       GtkWidget   *child);
+void          gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
+                                               GtkWidget   *child,
+                                               const gchar *tab_text);
+const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
+                                               GtkWidget   *child);
 GtkWidget * gtk_notebook_get_menu_label   (GtkNotebook *notebook,
 					   GtkWidget   *child);
 void gtk_notebook_set_menu_label          (GtkNotebook *notebook,
 					   GtkWidget   *child,
 					   GtkWidget   *menu_label);
-void gtk_notebook_set_menu_label_text     (GtkNotebook *notebook,
-					   GtkWidget   *child,
-					   const gchar *menu_text);
-G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
+void          gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
+                                                GtkWidget   *child,
+                                                const gchar *menu_text);
+const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
 							GtkWidget   *child);
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
 					   GtkWidget   *child,
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 23017ea..06852c0 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -516,7 +516,7 @@ gtk_paper_size_get_paper_sizes (gboolean include_custom)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_name (GtkPaperSize *size)
 {
   if (size->name)
@@ -535,7 +535,7 @@ gtk_paper_size_get_name (GtkPaperSize *size)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_display_name (GtkPaperSize *size)
 {
   const gchar *display_name;
@@ -560,7 +560,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_ppd_name (GtkPaperSize *size)
 {
   if (size->ppd_name)
@@ -660,7 +660,7 @@ gtk_paper_size_set_size (GtkPaperSize *size,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_paper_size_get_default (void)
 {
   char *locale, *freeme = NULL;
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 864eb38..0cdb8ae 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -105,9 +105,9 @@ gboolean      gtk_paper_size_is_equal     (GtkPaperSize *size1,
 GList        *gtk_paper_size_get_paper_sizes (gboolean include_custom);
 
 /* The width is always the shortest side, measure in mm */
-G_CONST_RETURN gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
-G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_name         (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size);
+const gchar *gtk_paper_size_get_ppd_name     (GtkPaperSize *size);
 
 gdouble  gtk_paper_size_get_width        (GtkPaperSize *size, GtkUnit unit);
 gdouble  gtk_paper_size_get_height       (GtkPaperSize *size, GtkUnit unit);
@@ -128,7 +128,7 @@ gdouble gtk_paper_size_get_default_left_margin   (GtkPaperSize *size,
 gdouble gtk_paper_size_get_default_right_margin  (GtkPaperSize *size,
 						  GtkUnit       unit);
 
-G_CONST_RETURN gchar *gtk_paper_size_get_default (void);
+const gchar *gtk_paper_size_get_default (void);
 
 GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
 					        const gchar *group_name,
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 95df2f0..d6ac906 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -436,7 +436,7 @@ gtk_printer_get_backend (GtkPrinter *printer)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_name (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -454,7 +454,7 @@ gtk_printer_get_name (GtkPrinter *printer)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_description (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -492,7 +492,7 @@ gtk_printer_set_description (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_state_message (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -530,7 +530,7 @@ gtk_printer_set_state_message (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_printer_get_location (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
@@ -568,7 +568,7 @@ gtk_printer_set_location (GtkPrinter  *printer,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar * 
+const gchar *
 gtk_printer_get_icon_name (GtkPrinter *printer)
 {
   g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL);
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index f2c18c1..3ea2552 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -95,11 +95,11 @@ GtkPrinter              *gtk_printer_new                   (const gchar     *nam
 							    GtkPrintBackend *backend,
 							    gboolean         virtual_);
 GtkPrintBackend         *gtk_printer_get_backend           (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_name              (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_state_message     (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_description       (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_location          (GtkPrinter      *printer);
-G_CONST_RETURN gchar    *gtk_printer_get_icon_name         (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_name              (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_state_message     (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_description       (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_location          (GtkPrinter      *printer);
+const gchar *            gtk_printer_get_icon_name         (GtkPrinter      *printer);
 gint                     gtk_printer_get_job_count         (GtkPrinter      *printer);
 gboolean                 gtk_printer_is_active             (GtkPrinter      *printer);
 gboolean                 gtk_printer_is_paused             (GtkPrinter      *printer);
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index 58d3397..bb9a212 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -376,7 +376,7 @@ gtk_print_job_get_printer (GtkPrintJob *job)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_job_get_title (GtkPrintJob *job)
 {
   g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL);
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index d09004a..3851e40 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -85,7 +85,7 @@ GtkPrintJob             *gtk_print_job_new                    (const gchar
 							       GtkPageSetup             *page_setup);
 GtkPrintSettings        *gtk_print_job_get_settings           (GtkPrintJob              *job);
 GtkPrinter              *gtk_print_job_get_printer            (GtkPrintJob              *job);
-G_CONST_RETURN gchar    *gtk_print_job_get_title              (GtkPrintJob              *job);
+const gchar *            gtk_print_job_get_title              (GtkPrintJob              *job);
 GtkPrintStatus           gtk_print_job_get_status             (GtkPrintJob              *job);
 gboolean                 gtk_print_job_set_source_file        (GtkPrintJob              *job,
 							       const gchar              *filename,
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index ff95003..ebc7ad4 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1833,7 +1833,7 @@ gtk_print_operation_get_status (GtkPrintOperation *op)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_operation_get_status_string (GtkPrintOperation *op)
 {
   g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), "");
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index c0ee030..4d51e4d 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -236,7 +236,7 @@ GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOper
 void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
                                                                     GError            **error);
 GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
-G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
+const gchar *           gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);
 void                    gtk_print_operation_cancel                 (GtkPrintOperation  *op);
 void                    gtk_print_operation_draw_page_finish       (GtkPrintOperation  *op);
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 64c8e51..b1938cb 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -147,7 +147,7 @@ gtk_print_settings_copy (GtkPrintSettings *other)
  * 
  * Since: 2.10
  */
-G_CONST_RETURN gchar *        
+const gchar *
 gtk_print_settings_get (GtkPrintSettings *settings,
 			const gchar      *key)
 {
@@ -502,7 +502,7 @@ gtk_print_settings_foreach (GtkPrintSettings    *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *       
+const gchar *
 gtk_print_settings_get_printer (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PRINTER);
@@ -1518,7 +1518,7 @@ gtk_print_settings_set_page_ranges  (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_default_source (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DEFAULT_SOURCE);
@@ -1553,7 +1553,7 @@ gtk_print_settings_set_default_source (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_media_type (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_MEDIA_TYPE);
@@ -1588,7 +1588,7 @@ gtk_print_settings_set_media_type (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_dither (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DITHER);
@@ -1652,7 +1652,7 @@ gtk_print_settings_set_finishings (GtkPrintSettings *settings,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_print_settings_get_output_bin (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_BIN);
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 102c6c4..401c0ca 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -71,7 +71,7 @@ void              gtk_print_settings_to_key_file             (GtkPrintSettings
 							      const gchar          *group_name);
 gboolean          gtk_print_settings_has_key                 (GtkPrintSettings     *settings,
 							      const gchar          *key);
-G_CONST_RETURN gchar *gtk_print_settings_get                 (GtkPrintSettings     *settings,
+const gchar *     gtk_print_settings_get                     (GtkPrintSettings     *settings,
 							      const gchar          *key);
 void              gtk_print_settings_set                     (GtkPrintSettings     *settings,
 							      const gchar          *key,
@@ -145,7 +145,7 @@ void              gtk_print_settings_set_int                 (GtkPrintSettings
 
 /* Helpers: */
 
-G_CONST_RETURN gchar *gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_printer           (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_printer           (GtkPrintSettings   *settings,
 								const gchar        *printer);
 GtkPageOrientation    gtk_print_settings_get_orientation       (GtkPrintSettings   *settings);
@@ -213,19 +213,19 @@ void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_page_set          (GtkPrintSettings   *settings,
 								GtkPageSet          page_set);
-G_CONST_RETURN gchar *gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_default_source    (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_default_source    (GtkPrintSettings   *settings,
 								const gchar        *default_source);
-G_CONST_RETURN gchar *gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_media_type        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_media_type        (GtkPrintSettings   *settings,
 								const gchar        *media_type);
-G_CONST_RETURN gchar *gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_dither            (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_dither            (GtkPrintSettings   *settings,
 								const gchar        *dither);
-G_CONST_RETURN gchar *gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_finishings        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_finishings        (GtkPrintSettings   *settings,
 								const gchar        *finishings);
-G_CONST_RETURN gchar *gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
+const gchar *         gtk_print_settings_get_output_bin        (GtkPrintSettings   *settings);
 void                  gtk_print_settings_set_output_bin        (GtkPrintSettings   *settings,
 								const gchar        *output_bin);
 
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index d97a81c..8af5d09 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -1256,7 +1256,7 @@ gtk_progress_bar_set_inverted (GtkProgressBar *pbar,
  * Return value: text, or %NULL; this string is owned by the widget
  * and should not be modified or freed.
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_progress_bar_get_text (GtkProgressBar *pbar)
 {
   g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), NULL);
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index be14b7c..b641813 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -81,9 +81,9 @@ void       gtk_progress_bar_set_pulse_step       (GtkProgressBar *pbar,
 void       gtk_progress_bar_set_inverted         (GtkProgressBar *pbar,
                                                   gboolean        inverted);
 
-G_CONST_RETURN gchar* gtk_progress_bar_get_text       (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
-gdouble               gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
+const gchar *      gtk_progress_bar_get_text       (GtkProgressBar *pbar);
+gdouble            gtk_progress_bar_get_fraction   (GtkProgressBar *pbar);
+gdouble            gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar);
 
 gboolean           gtk_progress_bar_get_inverted    (GtkProgressBar *pbar);
 void               gtk_progress_bar_set_ellipsize (GtkProgressBar     *pbar,
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index fbdc88c..07a4a0a 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -458,7 +458,7 @@ gtk_recent_filter_set_name (GtkRecentFilter *filter,
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_filter_get_name (GtkRecentFilter *filter)
 {
   g_return_val_if_fail (GTK_IS_RECENT_FILTER (filter), NULL);
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index ad3fd09..163fcc5 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -99,7 +99,7 @@ GType                 gtk_recent_filter_get_type (void) G_GNUC_CONST;
 GtkRecentFilter *     gtk_recent_filter_new      (void);
 void                  gtk_recent_filter_set_name (GtkRecentFilter *filter,
 						  const gchar     *name);
-G_CONST_RETURN gchar *gtk_recent_filter_get_name (GtkRecentFilter *filter);
+const gchar *         gtk_recent_filter_get_name (GtkRecentFilter *filter);
 
 void gtk_recent_filter_add_mime_type      (GtkRecentFilter      *filter,
 					   const gchar          *mime_type);
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index a33b58a..dbe83fa 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1539,7 +1539,7 @@ gtk_recent_info_unref (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_uri (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1559,7 +1559,7 @@ gtk_recent_info_get_uri (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_display_name (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1581,7 +1581,7 @@ gtk_recent_info_get_display_name (GtkRecentInfo *info)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_description (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
@@ -1600,7 +1600,7 @@ gtk_recent_info_get_description (GtkRecentInfo *info)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_recent_info_get_mime_type (GtkRecentInfo *info)
 {
   g_return_val_if_fail (info != NULL, NULL);
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 41e7c84..6d7bda6 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -191,10 +191,10 @@ GType	              gtk_recent_info_get_type             (void) G_GNUC_CONST;
 GtkRecentInfo *       gtk_recent_info_ref                  (GtkRecentInfo  *info);
 void                  gtk_recent_info_unref                (GtkRecentInfo  *info);
 
-G_CONST_RETURN gchar *gtk_recent_info_get_uri              (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_description      (GtkRecentInfo  *info);
-G_CONST_RETURN gchar *gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_uri              (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_display_name     (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_description      (GtkRecentInfo  *info);
+const gchar *         gtk_recent_info_get_mime_type        (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_added            (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_modified         (GtkRecentInfo  *info);
 time_t                gtk_recent_info_get_visited          (GtkRecentInfo  *info);
diff --git a/gtk/gtksearchenginebeagle.c b/gtk/gtksearchenginebeagle.c
index fe99b1e..1722d02 100644
--- a/gtk/gtksearchenginebeagle.c
+++ b/gtk/gtksearchenginebeagle.c
@@ -63,7 +63,7 @@ typedef enum
 static gboolean (*beagle_client_send_request_async) (BeagleClient   *client,
 						     BeagleRequest  *request,
 						     GError        **err) = NULL;
-static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
+static const char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
 static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
 static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL;
 static BeagleQuery *(*beagle_query_new) (void) = NULL;
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index cd7e9f4..72285e2 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2102,7 +2102,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
@@ -2134,7 +2134,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
  *
  * Since: 2.10
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
@@ -2887,7 +2887,7 @@ gtk_status_icon_set_title (GtkStatusIcon *status_icon,
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_status_icon_get_title (GtkStatusIcon *status_icon)
 {
   GtkStatusIconPrivate *priv;
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index 5508066..758ed0a 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -102,8 +102,8 @@ void                  gtk_status_icon_set_from_gicon     (GtkStatusIcon      *st
 GtkImageType          gtk_status_icon_get_storage_type   (GtkStatusIcon      *status_icon);
 
 GdkPixbuf            *gtk_status_icon_get_pixbuf         (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
-G_CONST_RETURN gchar *gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_stock          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_icon_name      (GtkStatusIcon      *status_icon);
 GIcon                *gtk_status_icon_get_gicon          (GtkStatusIcon      *status_icon);
 
 gint                  gtk_status_icon_get_size           (GtkStatusIcon      *status_icon);
@@ -120,7 +120,7 @@ void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *st
                                                           const gchar        *markup);
 void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
                                                           const gchar        *title);
-G_CONST_RETURN gchar *gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+const gchar *         gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
 void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
                                                           const gchar        *name);
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 1e5e85e..1e6e76d 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1696,7 +1696,7 @@ gtk_style_context_set_path (GtkStyleContext *context,
  *
  * Since: 3.0
  **/
-G_CONST_RETURN GtkWidgetPath *
+const GtkWidgetPath *
 gtk_style_context_get_path (GtkStyleContext *context)
 {
   GtkStyleContextPrivate *priv;
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index e687ff1..f3346fd 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -556,7 +556,7 @@ gboolean      gtk_style_context_state_is_running (GtkStyleContext *context,
 
 void          gtk_style_context_set_path     (GtkStyleContext *context,
                                               GtkWidgetPath   *path);
-G_CONST_RETURN GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
+const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context);
 
 GList *  gtk_style_context_list_classes (GtkStyleContext *context);
 
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 8b714bc..3e45d3c 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -93,7 +93,7 @@ void                  gtk_text_mark_set_visible      (GtkTextMark *mark,
                                                       gboolean     setting);
 gboolean              gtk_text_mark_get_visible      (GtkTextMark *mark);
 
-G_CONST_RETURN gchar* gtk_text_mark_get_name         (GtkTextMark *mark);
+const gchar *         gtk_text_mark_get_name         (GtkTextMark *mark);
 gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
 GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
 gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 634a815..2f3fe9b 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -649,7 +649,7 @@ gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
  *
  * Since: 3.0
  **/
-G_CONST_RETURN GtkWidgetPath *
+const GtkWidgetPath *
 gtk_theming_engine_get_path (GtkThemingEngine *engine)
 {
   GtkThemingEnginePrivate *priv;
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index b1d4b95..8f03aad 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -205,7 +205,7 @@ gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine,
                                           const gchar      *color_name,
                                           GdkRGBA          *color);
 
-G_CONST_RETURN GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
+const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine);
 
 gboolean gtk_theming_engine_has_class  (GtkThemingEngine *engine,
                                         const gchar      *style_class);
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 5a3bc46..6bbde3a 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -1020,7 +1020,7 @@ gtk_tool_button_set_label (GtkToolButton *button,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tool_button_get_label (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
@@ -1121,7 +1121,7 @@ gtk_tool_button_set_stock_id (GtkToolButton *button,
  * 
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tool_button_get_stock_id (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
@@ -1172,7 +1172,7 @@ gtk_tool_button_set_icon_name (GtkToolButton *button,
  * 
  * Since: 2.8
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_tool_button_get_icon_name (GtkToolButton *button)
 {
   g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL);
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 3783e70..eba8645 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -73,16 +73,16 @@ GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id);
 
 void                  gtk_tool_button_set_label         (GtkToolButton *button,
 							 const gchar   *label);
-G_CONST_RETURN gchar *gtk_tool_button_get_label         (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_label         (GtkToolButton *button);
 void                  gtk_tool_button_set_use_underline (GtkToolButton *button,
 							 gboolean       use_underline);
 gboolean              gtk_tool_button_get_use_underline (GtkToolButton *button);
 void                  gtk_tool_button_set_stock_id      (GtkToolButton *button,
 							 const gchar   *stock_id);
-G_CONST_RETURN gchar *gtk_tool_button_get_stock_id      (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_stock_id      (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_name     (GtkToolButton *button,
 							 const gchar   *icon_name);
-G_CONST_RETURN gchar *gtk_tool_button_get_icon_name     (GtkToolButton *button);
+const gchar *         gtk_tool_button_get_icon_name     (GtkToolButton *button);
 void                  gtk_tool_button_set_icon_widget   (GtkToolButton *button,
 							 GtkWidget     *icon_widget);
 GtkWidget *           gtk_tool_button_get_icon_widget   (GtkToolButton *button);
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 70833e6..72196a5 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1985,7 +1985,7 @@ gtk_tool_item_group_set_ellipsize (GtkToolItemGroup   *group,
  *
  * Since: 2.20
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_tool_item_group_get_label (GtkToolItemGroup *group)
 {
   GtkToolItemGroupPrivate *priv;
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index 1024bc0..1d7852e 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -78,7 +78,7 @@ void                  gtk_tool_item_group_set_ellipsize     (GtkToolItemGroup
 void                  gtk_tool_item_group_set_header_relief (GtkToolItemGroup   *group,
                                                              GtkReliefStyle      style);
 
-G_CONST_RETURN gchar* gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
+const gchar *         gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
 GtkWidget            *gtk_tool_item_group_get_label_widget  (GtkToolItemGroup   *group);
 gboolean              gtk_tool_item_group_get_collapsed     (GtkToolItemGroup   *group);
 PangoEllipsizeMode    gtk_tool_item_group_get_ellipsize     (GtkToolItemGroup   *group);
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 9488f62..d36020f 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -1916,7 +1916,7 @@ _gtk_tool_palette_child_set_drag_source (GtkWidget *child,
  *
  * Since: 2.20
  */
-G_CONST_RETURN GtkTargetEntry*
+const GtkTargetEntry*
 gtk_tool_palette_get_drag_target_item (void)
 {
   return &dnd_targets[0];
@@ -1931,7 +1931,7 @@ gtk_tool_palette_get_drag_target_item (void)
  *
  * Since: 2.20
  */
-G_CONST_RETURN GtkTargetEntry*
+const GtkTargetEntry*
 gtk_tool_palette_get_drag_target_group (void)
 {
   return &dnd_targets[1];
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 7870c55..a8e3dde 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -133,8 +133,8 @@ GtkAdjustment*                 gtk_tool_palette_get_vadjustment       (GtkToolPa
 
 #endif
 
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
 
 
 G_END_DECLS
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 892db02..2030ff0 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2369,7 +2369,7 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
  * Return value: the title of the column. This string should not be
  * modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index f964177..b55ffa9 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -160,7 +160,7 @@ void                    gtk_tree_view_column_clicked             (GtkTreeViewCol
  */
 void                    gtk_tree_view_column_set_title           (GtkTreeViewColumn       *tree_column,
 								  const gchar             *title);
-G_CONST_RETURN gchar   *gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
+const gchar *           gtk_tree_view_column_get_title           (GtkTreeViewColumn       *tree_column);
 void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
 								  gboolean                 expand);
 gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ee73e94..eff3628 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6973,7 +6973,7 @@ gtk_widget_set_name (GtkWidget	 *widget,
  * Return value: name of the widget. This string is owned by GTK+ and
  * should not be modified or freed
  **/
-G_CONST_RETURN gchar*
+const gchar*
 gtk_widget_get_name (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv;
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index c391b22..e1b11ae 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -577,7 +577,7 @@ gboolean   gtk_widget_device_is_shadowed  (GtkWidget           *widget,
 
 void                  gtk_widget_set_name               (GtkWidget    *widget,
 							 const gchar  *name);
-G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
+const gchar *         gtk_widget_get_name               (GtkWidget    *widget);
 
 void                  gtk_widget_set_state              (GtkWidget    *widget,
 							 GtkStateType  state);
diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c
index 177f7b8..ab61043 100644
--- a/gtk/gtkwidgetpath.c
+++ b/gtk/gtkwidgetpath.c
@@ -337,7 +337,7 @@ gtk_widget_path_iter_set_object_type (GtkWidgetPath *path,
  *
  * Returns: The widget name, or %NULL if none was set.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_widget_path_iter_get_name (const GtkWidgetPath *path,
                                gint                 pos)
 {
diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index 2c9c981..324bfe4 100644
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -52,7 +52,7 @@ void                gtk_widget_path_iter_set_object_type (GtkWidgetPath       *p
                                                           gint                 pos,
                                                           GType                type);
 
-G_CONST_RETURN gchar * gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
+const gchar *          gtk_widget_path_iter_get_name  (const GtkWidgetPath *path,
                                                        gint                 pos);
 void                   gtk_widget_path_iter_set_name  (GtkWidgetPath       *path,
                                                        gint                 pos,
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b1caa9b..6401cc0 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1584,7 +1584,7 @@ gtk_window_set_title (GtkWindow   *window,
  *    been set explicitely. The returned string is owned by the widget
  *    and must not be modified or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_window_get_title (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
@@ -1746,7 +1746,7 @@ gtk_window_set_startup_id (GtkWindow   *window,
  *   returned is owned by the widget and must not be modified
  *   or freed.
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_window_get_role (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 3820070..2752d8d 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -108,7 +108,7 @@ GType      gtk_window_get_type                 (void) G_GNUC_CONST;
 GtkWidget* gtk_window_new                      (GtkWindowType        type);
 void       gtk_window_set_title                (GtkWindow           *window,
 						const gchar         *title);
-G_CONST_RETURN gchar *gtk_window_get_title     (GtkWindow           *window);
+const gchar * gtk_window_get_title             (GtkWindow           *window);
 void       gtk_window_set_wmclass              (GtkWindow           *window,
 						const gchar         *wmclass_name,
 						const gchar         *wmclass_class);
@@ -116,7 +116,7 @@ void       gtk_window_set_role                 (GtkWindow           *window,
                                                 const gchar         *role);
 void       gtk_window_set_startup_id           (GtkWindow           *window,
                                                 const gchar         *startup_id);
-G_CONST_RETURN gchar *gtk_window_get_role      (GtkWindow           *window);
+const gchar * gtk_window_get_role              (GtkWindow           *window);
 void       gtk_window_add_accel_group          (GtkWindow           *window,
 						GtkAccelGroup	    *accel_group);
 void       gtk_window_remove_accel_group       (GtkWindow           *window,
@@ -202,14 +202,12 @@ gboolean   gtk_window_set_icon_from_file           (GtkWindow   *window,
 						    const gchar *filename,
 						    GError     **err);
 GdkPixbuf* gtk_window_get_icon                     (GtkWindow  *window);
-G_CONST_RETURN 
-gchar     *gtk_window_get_icon_name                (GtkWindow  *window);
+const gchar * gtk_window_get_icon_name             (GtkWindow  *window);
 void       gtk_window_set_default_icon_list        (GList      *list);
 GList*     gtk_window_get_default_icon_list        (void);
 void       gtk_window_set_default_icon             (GdkPixbuf  *icon);
 void       gtk_window_set_default_icon_name        (const gchar *name);
-G_CONST_RETURN
-gchar     *gtk_window_get_default_icon_name        (void);
+const gchar * gtk_window_get_default_icon_name     (void);
 gboolean   gtk_window_set_default_icon_from_file   (const gchar *filename,
 						    GError     **err);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]