[gtk+/gtk-2-24] gtk: Use 'const' instead G_RETURN_CONST
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] gtk: Use 'const' instead G_RETURN_CONST
- Date: Wed, 15 Jun 2011 18:43:38 +0000 (UTC)
commit 1516be6f69aa325d2e583768a4fef2748b1cae55
Author: Javier JardÃn <jjardon gnome org>
Date: Wed Jun 15 18:33:25 2011 +0100
gtk: Use 'const' instead G_RETURN_CONST
gtk/gtkaboutdialog.c | 26 +++++++++++++-------------
gtk/gtkaboutdialog.h | 26 +++++++++++++-------------
gtk/gtkaction.c | 16 ++++++++--------
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/gtkcolorbutton.c | 2 +-
gtk/gtkcolorbutton.h | 2 +-
gtk/gtkcombobox.c | 2 +-
gtk/gtkcombobox.h | 2 +-
gtk/gtkentry.c | 4 ++--
gtk/gtkentry.h | 4 ++--
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/gtkfilesel.c | 4 ++--
gtk/gtkfilesel.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 | 2 +-
gtk/gtkiconfactory.c | 8 ++++----
gtk/gtkiconfactory.h | 6 +++---
gtk/gtkicontheme.c | 6 +++---
gtk/gtkicontheme.h | 4 ++--
gtk/gtkimage.c | 2 +-
gtk/gtkimage.h | 2 +-
gtk/gtkimagemenuitem.c | 4 ++--
gtk/gtkitemfactory.c | 2 +-
gtk/gtkitemfactory.h | 2 +-
gtk/gtklabel.c | 6 +++---
gtk/gtklabel.h | 6 +++---
gtk/gtklinkbutton.c | 2 +-
gtk/gtklinkbutton.h | 2 +-
gtk/gtkmenu.c | 2 +-
gtk/gtkmenu.h | 2 +-
gtk/gtkmenuitem.c | 8 ++++----
gtk/gtkmenuitem.h | 6 +++---
gtk/gtknotebook.c | 4 ++--
gtk/gtknotebook.h | 8 ++++----
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 | 2 +-
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/gtktextmark.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/gtkwindow.c | 4 ++--
gtk/gtkwindow.h | 12 ++++++------
83 files changed, 197 insertions(+), 197 deletions(-)
---
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 7a1ab6b..721ea34 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -926,7 +926,7 @@ gtk_about_dialog_show (GtkWidget *widget)
*
* Deprecated: 2.12: Use gtk_about_dialog_get_program_name() instead.
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_about_dialog_get_name (GtkAboutDialog *about)
{
return gtk_about_dialog_get_program_name (about);
@@ -943,7 +943,7 @@ gtk_about_dialog_get_name (GtkAboutDialog *about)
*
* Since: 2.12
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_about_dialog_get_program_name (GtkAboutDialog *about)
{
GtkAboutDialogPrivate *priv;
@@ -1039,7 +1039,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)
{
GtkAboutDialogPrivate *priv;
@@ -1091,7 +1091,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about,
*
* Since: 2.6
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_about_dialog_get_copyright (GtkAboutDialog *about)
{
GtkAboutDialogPrivate *priv;
@@ -1154,7 +1154,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about,
*
* Since: 2.6
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_about_dialog_get_comments (GtkAboutDialog *about)
{
GtkAboutDialogPrivate *priv;
@@ -1215,7 +1215,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about,
*
* Since: 2.6
*/
-G_CONST_RETURN gchar *
+const gchar *
gtk_about_dialog_get_license (GtkAboutDialog *about)
{
GtkAboutDialogPrivate *priv;
@@ -1329,7 +1329,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;
@@ -1384,7 +1384,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;
@@ -1439,7 +1439,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;
@@ -1512,7 +1512,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;
@@ -1567,7 +1567,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;
@@ -1621,7 +1621,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)
{
GtkAboutDialogPrivate *priv;
@@ -1781,7 +1781,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 772b92c..39dc04f 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -77,23 +77,23 @@ void gtk_show_about_dialog (GtkWindow
...) G_GNUC_NULL_TERMINATED;
#ifndef GTK_DISABLE_DEPRECATED
-G_CONST_RETURN gchar *gtk_about_dialog_get_name (GtkAboutDialog *about);
+const gchar * gtk_about_dialog_get_name (GtkAboutDialog *about);
void gtk_about_dialog_set_name (GtkAboutDialog *about,
const gchar *name);
#endif /* GTK_DISABLE_DEPRECATED */
-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);
@@ -101,28 +101,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 68934bb..504e09b 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1068,7 +1068,7 @@ gtk_widget_get_action (GtkWidget *widget)
*
* 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);
@@ -1365,7 +1365,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);
@@ -1411,7 +1411,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);
@@ -1428,7 +1428,7 @@ gtk_action_get_short_label (GtkAction *action)
*
* Since: 2.16
*/
-void
+void
gtk_action_set_visible_horizontal (GtkAction *action,
gboolean visible_horizontal)
{
@@ -1543,7 +1543,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);
@@ -1601,7 +1601,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);
@@ -1643,7 +1643,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);
@@ -1816,7 +1816,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 08e051a..79e37bc 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);
#ifndef GTK_DISABLE_DEPRECATED
@@ -145,22 +145,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 cab79ee..81078e6 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -583,7 +583,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;
@@ -1380,7 +1380,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 1d8b388..19519ae 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -110,7 +110,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);
@@ -164,7 +164,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 72314aa..031329d 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1926,7 +1926,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 766b9d0..761828d 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -146,7 +146,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 ecad81b..f472007 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1844,7 +1844,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 576dceb..7192604 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -108,7 +108,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/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 9d312f9..c640b96 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -801,7 +801,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 21c1460..176c5f5 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -95,7 +95,7 @@ void gtk_color_button_set_use_alpha (GtkColorButton *color_button,
gboolean gtk_color_button_get_use_alpha (GtkColorButton *color_button);
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 de42487..be968d6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -6016,7 +6016,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 bc9d532..e0599a9 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -88,7 +88,7 @@ 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);
+const gchar * gtk_combo_box_get_title (GtkComboBox *combo_box);
void gtk_combo_box_set_title (GtkComboBox *combo_box,
const gchar *title);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 64887cb..0a833cf 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7118,7 +7118,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);
@@ -7389,7 +7389,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 9bbba0b..c0a717e 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -188,7 +188,7 @@ 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);
+const GtkBorder* gtk_entry_get_inner_border (GtkEntry *entry);
void gtk_entry_set_overwrite_mode (GtkEntry *entry,
gboolean overwrite);
@@ -213,7 +213,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 27947b1..ced2457 100644
--- a/gtk/gtkentrybuffer.c
+++ b/gtk/gtkentrybuffer.c
@@ -520,7 +520,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 20556cb..0cfc0ea 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -99,7 +99,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 693c867..879f96f 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -1575,7 +1575,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 6ed1e1a..1aabc7d 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -76,7 +76,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 c6a5512..7b68276 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2827,7 +2827,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 b57209c..f42fa12 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -77,7 +77,7 @@ GtkWidget * gtk_file_chooser_button_new_with_backend (const gchar
#endif /* GTK_DISABLE_DEPRECATED */
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 f64c576..5a6b411 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -188,7 +188,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 dde1fa9..70a45a9 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -61,7 +61,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/gtkfilesel.c b/gtk/gtkfilesel.c
index 465b722..d18c307 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1147,7 +1147,7 @@ gtk_file_selection_set_filename (GtkFileSelection *filesel,
*
* Return value: currently-selected filename in the on-disk encoding.
**/
-G_CONST_RETURN gchar*
+const gchar*
gtk_file_selection_get_filename (GtkFileSelection *filesel)
{
static const gchar nothing[2] = "";
@@ -3945,7 +3945,7 @@ cmpl_strerror (gint err)
#undef gtk_file_selection_get_filename
-G_CONST_RETURN gchar*
+const gchar*
gtk_file_selection_get_filename (GtkFileSelection *filesel)
{
static gchar retval[MAXPATHLEN*2+1];
diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index 8823566..af3aa8e 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -103,7 +103,7 @@ GType gtk_file_selection_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_file_selection_new (const gchar *title);
void gtk_file_selection_set_filename (GtkFileSelection *filesel,
const gchar *filename);
-G_CONST_RETURN gchar* gtk_file_selection_get_filename (GtkFileSelection *filesel);
+const gchar* gtk_file_selection_get_filename (GtkFileSelection *filesel);
void gtk_file_selection_complete (GtkFileSelection *filesel,
const gchar *pattern);
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 694c618..f9f251c 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 1340970..177e419 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 0ce63fa..5bfb5b3 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1551,7 +1551,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)
{
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
@@ -1847,7 +1847,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)
{
g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 18453b9..1ee705b 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -205,7 +205,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 252e74d..93454f9 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -344,7 +344,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)
{
g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 2b1e926..501d9ba 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -74,7 +74,7 @@ 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);
+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 be2dc0f..b4146ad 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1057,7 +1057,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)
@@ -2077,7 +2077,7 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source,
* Return value: 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);
@@ -2098,7 +2098,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);
@@ -2970,7 +2970,7 @@ gtk_icon_source_set_filename (GtkIconSource *source,
#undef gtk_icon_source_get_filename
-G_CONST_RETURN gchar*
+const gchar*
gtk_icon_source_get_filename (const GtkIconSource *source)
{
g_return_val_if_fail (source != NULL, NULL);
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 574b101..5277a5a 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -112,7 +112,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 */
@@ -155,8 +155,8 @@ 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);
+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,
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 087bf1b..bf81546 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2736,7 +2736,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);
@@ -3269,7 +3269,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);
@@ -3658,7 +3658,7 @@ gtk_icon_theme_prepend_search_path (GtkIconTheme *icon_theme,
#undef gtk_icon_info_get_filename
-G_CONST_RETURN gchar *
+const gchar *
gtk_icon_info_get_filename (GtkIconInfo *icon_info)
{
g_return_val_if_fail (icon_info != NULL, NULL);
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index b6d7d31..8065fe3 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -175,7 +175,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);
@@ -187,7 +187,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 7dc0aad..c35d962 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1458,7 +1458,7 @@ gtk_image_get_animation (GtkImage *image)
**/
void
gtk_image_get_icon_name (GtkImage *image,
- G_CONST_RETURN gchar **icon_name,
+ const gchar **icon_name,
GtkIconSize *size)
{
g_return_if_fail (GTK_IS_IMAGE (image));
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index dd6153c..40ddbab 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -251,7 +251,7 @@ void gtk_image_get_icon_set (GtkImage *image,
GtkIconSize *size);
GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image);
void gtk_image_get_icon_name (GtkImage *image,
- G_CONST_RETURN gchar **icon_name,
+ const gchar **icon_name,
GtkIconSize *size);
void gtk_image_get_gicon (GtkImage *image,
GIcon **gicon,
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index a214cf2..a4f69d1 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -50,7 +50,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,
@@ -396,7 +396,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 = GET_PRIVATE (menu_item);
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 4197866..2778fd3 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -560,7 +560,7 @@ gtk_item_factory_from_widget (GtkWidget *widget)
*
* Deprecated: 2.4: Use #GtkUIManager instead.
*/
-G_CONST_RETURN gchar*
+const gchar*
gtk_item_factory_path_from_widget (GtkWidget *widget)
{
gchar* path;
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 5c57b80..d67d6cf 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -151,7 +151,7 @@ void gtk_item_factory_add_foreign (GtkWidget *accel_widget,
GdkModifierType modifiers);
GtkItemFactory* gtk_item_factory_from_widget (GtkWidget *widget);
-G_CONST_RETURN gchar* gtk_item_factory_path_from_widget (GtkWidget *widget);
+const gchar * gtk_item_factory_path_from_widget (GtkWidget *widget);
GtkWidget* gtk_item_factory_get_item (GtkItemFactory *ifactory,
const gchar *path);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 313e3bc..01225b1 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2009,7 +2009,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);
@@ -2467,7 +2467,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);
@@ -5920,7 +5920,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 88a9db7..850d896 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -111,13 +111,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,
@@ -177,7 +177,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 489dc95..a3f246f 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -693,7 +693,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 1b89737..21e35a6 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -71,7 +71,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 baecd25..69c8561 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2201,7 +2201,7 @@ gtk_menu_set_title (GtkMenu *menu,
* title set on it. This string is owned by the widget and should
* not be modified or freed.
**/
-G_CONST_RETURN gchar *
+const gchar *
gtk_menu_get_title (GtkMenu *menu)
{
GtkMenuPrivate *priv;
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 5dbafbe..70d6252 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -182,7 +182,7 @@ gboolean gtk_menu_get_tearoff_state (GtkMenu *menu);
*/
void gtk_menu_set_title (GtkMenu *menu,
const gchar *title);
-G_CONST_RETURN gchar *gtk_menu_get_title (GtkMenu *menu);
+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 cf1442a..8f23b75 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -124,7 +124,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_buildable_interface_init (GtkBuildableIface *iface);
@@ -1475,7 +1475,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)
{
gtk_menu_item_ensure_label (menu_item);
@@ -2079,7 +2079,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);
@@ -2163,7 +2163,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 b8a1f1a..36dca93 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -88,7 +88,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);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
@@ -115,11 +115,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,
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 b34230d..254f6b8 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7396,7 +7396,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
* 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)
{
@@ -7531,7 +7531,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
* 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 62620a1..598df13 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -263,8 +263,8 @@ void gtk_notebook_set_tab_label (GtkNotebook *notebook,
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);
+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,
@@ -273,8 +273,8 @@ void gtk_notebook_set_menu_label (GtkNotebook *notebook,
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,
- GtkWidget *child);
+const gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
+ GtkWidget *child);
#ifndef GTK_DISABLE_DEPRECATED
void gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
GtkWidget *child,
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 894dca0..4576e91 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -495,7 +495,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)
@@ -514,7 +514,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;
@@ -539,7 +539,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)
@@ -639,7 +639,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 18302ca..ff0a051 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -64,9 +64,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);
@@ -87,7 +87,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 810b29d..a38be43 100644
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -420,7 +420,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);
@@ -438,7 +438,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);
@@ -476,7 +476,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);
@@ -514,7 +514,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);
@@ -552,7 +552,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 527582c..5c6792c 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -93,11 +93,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 647e8aa..d280edf 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -351,7 +351,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 fd82184..39fe03d 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -93,7 +93,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 aebf947..407ecec 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1752,7 +1752,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 ef9a287..e25e031 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -173,7 +173,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 cc16149..94674f6 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -144,7 +144,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)
{
@@ -499,7 +499,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);
@@ -1515,7 +1515,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);
@@ -1550,7 +1550,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);
@@ -1585,7 +1585,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);
@@ -1649,7 +1649,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 267854c..bdf62f7 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 d5b709a..a21e762 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -1253,7 +1253,7 @@ gtk_progress_bar_set_orientation (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 6f09b2c..e2859e9 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -136,7 +136,7 @@ void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
void gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
GtkProgressBarOrientation orientation);
-G_CONST_RETURN gchar* gtk_progress_bar_get_text (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);
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index 5de81cf..9e87998 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -212,7 +212,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 3be8e5e..afa1586 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -66,7 +66,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 8d62e30..35eea65 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -1683,7 +1683,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);
@@ -1703,7 +1703,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);
@@ -1725,7 +1725,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);
@@ -1744,7 +1744,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 ccc6581..dcd4b8e 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -176,10 +176,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 65edd6e..d9a4f76 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2075,7 +2075,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;
@@ -2107,7 +2107,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;
@@ -2971,7 +2971,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 74867b3..9c58350 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -100,8 +100,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);
@@ -122,7 +122,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/gtktextmark.h b/gtk/gtktextmark.h
index 87118df..49d573a 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -94,7 +94,7 @@ gboolean gtk_text_mark_get_visible (GtkTextMark *mark);
GtkTextMark *gtk_text_mark_new (const gchar *name,
gboolean left_gravity);
-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/gtktoolbutton.c b/gtk/gtktoolbutton.c
index a67ff13..e625aef 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -1009,7 +1009,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);
@@ -1110,7 +1110,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);
@@ -1161,7 +1161,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 cacabe1..8b7908c 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 8574f26..3008cba 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1930,7 +1930,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 82f153c..f788615 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -72,7 +72,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 63d2a92..b984193 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -1853,7 +1853,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];
@@ -1868,7 +1868,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 c98dbef..4d51574 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -135,8 +135,8 @@ void gtk_tool_palette_add_drag_dest (GtkToolPa
GtkAdjustment* gtk_tool_palette_get_hadjustment (GtkToolPalette *palette);
GtkAdjustment* gtk_tool_palette_get_vadjustment (GtkToolPalette *palette);
-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 3e94826..03dbdaa 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2137,7 +2137,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 b06e845..6b5ca5b 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -182,7 +182,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 00ec96f..9a43d27 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5809,7 +5809,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)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 1f4f4c2..efd64ce 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -955,7 +955,7 @@ gboolean gtk_widget_has_grab (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/gtkwindow.c b/gtk/gtkwindow.c
index e026cc2..4de3215 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1431,7 +1431,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);
@@ -1580,7 +1580,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 1d54b2a..9cecb4a 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -179,7 +179,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);
@@ -187,7 +187,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,
@@ -290,14 +290,14 @@ 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]
